From fe3d2c72ea8a7acf4371592ba41d7f7b49e141b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 09:52:46 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/winforms (#10152) [main] Update dependencies from dotnet/winforms - Coherency Updates: - System.Reflection.MetadataLoadContext: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Windows.Extensions: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.Platforms: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Resources.Extensions: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Runtime.Serialization.Formatters: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Ref: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Microsoft.NETCore.App.Runtime.win-x64: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - VS.Redist.Common.NetCore.SharedFramework.x64.10.0: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Microsoft.Win32.Registry.AccessControl: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Microsoft.Win32.SystemEvents: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.CodeDom: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.ComponentModel.Composition: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Configuration.ConfigurationManager: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Data.Odbc: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Data.OleDb: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Diagnostics.EventLog: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Diagnostics.PerformanceCounter: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.DirectoryServices.AccountManagement: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.DirectoryServices.Protocols: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.DirectoryServices: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Formats.Nrbf: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.IO.Packaging: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.IO.Ports: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Management: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Reflection.Context: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Runtime.Caching: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Pkcs: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.ProtectedData: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Security.Cryptography.Xml: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Security.Permissions: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.ServiceModel.Syndication: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.ServiceProcess.ServiceController: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Speech: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Text.Encoding.CodePages: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.Threading.AccessControl: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - System.ComponentModel.Composition.Registration: from 10.0.0-alpha.1.24605.1 to 10.0.0-alpha.1.24609.1 (parent: Microsoft.Private.Winforms) - Merge branch 'main' into darc-main-833425a3-f424-4383-bb9b-1c12cc0818f3 - Updating TFM from .NET 9 to .NET 10 --- Directory.Build.props | 4 +- eng/Version.Details.xml | 156 +++++++++--------- eng/Versions.props | 36 ++-- .../PresentationBuildTasks.csproj | 2 +- 4 files changed, 99 insertions(+), 99 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 3b3c53502e5..e186a4b28c7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,8 +2,8 @@ wpf true - net9.0 - 9.0 + net10.0 + 10.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3d1bd69135..eeb5c974829 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,167 +1,167 @@ - + https://github.com/dotnet/winforms - 6ecb29a0b34c73048062257c1cab74b219759260 + e50878fca2173bed38cd4aba2767da86101ec8b8 - + https://github.com/dotnet/winforms - 6ecb29a0b34c73048062257c1cab74b219759260 + e50878fca2173bed38cd4aba2767da86101ec8b8 - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 726c62718af03d61fba006a54ad8d87c8abc64de - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/runtime - e99557baffbe864d624cc1c95c9cbf2eefae684f + b085dadd160066d945ea638f0391091b1c96524d - + https://github.com/dotnet/winforms - 6ecb29a0b34c73048062257c1cab74b219759260 + e50878fca2173bed38cd4aba2767da86101ec8b8 diff --git a/eng/Versions.props b/eng/Versions.props index 87bae434952..a1fc97fdd9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,28 +21,28 @@ - 10.0.0-alpha.1.24605.2 + 10.0.0-alpha.1.24609.4 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.2 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.4 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 4.6.0-preview4.19176.11 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 - 10.0.0-alpha.1.24605.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 + 10.0.0-alpha.1.24609.1 6.0.0 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index feb1f48042d..8627c32bddd 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,6 @@  - net472;net9.0 + net472;net10.0 false true