From 6c6471e5019bf5bd79a240173a66355317d02596 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Mar 2024 23:16:09 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 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.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++------ eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index cef841a23..252c67119 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,23 @@ - + - - + - + + + @@ -43,14 +44,15 @@ - - + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5bdb0a3c..2e797a772 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 413c870a447075a90b8827353acb28ed37bab9dc + 74504ca4d4b7896de13475677be80013d33cb571 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + 5cff8b8eb04adfca21ccdec7e88b9ee7b3952fee https://github.com/dotnet/roslyn @@ -168,18 +168,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 1639670c6547454278f51afc5c74e20f8acc7abd diff --git a/eng/Versions.props b/eng/Versions.props index 7ace14de4..c9949aa35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.103 - 8.0.103-servicing.24116.86 - 8.0.103-servicing.24116.86 + 8.0.104 + 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24162.12 - 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24162.12 + 8.0.4-servicing.24162.12 + 8.0.4 + 8.0.4 + 8.0.4 + 8.0.4 2.1.0 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.3 + 8.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From c71ee0cb633ce96ff85996738d0b20619fd00374 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Mar 2024 00:09:45 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.103 -> To Version 8.0.104 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.3-servicing.24114.23 -> To Version 8.0.4-servicing.24162.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 252c67119..4e5e418b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e797a772..8c659ff4d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 74504ca4d4b7896de13475677be80013d33cb571 + 2f4164c25cc5777023364dc8d86f4271d1fb92b6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c9949aa35..96cb3f6f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.104 - 8.0.104-servicing.24163.28 - 8.0.104-servicing.24163.28 + 8.0.104-servicing.24163.30 + 8.0.104-servicing.24163.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)