From 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 4 Dec 2024 05:18:19 +0000 Subject: [PATCH] Merged PR 45640: [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.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 8.0.11 to 8.0.12 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.11 to 8.0.12 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5 (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**: 20241203.6 - **Date Produced**: December 4, 2024 1:10:39 AM UTC - **Commit**: 44b9411eeca123dd8b2c9d47afe46f9e537f1714 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.12-servicing.24602.6 to 8.0.12-servicing.24603.6][1] - **Microsoft.Private.Winforms**: [from 8.0.12-servicing.24602.6 to 8.0.12-servicing.24603.6][1] - **System.Drawing.Common**: [from 8.0.12 to 8.0.12][1] - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][2] - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCfe8e03969a58c26f9737348c9fe8a53cca86f15e&targetVersion=GC44b9411eeca123dd8b2c9d47afe46f9e537f1714&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716) --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63ef424bbb9..749abbcf8e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,10 @@ + - + @@ -21,9 +22,10 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4163e1693f..e988ff6a4d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fe8e03969a58c26f9737348c9fe8a53cca86f15e + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fe8e03969a58c26f9737348c9fe8a53cca86f15e + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 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 - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b 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 - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b @@ -152,7 +152,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fe8e03969a58c26f9737348c9fe8a53cca86f15e + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 diff --git a/eng/Versions.props b/eng/Versions.props index 3b8bf8b964d..00348a8dae9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,14 +22,14 @@ - 8.0.12-servicing.24602.6 + 8.0.12-servicing.24603.6 - 8.0.11-servicing.24517.7 - 8.0.11 - 8.0.11 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 + 8.0.12 + 8.0.12 + 8.0.12-servicing.24603.5 8.0.0 8.0.1 8.0.1