From 83515a4416ca91d12c90e74e4020605add44df7d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 20:29:35 +0000 Subject: [PATCH 1/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index f6d992ee1..6b1b6c18b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be2af18f9..704d16e07 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4bea267253978a0d83670a569d83081d62fc8060 + 2fc0f032755cfcebac6ed7030ae460c74e14d719 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e8a67279888e260abf0cf5b027cc16ea7069799 + 0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - eea757d15dbc77041d9295e55dc45d18d7f7ed83 + adccabf2ff002505d4dcc3019508647f0953f885 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index c62bc36ac..d98706723 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.6-servicing.24266.2 + 8.0.6-servicing.24267.11 - 8.0.7-servicing.24267.12 + 8.0.7-servicing.24268.1 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24268.1 - 8.0.107-servicing.24268.1 + 8.0.107-servicing.24270.16 + 8.0.107-servicing.24270.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.6-servicing.24267.14 - 8.0.6-servicing.24267.14 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24270.4 + 8.0.7-servicing.24270.4 + 8.0.7 + 8.0.7 From 189df4ec0fd81179346afb7d317c35670f070934 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 20 May 2024 22:11:02 +0000 Subject: [PATCH 2/2] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240520.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.107 -> To Version 8.0.107 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b1b6c18b..4d4881954 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 704d16e07..8b4116e02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e05cb43bf772ccda90d93c1bc1aa6bc96e5ad60a + 8759cccda686ccebdbd59c90c9e0524082671198 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fc0f032755cfcebac6ed7030ae460c74e14d719 + f948ff8ad318aa94dbbe28db5b4205281c76b74a https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0fb8cdb031a9a70521cc5e7fdb25e0cd7cd03786 + 75693baf659b4a98a29d70c69a86de8752bf5c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - adccabf2ff002505d4dcc3019508647f0953f885 + 6c96e5e2b40908998ba65dac3171b90d6b3ca775 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d98706723..f2f9a5d09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.6-servicing.24267.11 + 8.0.7-servicing.24269.16 - 8.0.7-servicing.24268.1 + 8.0.7-servicing.24270.8 @@ -79,8 +79,8 @@ 8.0.107 - 8.0.107-servicing.24270.16 - 8.0.107-servicing.24270.16 + 8.0.107-servicing.24270.37 + 8.0.107-servicing.24270.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24270.4 - 8.0.7-servicing.24270.4 + 8.0.7-servicing.24270.15 + 8.0.7-servicing.24270.15 8.0.7 8.0.7