From 6405b4c3bded73455ca03f6f103b274411f19895 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 18:20:27 +0000 Subject: [PATCH] Merged PR 36616: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.4 to 6.0.27-servicing.24067.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.26-servicing.23605.8 to 6.0.27-servicing.24066.28 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.26-servicing.23605.6 to 6.0.27-servicing.24067.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.418-rtm.23605.6 to 6.0.419-rtm.24067.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.418 to 6.0.419 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.26-servicing.23605.5 to 6.0.27-servicing.24067.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.26 to 6.0.27 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.26-servicing.23605.3 to 6.0.27-servicing.24067.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.C... --- NuGet.config | 29 ++++--------- eng/Version.Details.xml | 94 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++---------- 3 files changed, 77 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index a286d7217..0e13fbfe7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,20 @@ + - - - - - - + - - - + - - - + @@ -49,21 +41,16 @@ + - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a9fb7cf5..2d13d9cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 84ebced93b7a69ba3332fe6000354306d4eea9dd + 3ecb49d3797e77df68db6c267a2c3a6d12dd7e83 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dc45e96840243b203b13e61952230e225d2aac52 + 32bc9e9e11138e57ee329f06cc1e870075eda725 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d504a7b7dab277712646747e9f5cce0d9507245e + 8feb4df7955281c07a246c08ec70d6f0da3530e1 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 766ee832e4d9d2d685414fceae96dca3c4e4dcbc + 27362cdf91a189f091cd343b92b147b871dc6181 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 27f723cb002f38336f60be5644dbe9e59cb2678a + ac40f93a6256add2d43ac56332518b82ac8726a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c309ca06b81112f5e42cc9ca6f8bf0c4a772be6b + c92bca031b633bb527ac58a44e8f0127ab8984ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e5b72d0fb5a405d5443b571ba1d78f419bdbcdb7 + c259e4173d70ad05737b7d838235c015fa25258b https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - 5ccc36f5985e2089f47c97a19c250e65ddefd0ba + 5460e2cb3721954528c452d9d32474e4c32b7141 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f8c424ff5..3a742389e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.26-servicing.23605.5 + 6.0.27-servicing.24067.5 - 6.0.26-servicing.23605.3 + 6.0.27-servicing.24067.2 - 6.0.418 + 6.0.419 @@ -44,20 +44,20 @@ - 6.0.26 - 6.0.26 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 - 6.0.26-servicing.23605.6 + 6.0.27 + 6.0.27 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 + 6.0.27-servicing.24067.9 0.2.0 - 6.0.419-servicing.24059.36 - 6.0.419-servicing.24059.36 + 6.0.419-servicing.24068.22 + 6.0.419-servicing.24068.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.26-servicing.23605.8 - 6.0.26-servicing.23605.8 - 6.0.26 - 6.0.26 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24066.28 + 6.0.27-servicing.24066.28 + 6.0.27 + 6.0.27 + 6.0.27 + 6.0.27 2.1.0 - 6.0.26-servicing.23605.4 - 6.0.26-servicing.23605.4 - 6.0.26 - 6.0.26 + 6.0.27-servicing.24067.4 + 6.0.27-servicing.24067.4 + 6.0.27 + 6.0.27 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.418 + 6.0.419 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion)