From ce4e39eb5044d2fc508b7832c730b41229177b0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 13:00:16 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/wpf build 20241114.2 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 10.0.0-alpha.1.24563.1 -> To Version 10.0.0-alpha.1.24564.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17b6bc423..4cc5287a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,14 +9,14 @@ https://github.com/dotnet/winforms fae358b66661ccf60d44119bf2e0cc87ce8c75d4 - + https://github.com/dotnet/wpf - cbaeca87f0bd676b1ecd869338cf78b22f5295f7 + d4bb347f12fb541b988182cf97229433718736c0 - + https://github.com/dotnet/wpf - cbaeca87f0bd676b1ecd869338cf78b22f5295f7 + d4bb347f12fb541b988182cf97229433718736c0 https://github.com/dotnet/runtime @@ -34,9 +34,9 @@ https://github.com/dotnet/winforms fae358b66661ccf60d44119bf2e0cc87ce8c75d4 - + https://github.com/dotnet/wpf - cbaeca87f0bd676b1ecd869338cf78b22f5295f7 + d4bb347f12fb541b988182cf97229433718736c0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 804ada41b..afb0fa6d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,6 +65,6 @@ 10.0.0-alpha.1.24560.1 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24563.1 + 10.0.0-alpha.1.24564.2 From 3a430035b094dbda9505ebeeb965e720a40a0fc3 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Fri, 15 Nov 2024 09:55:16 -0800 Subject: [PATCH 2/4] Add file classification for System.Windows.Primitives.dll --- .../src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj index 41b86837a..b560ef127 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj @@ -53,6 +53,7 @@ + From 07a504781b6f7c2f41c474aebdf6fe38755bcf81 Mon Sep 17 00:00:00 2001 From: Loni Tra Date: Fri, 15 Nov 2024 11:36:47 -0800 Subject: [PATCH 3/4] move classification to directory.build.props to include in both ref and runtime --- src/windowsdesktop/src/sfx/Directory.Build.props | 1 + .../src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windowsdesktop/src/sfx/Directory.Build.props b/src/windowsdesktop/src/sfx/Directory.Build.props index 16a815dc6..9c6a040d4 100644 --- a/src/windowsdesktop/src/sfx/Directory.Build.props +++ b/src/windowsdesktop/src/sfx/Directory.Build.props @@ -75,6 +75,7 @@ + diff --git a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj index b560ef127..41b86837a 100644 --- a/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj +++ b/src/windowsdesktop/src/sfx/Microsoft.WindowsDesktop.App.Runtime.sfxproj @@ -53,7 +53,6 @@ - From b1d7972790d091ca9e5b15a88b284388ead91c00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Nov 2024 13:00:38 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/wpf build 20241118.1 Microsoft.DotNet.Wpf.GitHub , Microsoft.DotNet.Wpf.ProjectTemplates , Microsoft.NET.Sdk.WindowsDesktop From Version 10.0.0-alpha.1.24563.1 -> To Version 10.0.0-alpha.1.24568.1 Dependency coherency updates Microsoft.Private.Winforms,Microsoft.Internal.Runtime.WindowsDesktop.Transport,Microsoft.Private.Winforms,Microsoft.NETCore.App.Ref,Microsoft.Private.Winforms,VS.Redist.Common.NetCore.SharedFramework.x64.10.0,Microsoft.Private.Winforms,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.Private.Winforms,Microsoft.Win32.Registry.AccessControl,Microsoft.Private.Winforms,Microsoft.Win32.SystemEvents,Microsoft.Private.Winforms,System.CodeDom,Microsoft.Private.Winforms,System.ComponentModel.Composition,Microsoft.Private.Winforms,System.Configuration.ConfigurationManager,Microsoft.Private.Winforms,System.Data.Odbc,Microsoft.Private.Winforms,System.Data.OleDb,Microsoft.Private.Winforms,System.Diagnostics.EventLog,Microsoft.Private.Winforms,System.Diagnostics.PerformanceCounter,Microsoft.Private.Winforms,System.DirectoryServices.AccountManagement,Microsoft.Private.Winforms,System.DirectoryServices.Protocols,Microsoft.Private.Winforms,System.DirectoryServices,Microsoft.Private.Winforms,System.IO.Packaging,Microsoft.Private.Winforms,System.IO.Ports,Microsoft.Private.Winforms,System.Management,Microsoft.Private.Winforms,System.Reflection.Context,Microsoft.Private.Winforms,System.Runtime.Caching,Microsoft.Private.Winforms,System.Security.Cryptography.Pkcs,Microsoft.Private.Winforms,System.Security.Cryptography.ProtectedData,Microsoft.Private.Winforms,System.Security.Cryptography.Xml,Microsoft.Private.Winforms,System.Security.Permissions,Microsoft.Private.Winforms,System.ServiceModel.Syndication,Microsoft.Private.Winforms,System.ServiceProcess.ServiceController,Microsoft.Private.Winforms,System.Speech,Microsoft.Private.Winforms,System.Text.Encoding.CodePages,Microsoft.Private.Winforms,System.Threading.AccessControl,Microsoft.Private.Winforms,System.ComponentModel.Composition.Registration,System.Drawing.Common From Version 10.0.0-alpha.1.24560.1 -> To Version 10.0.0-alpha.1.24566.1 (parent: Microsoft.DotNet.Wpf.GitHub --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++--------- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cc5287a6..cc0fe1532 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,154 +1,154 @@ - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/winforms - fae358b66661ccf60d44119bf2e0cc87ce8c75d4 + 98c761f4d9863f99cdb48ac9e87feef01d5c595e - + https://github.com/dotnet/wpf - d4bb347f12fb541b988182cf97229433718736c0 + d73dd1dbd908398cef7f50e57812e55b90ed3676 - + https://github.com/dotnet/wpf - d4bb347f12fb541b988182cf97229433718736c0 + d73dd1dbd908398cef7f50e57812e55b90ed3676 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/winforms - fae358b66661ccf60d44119bf2e0cc87ce8c75d4 + 98c761f4d9863f99cdb48ac9e87feef01d5c595e - + https://github.com/dotnet/wpf - d4bb347f12fb541b988182cf97229433718736c0 + d73dd1dbd908398cef7f50e57812e55b90ed3676 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/runtime - 5db0ce0fa2e206da664498044af233a044f9aeb7 + 55eee324653e01cf28809d02b25a5b0894b58d22 - + https://github.com/dotnet/winforms - fae358b66661ccf60d44119bf2e0cc87ce8c75d4 + 98c761f4d9863f99cdb48ac9e87feef01d5c595e diff --git a/eng/Versions.props b/eng/Versions.props index afb0fa6d1..3716ddd10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -22,49 +22,49 @@ 6.8.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 5.0.0 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 5.0.0 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 5.0.0 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 6.0.0 5.0.0 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 5.0.0 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 + 10.0.0-alpha.1.24565.3 4.10.0 - 10.0.0-alpha.1.24560.1 - 10.0.0-alpha.1.24560.1 + 10.0.0-alpha.1.24566.1 + 10.0.0-alpha.1.24566.1 - 10.0.0-alpha.1.24564.2 + 10.0.0-alpha.1.24568.1