From 0ce5bb64b3e6221ba88228c6285279f47f463d97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Mar 2025 19:41:59 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/windowsdesktop build 20250328.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0 From Version 10.0.0-preview.4.25177.2 -> To Version 10.0.0-preview.4.25178.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 10.0.0-preview.4.25177.1 -> To Version 10.0.0-preview.4.25178.3 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19502093ff18..224dd4741cab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,26 +278,26 @@ https://github.com/dotnet/runtime 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/windowsdesktop - bed6a81b30d9dabbb5aa6301c9e9152b671aed2a + 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a - + https://github.com/dotnet/windowsdesktop - bed6a81b30d9dabbb5aa6301c9e9152b671aed2a + 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a - + https://github.com/dotnet/windowsdesktop - bed6a81b30d9dabbb5aa6301c9e9152b671aed2a + 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a - + https://github.com/dotnet/windowsdesktop - bed6a81b30d9dabbb5aa6301c9e9152b671aed2a + 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a - + https://github.com/dotnet/wpf - cfb8ddc81be25838a0d0c11142e04adbb4fc8903 + 2a8258a72936092b24082c3e19f88d4b3e7e1e02 https://github.com/dotnet/aspnetcore @@ -445,13 +445,13 @@ - + https://github.com/dotnet/winforms - 5e9dab651de1d8b4e8b379beac70319904ee1538 + 5d908dd29c55b43598b14ece5a8e5429b965c058 - + https://github.com/dotnet/wpf - cfb8ddc81be25838a0d0c11142e04adbb4fc8903 + 2a8258a72936092b24082c3e19f88d4b3e7e1e02 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c68cec21751f..0e8f36ba1817 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -92,7 +92,7 @@ - 10.0.0-preview.4.25174.6 + 10.0.0-preview.4.25177.2 @@ -149,9 +149,9 @@ - 10.0.0-preview.4.25177.2 - 10.0.0-preview.4.25177.2 - 10.0.0-preview.4.25177.2 + 10.0.0-preview.4.25178.1 + 10.0.0-preview.4.25178.1 + 10.0.0-preview.4.25178.1 @@ -258,8 +258,8 @@ - 10.0.0-preview.4.25177.1 - 10.0.0-preview.4.25177.1 + 10.0.0-preview.4.25178.3 + 10.0.0-preview.4.25178.3 2.2.0-beta.19072.10 From a983c053da51419247d47a4b6421c50caf225667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Mar 2025 05:55:23 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/windowsdesktop build 20250328.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0 From Version 10.0.0-preview.4.25177.2 -> To Version 10.0.0-preview.4.25178.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 224dd4741cab..a0430c9422a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,22 +278,22 @@ https://github.com/dotnet/runtime 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/windowsdesktop - 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a + 743128486680b1d4641a917e9399307e24e3dc9b - + https://github.com/dotnet/windowsdesktop - 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a + 743128486680b1d4641a917e9399307e24e3dc9b - + https://github.com/dotnet/windowsdesktop - 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a + 743128486680b1d4641a917e9399307e24e3dc9b - + https://github.com/dotnet/windowsdesktop - 5aa9044c8add6b97eb85aea167a6d5b4d2dd9e6a + 743128486680b1d4641a917e9399307e24e3dc9b https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 0e8f36ba1817..529e477163b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,9 +149,9 @@ - 10.0.0-preview.4.25178.1 - 10.0.0-preview.4.25178.1 - 10.0.0-preview.4.25178.1 + 10.0.0-preview.4.25178.2 + 10.0.0-preview.4.25178.2 + 10.0.0-preview.4.25178.2 From 90d50d3c3feae1ab561af49be0a33040a8f89d22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 30 Mar 2025 05:42:06 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/windowsdesktop build 20250329.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.10.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.10.0 From Version 10.0.0-preview.4.25177.2 -> To Version 10.0.0-preview.4.25179.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a0430c9422a2..e2794265d745 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,22 +278,22 @@ https://github.com/dotnet/runtime 659321ff5db13026f52aec70cf2a6692bd4be454 - + https://github.com/dotnet/windowsdesktop - 743128486680b1d4641a917e9399307e24e3dc9b + 8c1790a883361a09db2145842a5b0780bfe702bf - + https://github.com/dotnet/windowsdesktop - 743128486680b1d4641a917e9399307e24e3dc9b + 8c1790a883361a09db2145842a5b0780bfe702bf - + https://github.com/dotnet/windowsdesktop - 743128486680b1d4641a917e9399307e24e3dc9b + 8c1790a883361a09db2145842a5b0780bfe702bf - + https://github.com/dotnet/windowsdesktop - 743128486680b1d4641a917e9399307e24e3dc9b + 8c1790a883361a09db2145842a5b0780bfe702bf https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 529e477163b6..a44f6b57abb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,9 +149,9 @@ - 10.0.0-preview.4.25178.2 - 10.0.0-preview.4.25178.2 - 10.0.0-preview.4.25178.2 + 10.0.0-preview.4.25179.1 + 10.0.0-preview.4.25179.1 + 10.0.0-preview.4.25179.1 From c1995e82cf61f957bdc47d297b63b29721851506 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 31 Mar 2025 09:49:40 +0200 Subject: [PATCH 4/4] Delete src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch --- ...ondition-out-the-native-tests-in-VMR.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch diff --git a/src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch b/src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch deleted file mode 100644 index eceff882d7bb..000000000000 --- a/src/SourceBuild/patches/winforms/0001-Condition-out-the-native-tests-in-VMR.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "Nikola Milosavljevic (CLR) false" -Date: Tue, 25 Mar 2025 07:52:19 -0700 -Subject: [PATCH] Condition out the native tests in VMR - -Backport: https://github.com/dotnet/winforms/pull/13187 ---- - src/test/unit/interop/System.Windows.Forms.Interop.Tests.csproj | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/test/unit/interop/System.Windows.Forms.Interop.Tests.csproj b/src/test/unit/interop/System.Windows.Forms.Interop.Tests.csproj -index d3fc8eb04..a46d5848e 100644 ---- a/src/test/unit/interop/System.Windows.Forms.Interop.Tests.csproj -+++ b/src/test/unit/interop/System.Windows.Forms.Interop.Tests.csproj -@@ -6,6 +6,8 @@ - System.Windows.Forms.Interop.Tests - x86;x64 - true -+ -+ true - - -