From 8f6fa2d5a7ef6c9fdfe6452ce35ca4bd17cf3f55 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 25 Mar 2023 16:13:44 +0000 Subject: [PATCH] Merged PR 30224: [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**: - **Microsoft.NETCore.Platforms**: from 6.0.9 to 6.0.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.16 to 6.0.16 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.16 to 6.0.16 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11 (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**: 20230324.2 - **Date Produced**: March 24, 2023 8:43:27 PM UTC - **Commit**: 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][1] - **Microsoft.Private.Winforms**: [from 6.0.16-servicing.23171.2 to 6.0.16-servicing.23174.2][1] - **Microsoft.NETCore.Platforms**: [from 6.0.9 to 6.0.9][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.16 to 6.0.16][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.16 to 6.0.16][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.16-servicing.23170.9 to 6.0.16-servicing.23173.11][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC02e4f4f5bc&targetVersion=GC357cdc523d&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC567ff53ac7&targetVersion=GC1e620a42e7&_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 f59bba54f..75db4751f 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 d2651518d..2ca29705a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 02e4f4f5bc2d6027944d5144a3458bad23daa2ec + 357cdc523d68fa9f5eb1b96f4b5a113ffa92d76d https://github.com/dotnet/runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -57,13 +57,13 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://github.com/dotnet/runtime @@ -71,15 +71,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 567ff53ac7bd68feedcab3080d5a4c0ee480c928 + 1e620a42e71ca8c7efb033fd525f04be5fa701fe diff --git a/eng/Versions.props b/eng/Versions.props index 2f5c74d6b..f9665df63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,17 +26,17 @@ - 6.0.16-servicing.23171.2 + 6.0.16-servicing.23174.2 5.0.0-alpha1.19562.1 - 6.0.16-servicing.23170.9 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 + 6.0.16-servicing.23173.11 - 6.0.16-servicing.23170.9 + 6.0.16-servicing.23173.11 6.0.16 6.0.16 6.0.9 -- GitLab