From 9e190e3d952203836d77bb0f1c42984524e1122d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 24 Jan 2023 16:28:18 +0000 Subject: [PATCH] Merged PR 29133: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms 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**: - **System.DirectoryServices**: from 6.0.1 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.14 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.14 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230124.2 - **Date Produced**: January 24, 2023 3:49:40 PM UTC - **Commit**: 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][1] - **Microsoft.Private.Winforms**: [from 6.0.14-servicing.23070.2 to 6.0.14-servicing.23074.2][1] - **System.DirectoryServices**: [from 6.0.1 to 6.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.14][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.14][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23070.4 to 6.0.14-servicing.23073.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC18f3f47&targetVersion=GC4bc32ea&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC51b4c94&targetVersion=GC2a90daa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 75dbee2ea..ae5ec38be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ad6ca91d..abce83eb4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 18f3f47e1880fa6cea7648845ea73c74cf7a9857 + 4bc32ea9adb33cefd6131fcd533e35e3e7e83441 https://github.com/dotnet/runtime @@ -23,7 +23,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 51b4c949feae0e7d5980ac6b3c52ed68628be4c1 + 2a90daa2cc41ae8f11a2c1519cb8b235f609251a diff --git a/eng/Versions.props b/eng/Versions.props index 34db903ac..fed3684a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.14-servicing.23070.2 + 6.0.14-servicing.23074.2 5.0.0-alpha1.19562.1 - 6.0.14-servicing.23070.4 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 + 6.0.14-servicing.23073.9 - 6.0.14-servicing.23070.4 + 6.0.14-servicing.23073.9 6.0.14 6.0.14 6.0.7 -- GitLab