diff --git a/NuGet.config b/NuGet.config index 4073490804d9..c5636999d1eb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -33,6 +33,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f57bb442e0a2..d66aa4fd5ac9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,26 +246,26 @@ https://github.com/dotnet/runtime 0fbd81404d1f211572387498474063bc6f407f0f - + https://github.com/dotnet/windowsdesktop - c0ab3a32c9db80be32683900a2c958cdbf3c473e + 973ef0220d9c46ce427fb983e4aad805c72cabad - + https://github.com/dotnet/windowsdesktop - c0ab3a32c9db80be32683900a2c958cdbf3c473e + 973ef0220d9c46ce427fb983e4aad805c72cabad - + https://github.com/dotnet/windowsdesktop - c0ab3a32c9db80be32683900a2c958cdbf3c473e + 973ef0220d9c46ce427fb983e4aad805c72cabad - + https://github.com/dotnet/windowsdesktop - c0ab3a32c9db80be32683900a2c958cdbf3c473e + 973ef0220d9c46ce427fb983e4aad805c72cabad - + https://github.com/dotnet/wpf - aa7c73eab8ed50131272c18613d7e3133619c9f1 + ce8e3041f94469a4fd2aa5948905c2b70852fe55 https://github.com/dotnet/aspnetcore @@ -382,13 +382,13 @@ - + https://github.com/dotnet/winforms - 7006c1c2c5515bc4b648e5b3c2ea6a604867e0b9 + e4085eb08ceef38d44b0bcdae0bc02e374794979 - + https://github.com/dotnet/wpf - aa7c73eab8ed50131272c18613d7e3133619c9f1 + ce8e3041f94469a4fd2aa5948905c2b70852fe55 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index bef8e2e8efef..c6c43e094389 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 9.0.0-rc.1.24407.3 + 10.0.0-alpha.1.24414.12 @@ -165,10 +165,9 @@ - 9.0.0-rc.1.24414.1 - 9.0.0-rc.1.24414.1 - 9.0.0-rc.1.24414.1 - 9.0.0-rc.1.24414.1 + 10.0.0-alpha.1.24420.1 + 10.0.0-alpha.1.24420.1 + 10.0.0-alpha.1.24420.1 @@ -267,8 +266,8 @@ - 9.0.0-rc.1.24413.3 - 9.0.0-rc.1.24413.3 + 10.0.0-alpha.1.24415.2 + 10.0.0-alpha.1.24415.2 diff --git a/src/Installer/redist-installer/targets/GenerateLayout.targets b/src/Installer/redist-installer/targets/GenerateLayout.targets index 1820a5519ee5..963f12702b6d 100644 --- a/src/Installer/redist-installer/targets/GenerateLayout.targets +++ b/src/Installer/redist-installer/targets/GenerateLayout.targets @@ -15,7 +15,7 @@ $(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) - $(VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion) + $(VSRedistCommonWindowsDesktopSharedFrameworkx64100PackageVersion) $(MicrosoftWindowsDesktopAppRuntimePackageVersion) 3.0.0 diff --git a/src/SourceBuild/patches/wpf/0001-Add-references-needed-by-Formatters.Nrbf.patch b/src/SourceBuild/patches/wpf/0001-Add-references-needed-by-Formatters.Nrbf.patch deleted file mode 100644 index c9e22e4652d7..000000000000 --- a/src/SourceBuild/patches/wpf/0001-Add-references-needed-by-Formatters.Nrbf.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric StJohn -Date: Wed, 14 Aug 2024 10:38:31 -0700 -Subject: [PATCH] Add references needed by Formatters.Nrbf - -Backport: https://github.com/dotnet/wpf/pull/9547 - ---- - .../src/PresentationCore/PresentationCore.csproj | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj -index 036da8592..fbe06aa02 100644 ---- a/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj -+++ b/src/Microsoft.DotNet.Wpf/src/PresentationCore/PresentationCore.csproj -@@ -1425,6 +1425,7 @@ - - - -+ - - - -@@ -1447,6 +1448,7 @@ - - - -+ - - -