From acb118da996769326cbe2252448e7c5242ddb337 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 May 2024 01:52:26 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/winforms build 20240524.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 9.0.0-preview.5.24268.1 -> To Version 9.0.0-preview.5.24274.3 Dependency coherency updates System.Reflection.MetadataLoadContext,System.Windows.Extensions,Microsoft.NETCore.Platforms,System.Resources.Extensions,Microsoft.NETCore.App.Ref,Microsoft.NETCore.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.9.0,Microsoft.Win32.Registry.AccessControl,Microsoft.Win32.SystemEvents,System.CodeDom,System.ComponentModel.Composition,System.Configuration.ConfigurationManager,System.Data.Odbc,System.Data.OleDb,System.Diagnostics.EventLog,System.Diagnostics.PerformanceCounter,System.DirectoryServices.AccountManagement,System.DirectoryServices.Protocols,System.DirectoryServices,System.IO.Packaging,System.IO.Ports,System.Management,System.Reflection.Context,System.Runtime.Caching,System.Security.Cryptography.Pkcs,System.Security.Cryptography.ProtectedData,System.Security.Cryptography.Xml,System.Security.Permissions,System.ServiceModel.Syndication,System.ServiceProcess.ServiceController,System.Speech,System.Text.Encoding.CodePages,System.Threading.AccessControl,System.ComponentModel.Composition.Registration From Version 9.0.0-preview.5.24265.2 -> To Version 9.0.0-preview.5.24274.5 (parent: Microsoft.Private.Winforms --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 32 ++++----- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13554dcee2c..348679bd07f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,159 +1,159 @@ - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 6074f8ba078ab51c0219ffb2ef6d98eb1a37ef5a - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 6074f8ba078ab51c0219ffb2ef6d98eb1a37ef5a - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 701fc967d3cbac7d477b34e466e2762e2d6a7a00 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/runtime - 1f08a3621e6b531b31e358b99b4c54ba556a61c0 + 1594d257e7195c6d0d3919210802bc9528eabcb4 - + https://github.com/dotnet/winforms - 0aa3a4dfea1dad493ecbfe15cd513604468b3916 + 6074f8ba078ab51c0219ffb2ef6d98eb1a37ef5a diff --git a/eng/Versions.props b/eng/Versions.props index 6337c4d0198..fa7b4dadd67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,26 +21,26 @@ - 9.0.0-preview.5.24268.1 + 9.0.0-preview.5.24274.3 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24268.1 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.3 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 4.6.0-preview4.19176.11 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 - 9.0.0-preview.5.24265.2 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 + 9.0.0-preview.5.24274.5 From e46e9e948498956ff5bf04cf46c8a0b813b08839 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 28 May 2024 10:51:07 -0700 Subject: [PATCH 2/3] Fix setting of RuntimeFrameworkVersion `TargetFrameworkIdentifier` should not be used in props files since it is not set this early. There was also a problem with the unsetting condition using >= rather than <. That can be removed if we refactor the setting to happen in the targets file. --- .../tools/RuntimeFrameworkReference.props | 9 +----- .../tools/RuntimeFrameworkReference.targets | 29 ++++++++++--------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props index cfd681c5a28..ff7880c6991 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.props @@ -1,14 +1,7 @@ - - $(MicrosoftNETCoreAppRuntimewinx64Version) - - true - + diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets index 6508da7948d..95cb707750b 100644 --- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets +++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets @@ -1,27 +1,27 @@ - - - - + $(MicrosoftNETCoreAppRefVersion) - @@ -29,7 +29,10 @@ - - + $(MicrosoftNETCoreAppRuntimewinx64Version) From df898cbc83c3d4455835a2dbd69ad085fffe10a4 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 28 May 2024 13:35:36 -0700 Subject: [PATCH 3/3] Fix Platform for System.Xaml.Tests Platform was set to Win32 rather than x86. --- Microsoft.Dotnet.Wpf.sln | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Microsoft.Dotnet.Wpf.sln b/Microsoft.Dotnet.Wpf.sln index 712d90ca334..7ebede6c62b 100644 --- a/Microsoft.Dotnet.Wpf.sln +++ b/Microsoft.Dotnet.Wpf.sln @@ -1932,9 +1932,9 @@ Global {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.ActiveCfg = Debug|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Build.0 = Debug|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x64.Deploy.0 = Debug|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|Win32 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.ActiveCfg = Debug|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Build.0 = Debug|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Debug|x86.Deploy.0 = Debug|x86 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.ActiveCfg = Release|Win32 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Build.0 = Release|Win32 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|Any CPU.Deploy.0 = Release|Win32 @@ -1943,9 +1943,9 @@ Global {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.ActiveCfg = Release|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Build.0 = Release|x64 {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x64.Deploy.0 = Release|x64 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|Win32 - {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|Win32 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.ActiveCfg = Release|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Build.0 = Release|x86 + {B2F2A89C-55C9-41B1-A645-0948609BD8BE}.Release|x86.Deploy.0 = Release|x86 {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F2C0E0E-BB13-46D9-8D9A-08256A49ECA9}.Debug|ARM64.ActiveCfg = Debug|arm64