From 1c87de035748de4cb1c40edde6b8184daef7aefd Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 22 Jan 2023 17:41:33 +0000 Subject: [PATCH] Merged PR 29033: [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**: - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.14-servicing.23067.7 to 6.0.14-servicing.23070.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.14-servicing.23068.14 to 6.0.14-servicing.23070.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.406-rtm.23069.2 to 6.0.406-rtm.23070.11 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.406 to 6.0.406 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20230120.36 - **Date Produced**: January 21, 2023 6:32:52 AM UTC - **Commit**: 8142ddd5a92589859c058681f3bf58372c1f87a4 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **Microsoft.NET.Sdk**: [from 6.0.406-servicing.23069.18 to 6.0.406-servicing.23070.36][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23067.7 to 6... --- NuGet.config | 12 +++++----- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index f0974c636..cd62f1e28 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,17 @@ - + - + - + @@ -41,13 +41,13 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a01c1776..56fecfbf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 27be4a15f0ecfb8ac6b958b99a4cafebd2073476 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8515e4c5a352c94e65e742031a5079ca76fdb3e7 + 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ed4052880569959106dff1c87fee61f86881f847 + a1bfef7bb9b42d541075d352ba22e039d2e700eb https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 371ce7e98e618aca8770fbd52dfe1d027908e357 + 3808dc647c961aec9812a18f6454fd33f7cb4a8c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3f72a022e604f6c692c9764a296efe50e52316f1 + 8142ddd5a92589859c058681f3bf58372c1f87a4 diff --git a/eng/Versions.props b/eng/Versions.props index 832f0aa7b..ef79c6b78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.14 6.0.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 - 6.0.14-servicing.23068.14 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 + 6.0.14-servicing.23070.15 0.2.0 - 6.0.406-servicing.23069.18 - 6.0.406-servicing.23069.18 + 6.0.406-servicing.23070.36 + 6.0.406-servicing.23070.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.14-servicing.23067.7 - 6.0.14-servicing.23067.7 + 6.0.14-servicing.23070.4 + 6.0.14-servicing.23070.4 6.0.14 6.0.14 6.0.14