From f971ec245a9aa0e7677b2fe6a565e2979cc59fde Mon Sep 17 00:00:00 2001 From: ProductConstructionServiceProd Date: Fri, 17 Jan 2025 18:01:31 +0000 Subject: [PATCH] Merged PR 46841: [internal/release/9.0] Update dependencies from dnceng/internal/dotnet-wpf 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.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.9.0**: from 9.0.1-servicing.24610.10 to 9.0.2-servicing.25066.10 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.Registry.AccessControl**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Win32.SystemEvents**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.CodeDom**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.ComponentModel.Composition**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Configuration.ConfigurationManager**: from 9.0.1 to 9.0.2 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 9.0.1-servicing.24610.6 to 9.0.2-servicing.25066.8 (parent: Microsoft.DotNet.Wpf.GitHub) - **System.Data.Odbc**: from 9.0.1 to 9.0.2 (parent: Microsoft... --- NuGet.config | 28 ++------ eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 3 files changed, 112 insertions(+), 132 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3a438b12..6221a03a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,20 +9,10 @@ - - - + - - - - - - - - - + @@ -37,20 +27,10 @@ - - - + - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13f406130..4ea7ab462 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 268a89320f55f14cc8a2cec94020f7bf44417fbf + 6498db3ee0fbc2790831b28cd47a7b8ef500cb17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c8acea22626efab11c13778c028975acdc34678f + 80aa709f5d919c6814726788dc6dabe23e79e672 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5a82e6f3c764285d3e2c5307e46fd5cbd546c7cd + f15a0b2339942cc52d7c24cb82739d8401ead77f diff --git a/eng/Versions.props b/eng/Versions.props index 17b22cab2..50e9cc306 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,49 +23,49 @@ 6.2.4 - 9.0.1-servicing.24610.10 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2-servicing.25066.10 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 6.0.0 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 5.0.0 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1 - 9.0.1-servicing.24610.10 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2 + 9.0.2-servicing.25066.10 4.10.0 - 9.0.1-servicing.24610.6 - 9.0.1 + 9.0.2-servicing.25066.8 + 9.0.2 - 9.0.2-rtm.25057.10 + 9.0.2-rtm.25067.2