From 05d232d7760c452688dc302e20b6f9da41105d9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 4 Dec 2023 19:27:46 +0000 Subject: [PATCH] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231204.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.321-servicing.23601.16 -> To Version 6.0.321-servicing.23604.13 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.25 -> To Version 6.0.26 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++++++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98638b9ae..6b6abf24e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + @@ -15,11 +16,14 @@ + + + @@ -40,14 +44,18 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62ffc36fd..824d1e2fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a74946f8dae6d29fd18c8fc702e23f8fe77c729c + 456adb551c1878a5dcc44f0b6e7d69de4789cbdc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 6b4fc213e731cb128ad8ed54befea55d9e1d3f6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2e6fec4ea47386d9306a4a2180ba7c61a7994f26 + 1f85f2a52ec422c16c8991f6cd24124c084e87d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - d4ee94199afb6c67ed448c252a07c0747c089e41 + b4d268210a29a07ba7a3003360b2b037881880db - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fcec4d8986bb8339964c429abd6e4651b968ff4f + 981ef8014ab994eb3fce88dd81b815fce930dfa5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fef08b7bd..c837eb641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.25-servicing.23519.16 + 6.0.26-servicing.23573.4 - 6.0.25-servicing.23519.18 + 6.0.26-servicing.23573.8 @@ -56,8 +56,8 @@ - 6.0.321-servicing.23601.16 - 6.0.321-servicing.23601.16 + 6.0.321-servicing.23604.13 + 6.0.321-servicing.23604.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.25-servicing.23520.5 - 6.0.25-servicing.23520.5 - 6.0.25 - 6.0.25 + 6.0.26-servicing.23604.3 + 6.0.26-servicing.23604.3 + 6.0.26 + 6.0.26