From 3130a1d8c17fddac6f701c01350b578931a6c0c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 18 Jun 2024 22:58:55 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/winforms build 20240618.3 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 9.0.0-preview.6.24317.4 -> To Version 9.0.0-preview.6.24318.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.6.24316.2 -> To Version 9.0.0-preview.6.24318.4 (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 488721d5a38..b72c6409bb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,159 +1,159 @@ - + https://github.com/dotnet/winforms - 0b65434cd603384a4354be1861404c8ad3df0460 + 69c3e1ffc57a6e9812dd58263affa58ca50b5567 - + https://github.com/dotnet/winforms - 0b65434cd603384a4354be1861404c8ad3df0460 + 69c3e1ffc57a6e9812dd58263affa58ca50b5567 - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b1b9369649321c91ab7c65e8a1c0cb8c1c5d17af - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/runtime - f4fd3ea470aeef5a7c843e9fd5fa1ce50b6b5b70 + 808328e4e4513192597ce0d3d278b1f632beafac - + https://github.com/dotnet/winforms - 0b65434cd603384a4354be1861404c8ad3df0460 + 69c3e1ffc57a6e9812dd58263affa58ca50b5567 diff --git a/eng/Versions.props b/eng/Versions.props index 20542770d87..63f9424458a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,26 +21,26 @@ - 9.0.0-preview.6.24317.4 + 9.0.0-preview.6.24318.3 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24317.4 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.3 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 4.6.0-preview4.19176.11 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 - 9.0.0-preview.6.24316.2 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.4 From c7b0c434030e6d91f631c34afc356bb92d84caa8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 01:35:35 +0000 Subject: [PATCH 2/7] Update dependencies from https://github.com/dotnet/winforms build 20240618.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 9.0.0-preview.6.24317.4 -> To Version 9.0.0-preview.6.24318.4 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.6.24316.2 -> To Version 9.0.0-preview.6.24318.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 b72c6409bb8..a941d86f804 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,159 +1,159 @@ - + https://github.com/dotnet/winforms - 69c3e1ffc57a6e9812dd58263affa58ca50b5567 + d768c8b927117995f9cfa2423a8d2d4c6253e080 - + https://github.com/dotnet/winforms - 69c3e1ffc57a6e9812dd58263affa58ca50b5567 + d768c8b927117995f9cfa2423a8d2d4c6253e080 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int b1b9369649321c91ab7c65e8a1c0cb8c1c5d17af - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/runtime - 808328e4e4513192597ce0d3d278b1f632beafac + 01b0a30b48c78c98e54901a356a47a1019f24c74 - + https://github.com/dotnet/winforms - 69c3e1ffc57a6e9812dd58263affa58ca50b5567 + d768c8b927117995f9cfa2423a8d2d4c6253e080 diff --git a/eng/Versions.props b/eng/Versions.props index 63f9424458a..eab8ec21db1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,26 +21,26 @@ - 9.0.0-preview.6.24318.3 + 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.3 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 4.6.0-preview4.19176.11 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 - 9.0.0-preview.6.24318.4 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 From 8ba47c0631426eba08dc8167cc2c2c98403759fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Jun 2024 02:00:34 +0000 Subject: [PATCH 3/7] Update dependencies from https://github.com/dotnet/winforms build 20240618.4 Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms , System.Drawing.Common From Version 9.0.0-preview.6.24317.4 -> To Version 9.0.0-preview.6.24318.4 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.6.24316.2 -> To Version 9.0.0-preview.6.24318.5 (parent: Microsoft.Private.Winforms From a9c9b7d79804ad526f9193186b5656099d8e21e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Wed, 19 Jun 2024 06:10:42 +0200 Subject: [PATCH 4/7] System.Runtime.Serialization.Formatters is now a pacakge --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + eng/WpfArcadeSdk/tools/TestProjects.targets | 1 + .../src/PresentationCore/PresentationCore.csproj | 2 +- .../src/PresentationCore/ref/PresentationCore-ref.csproj | 2 +- .../src/PresentationFramework/PresentationFramework.csproj | 2 +- .../ref/PresentationFramework-ref.csproj | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 2 +- 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a941d86f804..8c9957c7585 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,6 +30,10 @@ https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 + + https://github.com/dotnet/runtime + 01b0a30b48c78c98e54901a356a47a1019f24c74 + https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 diff --git a/eng/Versions.props b/eng/Versions.props index eab8ec21db1..b6da02cdb05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,6 +38,7 @@ 9.0.0-preview.6.24318.5 4.6.0-preview4.19176.11 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets index 8fdc440ae42..2c8fd22bf80 100644 --- a/eng/WpfArcadeSdk/tools/TestProjects.targets +++ b/eng/WpfArcadeSdk/tools/TestProjects.targets @@ -29,6 +29,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 1f871954561..9442117032b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1408,7 +1408,6 @@ - @@ -1422,6 +1421,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index 75d9e1c713d..bf664244dfa 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -50,7 +50,6 @@ - @@ -63,6 +62,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e528a95d225..e8c4ad72911 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1403,7 +1403,6 @@ - @@ -1447,6 +1446,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index b7ea8c46323..aee50c1a082 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -58,7 +58,6 @@ - @@ -90,6 +89,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 12c475845a1..50835c9cceb 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -111,7 +111,6 @@ - @@ -122,6 +121,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 7498f329404..4ee89cf75f8 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -38,7 +38,6 @@ - @@ -49,6 +48,7 @@ + From 444a93758ecd10d86299a9e5e4f96aca40afd45a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?= Date: Wed, 19 Jun 2024 06:29:11 +0200 Subject: [PATCH 5/7] Revert "System.Runtime.Serialization.Formatters is now a pacakge" This reverts commit a9c9b7d79804ad526f9193186b5656099d8e21e1. --- eng/Version.Details.xml | 4 ---- eng/Versions.props | 1 - eng/WpfArcadeSdk/tools/TestProjects.targets | 1 - .../src/PresentationCore/PresentationCore.csproj | 2 +- .../src/PresentationCore/ref/PresentationCore-ref.csproj | 2 +- .../src/PresentationFramework/PresentationFramework.csproj | 2 +- .../ref/PresentationFramework-ref.csproj | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 2 +- 9 files changed, 6 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c9957c7585..a941d86f804 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,10 +30,6 @@ https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 - - https://github.com/dotnet/runtime - 01b0a30b48c78c98e54901a356a47a1019f24c74 - https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 diff --git a/eng/Versions.props b/eng/Versions.props index b6da02cdb05..eab8ec21db1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,7 +38,6 @@ 9.0.0-preview.6.24318.5 4.6.0-preview4.19176.11 9.0.0-preview.6.24318.5 - 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets index 2c8fd22bf80..8fdc440ae42 100644 --- a/eng/WpfArcadeSdk/tools/TestProjects.targets +++ b/eng/WpfArcadeSdk/tools/TestProjects.targets @@ -29,7 +29,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 9442117032b..1f871954561 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1408,6 +1408,7 @@ + @@ -1421,7 +1422,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index bf664244dfa..75d9e1c713d 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -50,6 +50,7 @@ + @@ -62,7 +63,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e8c4ad72911..e528a95d225 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1403,6 +1403,7 @@ + @@ -1446,7 +1447,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index aee50c1a082..b7ea8c46323 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -58,6 +58,7 @@ + @@ -89,7 +90,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 50835c9cceb..12c475845a1 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -111,6 +111,7 @@ + @@ -121,7 +122,6 @@ - diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 4ee89cf75f8..7498f329404 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -38,6 +38,7 @@ + @@ -48,7 +49,6 @@ - From b4110798ff1f688af723d77ff38bcb07b99aebc0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 Jun 2024 09:56:11 +0200 Subject: [PATCH 6/7] Reapply "System.Runtime.Serialization.Formatters is now a pacakge" This reverts commit 444a93758ecd10d86299a9e5e4f96aca40afd45a. --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + eng/WpfArcadeSdk/tools/TestProjects.targets | 1 + .../src/PresentationCore/PresentationCore.csproj | 2 +- .../src/PresentationCore/ref/PresentationCore-ref.csproj | 2 +- .../src/PresentationFramework/PresentationFramework.csproj | 2 +- .../ref/PresentationFramework-ref.csproj | 2 +- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 2 +- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 2 +- 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a941d86f804..8c9957c7585 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,6 +30,10 @@ https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 + + https://github.com/dotnet/runtime + 01b0a30b48c78c98e54901a356a47a1019f24c74 + https://github.com/dotnet/runtime 01b0a30b48c78c98e54901a356a47a1019f24c74 diff --git a/eng/Versions.props b/eng/Versions.props index eab8ec21db1..b6da02cdb05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -38,6 +38,7 @@ 9.0.0-preview.6.24318.5 4.6.0-preview4.19176.11 9.0.0-preview.6.24318.5 + 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 9.0.0-preview.6.24318.5 diff --git a/eng/WpfArcadeSdk/tools/TestProjects.targets b/eng/WpfArcadeSdk/tools/TestProjects.targets index 8fdc440ae42..2c8fd22bf80 100644 --- a/eng/WpfArcadeSdk/tools/TestProjects.targets +++ b/eng/WpfArcadeSdk/tools/TestProjects.targets @@ -29,6 +29,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 1f871954561..9442117032b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1408,7 +1408,6 @@ - @@ -1422,6 +1421,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index 75d9e1c713d..bf664244dfa 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -50,7 +50,6 @@ - @@ -63,6 +62,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e528a95d225..e8c4ad72911 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1403,7 +1403,6 @@ - @@ -1447,6 +1446,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index b7ea8c46323..aee50c1a082 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -58,7 +58,6 @@ - @@ -90,6 +89,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 12c475845a1..50835c9cceb 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -111,7 +111,6 @@ - @@ -122,6 +121,7 @@ + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 7498f329404..4ee89cf75f8 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -38,7 +38,6 @@ - @@ -49,6 +48,7 @@ + From b895603fac151d415a21ff19b07d80684d395a07 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 19 Jun 2024 10:16:16 +0200 Subject: [PATCH 7/7] Fix System.Runtime.Serialization.Formatters RAR lookup --- .../src/PresentationCore/PresentationCore.csproj | 3 ++- .../src/PresentationCore/ref/PresentationCore-ref.csproj | 3 ++- .../src/PresentationFramework/PresentationFramework.csproj | 3 ++- .../PresentationFramework/ref/PresentationFramework-ref.csproj | 3 ++- src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj | 3 ++- .../src/System.Xaml/ref/System.Xaml-ref.csproj | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj index 9442117032b..3cdb8174bce 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj @@ -1421,7 +1421,8 @@ - + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj index bf664244dfa..80380ec2120 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/ref/PresentationCore-ref.csproj @@ -62,7 +62,8 @@ - + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj index e8c4ad72911..ecb8e8dd265 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj @@ -1446,7 +1446,8 @@ - + + diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj index aee50c1a082..def41db3429 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationFramework/ref/PresentationFramework-ref.csproj @@ -89,7 +89,8 @@ - + + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj index 50835c9cceb..73ce444dbb0 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/System.Xaml.csproj @@ -121,7 +121,8 @@ - + + diff --git a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj index 4ee89cf75f8..c125f185415 100644 --- a/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj +++ b/src/Microsoft.DotNet.Wpf/src/System.Xaml/ref/System.Xaml-ref.csproj @@ -48,7 +48,8 @@ - + +