From 961033387a8f5eaab42005dfd4365904d1e99b37 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:21 +0000 Subject: [PATCH 1/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.45 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.22 -> To Version 6.0.319-servicing.23517.45 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2a0aef57..1c8a6f1d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11217ab79113ced4cab9bf694abd9abac5116d1 + 4117aa6ac88d4890e3fe498c9f33896871c1c434 diff --git a/eng/Versions.props b/eng/Versions.props index b7277bccd..8b75d729f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.22 - 6.0.319-servicing.23517.22 + 6.0.319-servicing.23517.45 + 6.0.319-servicing.23517.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8cb7c225a30703ed688059c7e7faa2fcf9d8bc66 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:28 +0000 Subject: [PATCH 2/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.319-servicing.23517.45 -> To Version 6.0.320-servicing.23518.27 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c8a6f1d4..99c6385fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 519f9badec1482e692fe0008611e4da847ad3b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4117aa6ac88d4890e3fe498c9f33896871c1c434 + 67fb1e64b6d4a7fe38735418cfd7fe068e986713 diff --git a/eng/Versions.props b/eng/Versions.props index 8b75d729f..916dd48be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.319-servicing.23517.45 - 6.0.319-servicing.23517.45 + 6.0.320-servicing.23518.27 + 6.0.320-servicing.23518.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7111d581d4a0b027e21af10147d50380602494d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:02:36 +0000 Subject: [PATCH 3/3] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.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.24 -> To Version 6.0.24 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a92c5c68c..b32124a20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,10 @@ - + - + @@ -46,10 +46,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99c6385fb..41e09eacb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e0adad7198e8509579e2dfedd445073fcf67fee + 5a32973319c74b856f132afb513ac44837d2b2aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 519f9badec1482e692fe0008611e4da847ad3b16 + fef6a134b76e2a2ff3633aa1816918a3498e15ce https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 67fb1e64b6d4a7fe38735418cfd7fe068e986713 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a8ba4b39b59ca421254550010de48b33d7c7b57d + c1396d66ff3d595b912cd5f96d6f4651427ecfcd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2b6f0273734c631e1ecc8c503836d4fab840065b + 54f99d916b6630956d732099722d5e4dbfcd2825 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 916dd48be..a5fcd6759 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23480.3 + 6.0.24-servicing.23513.4 - 6.0.23-servicing.23480.2 + 6.0.24-servicing.23516.7 @@ -78,8 +78,8 @@ - 6.0.24-servicing.23513.4 - 6.0.24-servicing.23513.4 + 6.0.24-servicing.23517.3 + 6.0.24-servicing.23517.3 6.0.24 6.0.24