From 44780f9fc347a483860cfd1bff49d321c67cf425 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 21:08:23 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.9 -> To Version 6.0.424-servicing.24270.20 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.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index a33386565..1d26efab9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a7503640..8e4958012 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 93a1697c05d3dd9d80b5a6d857dc78a933898323 + c1a1465eff5280de1f6b8cc62fee20494c89b2db https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d + 58ff2eded45802350b27a9d43e88319ca940b976 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9a18882249c0b52cd38e94fe7f6caf0be55b5a1d + 58ff2eded45802350b27a9d43e88319ca940b976 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8460a2e74768942ee0c5d081be831cf53c2e609a + 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 66bb6b2efd50110c38e22e3f3b0dc9c972e536c7 + 7e2bc9b2110c34fb82dc6a7296a9fe4d4ddfaf2c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b26bf2aa9..f456f7958 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.31-servicing.24267.12 + 6.0.32-servicing.24269.17 - 6.0.32-servicing.24268.2 + 6.0.32-servicing.24270.6 @@ -55,8 +55,8 @@ - 6.0.424-servicing.24270.9 - 6.0.424-servicing.24270.9 + 6.0.424-servicing.24270.20 + 6.0.424-servicing.24270.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24269.10 - 6.0.32-servicing.24269.10 + 6.0.32-servicing.24270.11 + 6.0.32-servicing.24270.11 6.0.32 6.0.32 From 302b4332cacfa1fac111771defd4da94231352a4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 22:50:16 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.424-servicing.24270.9 -> To Version 6.0.424-servicing.24270.43 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.32 -> To Version 6.0.32 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++++---------- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d26efab9..7dc18b83b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e4958012..2debf781d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c1a1465eff5280de1f6b8cc62fee20494c89b2db + 32e0f9e1f2709e665f70c6ab04af0db13fe282b8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 09c31efb6d6746cc270aebb80cf7fe1c73a7279f + 298810852e879c6a4f573a15967fd3dda922a715 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9cf8f1e9c0038587fa55099867a453f265cb6273 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58ff2eded45802350b27a9d43e88319ca940b976 + 1bf1adf95832105762e69ea7d59953216307889a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 58ff2eded45802350b27a9d43e88319ca940b976 + 1bf1adf95832105762e69ea7d59953216307889a https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 8b5c0ead7c241bb1415f17e61e0f891cce85ff4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7e2bc9b2110c34fb82dc6a7296a9fe4d4ddfaf2c + c0fec5a46de850303175b2501975e5dceb5f81a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f456f7958..d4f696d9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 6.0.32-servicing.24270.6 + 6.0.32-servicing.24270.10 @@ -43,20 +43,20 @@ - 6.0.31 - 6.0.31 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 - 6.0.31-servicing.24268.1 + 6.0.32 + 6.0.32 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 + 6.0.32-servicing.24270.7 0.2.0 - 6.0.424-servicing.24270.20 - 6.0.424-servicing.24270.20 + 6.0.424-servicing.24270.43 + 6.0.424-servicing.24270.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.32-servicing.24270.11 - 6.0.32-servicing.24270.11 + 6.0.32-servicing.24270.17 + 6.0.32-servicing.24270.17 6.0.32 6.0.32