From b8022846882025cc1eb6c7db8bc87934871f6eb9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 21:45:40 +0000 Subject: [PATCH 1/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.304 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++-------------------- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca7dfc319..ef1d72118 100644 --- a/NuGet.config +++ b/NuGet.config @@ -39,16 +39,8 @@ - - - - - - - - - - + + @@ -80,16 +72,8 @@ - - - - - - - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff5bcdc6c..bfce001a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/microsoft/vstest - 83d73f783bf54c336d1eab04a53d554f8a6c0b19 + c4d80397805bec06b354d20aeb1773e243c6add0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea + + https://github.com/dotnet/roslyn + 1f9b00a8865f2b30d14ff2012b00f4ce5ddc1086 diff --git a/eng/Versions.props b/eng/Versions.props index b5c54f07a..973a932bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.303 - 8.0.303-servicing.24317.6 - 8.0.303-servicing.24317.6 + 8.0.304 + 8.0.304-servicing.24366.12 + 8.0.304-servicing.24366.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24314.14 + 4.10.0-3.24365.5 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24272-11 + 17.10.0-release-24317-02 8.0.0-alpha.1.22557.12 From d1044530933121c72a9c5dc6af29bb199cc4f6d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 00:05:55 +0000 Subject: [PATCH 2/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.7-servicing.24313.11 -> To Version 8.0.8-servicing.24366.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++++-------------- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef1d72118..2d5d57706 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,7 @@ - - - - - + @@ -32,15 +28,11 @@ - - - - - + - - + + @@ -66,14 +58,10 @@ - - - - - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfce001a1..05efbba35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 diff --git a/eng/Versions.props b/eng/Versions.props index 973a932bb..a8bb1f586 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24366.12 - 8.0.304-servicing.24366.12 + 8.0.304-servicing.24366.26 + 8.0.304-servicing.24366.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.7-servicing.24313.11 + 8.0.8-servicing.24366.12 - 8.0.7-servicing.24313.11 - 8.0.7-servicing.24313.11 - 8.0.7 - 8.0.7 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.12 + 8.0.8-servicing.24366.12 + 8.0.8 + 8.0.8 + 8.0.8 + 8.0.8 2.1.0 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.7 + 8.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 2b3671758263e26ff0977dbabce2afc7e4b84dd8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 17:48:05 +0000 Subject: [PATCH 3/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++++-------------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 33 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d5d57706..ac50471e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,11 +17,7 @@ - - - - - + @@ -31,8 +27,8 @@ - - + + @@ -60,15 +56,11 @@ - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7eb68270..fdb0d743f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 + bd164556d31c13b09986f597f49a83bf836c165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43bb8cc831c2658e1117415019264bfe6f644f94 + 883fc207bb50622d4458ff09ae6a62548783826a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b2576ca2d..0e39035fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24313.8 + 8.0.8-servicing.24366.6 - 8.0.7-servicing.24313.7 + 8.0.8-servicing.24366.7 @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24366.26 - 8.0.304-servicing.24366.26 + 8.0.304-servicing.24367.11 + 8.0.304-servicing.24367.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.7-servicing.24314.3 - 8.0.7-servicing.24314.3 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.8 + 8.0.8-servicing.24366.8 + 8.0.8 + 8.0.8 From 30b3354cad2fd42d613b63dd4211047a40b4ef3e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Jul 2024 02:33:28 +0000 Subject: [PATCH 4/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240719.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++++-------------- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac50471e6..cfd69ccbe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -27,8 +23,8 @@ - - + + @@ -47,17 +43,13 @@ - - - - - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdb0d743f..36a8ba23b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0e39035fb..9d057d34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.7 - 8.0.7 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 + 8.0.8 + 8.0.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 0.2.0 @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24367.11 - 8.0.304-servicing.24367.11 + 8.0.304-servicing.24369.9 + 8.0.304-servicing.24369.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)