From c9ce9473e125089aa10770b676d4a19bae4fa067 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 21 Nov 2022 23:19:51 +0000 Subject: [PATCH] Merged PR 27732: [internal/release/6.0.3xx] 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.AspNetCore.App.Ref**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.12 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.307 to 6.0.307 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9 - **Build**: 20221121.17 - **Date Produced**: November 21, 2022 10:36:24 PM UTC - **Commit**: 923a0bd20698ff7e1109ee8f639240bc089d1ebc - **Branch**: refs/heads/internal/release/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.NET.Sdk**: [from 6.0.307-servicing.22569.2 to 6.0.307-servicing.22571.17][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.12 to 6.0.12][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.12 to 6.0.12][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-dev-certs**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **dotnet-user-secrets**: [from 6.0.12-servicing.22568.11 to 6.0.12-servicing.22571.9][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.307 to 6.0.307][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.307-servicing.22568.6 to 6.0.307-servicing.22571.12][3] ... --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2164ea3b..24c5266f4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d14babfe..4265684a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6a747bbcc3c3cffac5ee537791157e33bd373119 + 54142bcb25544b72fac28b1b061e7788c91c4f49 https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 16555ee21cb3fb1aa47d1da4cabe6b992c996e79 + 4a811dfe7d5b6f672237b3938a5f6120cf0ff0d5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 088530583952a8bc3348eedca0403b7e8dc37012 + 923a0bd20698ff7e1109ee8f639240bc089d1ebc diff --git a/eng/Versions.props b/eng/Versions.props index 04f09e8d7..654cca3c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.12 6.0.12 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 - 6.0.12-servicing.22568.11 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 + 6.0.12-servicing.22571.9 0.2.0 - 6.0.307-servicing.22569.2 - 6.0.307-servicing.22569.2 + 6.0.307-servicing.22571.17 + 6.0.307-servicing.22571.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)