From 6ffc948a34f3d2cb6aa6953b4d3e717bdea19be0 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 24 Feb 2022 23:02:01 +0000 Subject: [PATCH] Merged PR 21441: [internal/release/6.0.1xx] 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.NETCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 6.0.2 to 6.0.2 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.3-servicing.22116.12 to 6.0.3-servicing.22124.1 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.103-servicing.22121.10 to 6.0.103-servicing.22123.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.103 to 6.0.103 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22115.5 to 6.0.3-servicing.22123.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20220224.11 - **Date Produced**: February 24, 2022 8:11:47 PM UTC - **Commit**: 574686d9d185bd75770481fa76a82a0871210af4 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NET.Sdk**: [from 6.0.103-servicing.22121.9 to 6.0.103-servicing.22124.11][3] - **Microsoft.NETCor... --- NuGet.config | 16 +++++++----- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------ 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3161d5b43..bcfae53a4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,8 @@ - + + @@ -15,12 +16,13 @@ - + - + + @@ -44,17 +46,19 @@ - + + - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b1761316..e800715b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 30b96c6f9f788aee704113c6765c56810faa382a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 @@ -50,32 +50,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 10db7350e1288caf09e684e1b219f8f5b08eca02 + c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 04bc56baf4ba53819acd523047e47b1ed3b9f8f2 + c911002ab43b7b989ed67090f2a48d9073d5118d https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 988d95c1dbb18d71685650fc73344f7b92740ad8 + f165acec106eb72d2a9e6a91c48b462884cb1c55 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 + 67f3050c6c9efe0a24ba64bdbb1d825d93711902 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3d6f35bae36e4f0eac78ee90d58f695ad2ce2ef3 + 67f3050c6c9efe0a24ba64bdbb1d825d93711902 diff --git a/eng/Versions.props b/eng/Versions.props index 0cdc7ec3f..8dfdee191 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.3 6.0.3 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 - 6.0.3-servicing.22116.12 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 + 6.0.3-servicing.22124.1 0.2.0 - 6.0.103-servicing.22121.9 - 6.0.103-servicing.22121.9 + 6.0.103-servicing.22124.14 + 6.0.103-servicing.22124.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.3-servicing.22115.5 - 6.0.3-servicing.22115.5 + 6.0.3-servicing.22123.9 + 6.0.3-servicing.22123.9 6.0.3 6.0.3 6.0.3