From b7c5b2dd5e9b61459c7ba2e58f306029ec791c0d Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 06:04:19 +0000 Subject: [PATCH] Merged PR 46820: [internal/release/8.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 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 8.0.12 to 8.0.13 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.12 to 8.0.13 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716 - **Build**: 20250116.3 - **Date Produced**: January 17, 2025 12:46:00 AM UTC - **Commit**: ffd0879b7792b899ae8210242a58cdc8529c8e7f - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3][1] - **Microsoft.Private.Winforms**: [from 8.0.12-servicing.24603.6 to 8.0.13-servicing.25066.3][1] - **System.Drawing.Common**: [from 8.0.12 to 8.0.13][1] - **Microsoft.NETCore.Platforms**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.12 to 8.0.13][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.13][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24603.5 to 8.0.13-servicing.25066.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC44b9411eeca123dd8b2c9d47afe46f9e537f1714&targetVersion=GCffd0879b7792b899ae8210242a58cdc8529c8e7f&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&targetVersion=GCeba546b0f0d448e0176a2222548fd7a2fbf464c0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716) --- NuGet.config | 4 ++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1046209f283..56b838af839 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,8 +5,10 @@ + + @@ -20,8 +22,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adbd9711018..1833b5cc29f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 44b9411eeca123dd8b2c9d47afe46f9e537f1714 + ffd0879b7792b899ae8210242a58cdc8529c8e7f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 44b9411eeca123dd8b2c9d47afe46f9e537f1714 + ffd0879b7792b899ae8210242a58cdc8529c8e7f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -17,9 +17,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -29,17 +29,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 89ef51c5d8f5239345127a1e282e11036e590c8b + eba546b0f0d448e0176a2222548fd7a2fbf464c0 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 44b9411eeca123dd8b2c9d47afe46f9e537f1714 + ffd0879b7792b899ae8210242a58cdc8529c8e7f diff --git a/eng/Versions.props b/eng/Versions.props index a5653f40b5b..1fab6c2a3ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,18 +22,18 @@ - 8.0.12-servicing.24603.6 + 8.0.13-servicing.25066.3 - 8.0.12-servicing.24603.5 - 8.0.12 - 8.0.12 - 8.0.12-servicing.24603.5 + 8.0.13-servicing.25066.9 + 8.0.13 + 8.0.13 + 8.0.13-servicing.25066.9 8.0.0 8.0.1 8.0.1 - 8.0.12 + 8.0.13 8.0.0 8.0.1 8.0.1