diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16b7d6a215a6..778ce8da5e35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -260,22 +260,22 @@ https://github.com/dotnet/runtime c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1 - + https://github.com/dotnet/windowsdesktop - 6be1aecc178386c490f71dc4b417717882c09f57 + 138cc3ba1a40bd175c576a6b85abc1b2e352545e - + https://github.com/dotnet/windowsdesktop - 6be1aecc178386c490f71dc4b417717882c09f57 + 138cc3ba1a40bd175c576a6b85abc1b2e352545e - + https://github.com/dotnet/windowsdesktop - 6be1aecc178386c490f71dc4b417717882c09f57 + 138cc3ba1a40bd175c576a6b85abc1b2e352545e - + https://github.com/dotnet/windowsdesktop - 6be1aecc178386c490f71dc4b417717882c09f57 + 138cc3ba1a40bd175c576a6b85abc1b2e352545e https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 9da58aca763c..a8ff8f68c374 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 10.0.0-alpha.1.24554.1 - 10.0.0-alpha.1.24554.1 - 10.0.0-alpha.1.24554.1 + 10.0.0-alpha.1.24555.1 + 10.0.0-alpha.1.24555.1 + 10.0.0-alpha.1.24555.1 diff --git a/src/SourceBuild/patches/windowsdesktop/0001-Update-SDK-and-remove-net10-workaround.patch b/src/SourceBuild/patches/windowsdesktop/0001-Update-SDK-and-remove-net10-workaround.patch deleted file mode 100644 index 21a7f78e5c82..000000000000 --- a/src/SourceBuild/patches/windowsdesktop/0001-Update-SDK-and-remove-net10-workaround.patch +++ /dev/null @@ -1,89 +0,0 @@ -From d6d8add5aad503877ee4344bce77dfa0b054752a Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Tue, 5 Nov 2024 14:53:29 +0000 -Subject: [PATCH] Update SDK and remove net10 workaround - -Backport: https://github.com/dotnet/windowsdesktop/pull/4763 - ---- - Directory.Build.props | 2 +- - Directory.Build.targets | 18 ------------------ - global.json | 2 +- - .../src/sfx/Directory.Build.targets | 12 ++++++++++++ - 4 files changed, 14 insertions(+), 20 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 09e49d41..daf75b2f 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -26,7 +26,7 @@ - - $(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904 - -- -+ - net10.0 - - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index d816857c..7b2a3390 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -10,22 +10,4 @@ - $(MajorVersion).$(MinorVersion) - - -- -- -- -- -- -- -- -- -- -- -- - -diff --git a/global.json b/global.json -index 0e7f27a5..412fb4a9 100644 ---- a/global.json -+++ b/global.json -@@ -1,6 +1,6 @@ - { - "tools": { -- "dotnet": "9.0.100-rc.2.24474.11", -+ "dotnet": "10.0.100-alpha.1.24551.9", - "runtimes": { - "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)" -diff --git a/src/windowsdesktop/src/sfx/Directory.Build.targets b/src/windowsdesktop/src/sfx/Directory.Build.targets -index 82de7dd9..ca14567b 100644 ---- a/src/windowsdesktop/src/sfx/Directory.Build.targets -+++ b/src/windowsdesktop/src/sfx/Directory.Build.targets -@@ -2,6 +2,18 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ - - -