From 419d2b12feda101dbea40dd32d4e24644c0f5ef2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:40 +0000 Subject: [PATCH 1/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.26 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23518.47 -> To Version 6.0.125-servicing.23519.26 --- 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 84c728770..09acedabf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b0837a07e0fb11ee75c2508ef246ff36fde5c78 + 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 diff --git a/eng/Versions.props b/eng/Versions.props index 118b2ef92..3cd7363c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23518.47 - 6.0.125-servicing.23518.47 + 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ccaa3858edc91bdbb2ccbb5fdcfcfc5a5007e019 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:48 +0000 Subject: [PATCH 2/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.125-servicing.23519.26 -> To Version 6.0.125-servicing.23519.54 --- 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 09acedabf..d10b4f2d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating e87581dd7461f50f79d0bbc907f455b58603df27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f2d779e483f3e73bf85dd997df11e2e9ba9e0d2 + 242714167d7ec659bf372fe545164214267489c1 diff --git a/eng/Versions.props b/eng/Versions.props index 3cd7363c2..95d7d9fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.125-servicing.23519.26 - 6.0.125-servicing.23519.26 + 6.0.125-servicing.23519.54 + 6.0.125-servicing.23519.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6bb0f11159c9fef115ca9646321aa333e0e673e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 04:55:55 +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.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,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,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.25 -> To Version 6.0.25 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index f271150ec..f5fd38f5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d10b4f2d5..e1fff280f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 88d6726a7d0f4b1ccf4e3ca3957dbf81677216c3 + 7a8ee66adb20d70b1403a3a5142ed305e8699f5e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5f9d5a6664bfe9bf832babe09b13a475b9e7f479 + d7b9518372d8e9988e62154d73453e7df508df2c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c81c53cd507ae3699ef60e6a02be0b1984d00452 + 0fc7d670f4e51b903722a1a9d8e0bac0e1673d46 https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-templating - e87581dd7461f50f79d0bbc907f455b58603df27 + 09a2091e07d334d42f6b441ae845f854622326cc https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 242714167d7ec659bf372fe545164214267489c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f74130bc3ca3b606a18011ad64ac37a7ee77d514 + 20b3a0a3c77fe77e6f8e1aaa5348fc78228693ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e1722e80b8f688100d15b4b794f17e1a1779e286 + b0a02caf5d0dd6f56f073d6616d5a3501854f632 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 95d7d9fe8..618f76dae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.24-servicing.23516.5 + 6.0.25-servicing.23518.2 - 6.0.24-servicing.23517.2 + 6.0.25-servicing.23518.13 @@ -44,12 +44,12 @@ - 6.0.24 - 6.0.24 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 - 6.0.24-servicing.23517.11 + 6.0.25 + 6.0.25 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 + 6.0.25-servicing.23519.7 0.2.0 @@ -68,18 +68,18 @@ - 6.0.24-servicing.23517.17 - 6.0.24-servicing.23517.17 - 6.0.24 - 6.0.24 - 6.0.24 - 6.0.24 + 6.0.25-servicing.23518.22 + 6.0.25-servicing.23518.22 + 6.0.25 + 6.0.25 + 6.0.25 + 6.0.25 2.1.0 - 6.0.25-servicing.23518.6 - 6.0.25-servicing.23518.6 + 6.0.25-servicing.23519.5 + 6.0.25-servicing.23519.5 6.0.25 6.0.25