diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce0a8976c880..e26ac914a9cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,26 +246,26 @@ https://github.com/dotnet/runtime 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/wpf - 4093a1649f50d767671a58b8a2a0f738480e51ff + 5d665cda688edd091afd8ba95e7c8503f1c11a91 https://github.com/dotnet/aspnetcore @@ -382,13 +382,13 @@ - + https://github.com/dotnet/winforms - 77be8127d323f322a9c168acaf5920d84271096c + 5a34c71ca7414f5dcfccde4b2a7ba61e6758062d - + https://github.com/dotnet/wpf - 4093a1649f50d767671a58b8a2a0f738480e51ff + 5d665cda688edd091afd8ba95e7c8503f1c11a91 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 4ba1881a1218..ff0f3dd98e1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,7 +119,7 @@ - 9.0.0-preview.6.24319.5 + 9.0.0-preview.6.24320.2 @@ -149,10 +149,10 @@ - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3 @@ -257,8 +257,8 @@ - 9.0.0-preview.7.24320.2 - 9.0.0-preview.7.24320.2 + 9.0.0-preview.7.24320.5 + 9.0.0-preview.7.24320.5 diff --git a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch b/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch deleted file mode 100644 index 31286b95da58..000000000000 --- a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 642134215a2c7285e958dfc8aa6fb058a836c6da Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 19 Jun 2024 10:32:23 +0000 -Subject: [PATCH] Correctly define versions for runtime dependencies - -System.ComponentModel.Composition and -System.IO.Hashing were missing Versions.props and -Version.Details.xml entries. - -This is necessary so that the VMR can upgrade -the dependencies when building all dependencies -live. - -Similar to c74b31bd8313865fa3becf0d8f91f00d528ca5ad -Unblocks runtime dependency flow: -https://github.com/dotnet/sdk/pull/41616 - -Backport PR: https://github.com/dotnet/roslyn/pull/74060 - ---- - eng/Directory.Packages.props | 4 ++-- - eng/Version.Details.xml | 8 ++++++++ - eng/Versions.props | 2 ++ - .../Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj | 2 +- - 4 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props -index 83ab7a5601433..e93b49fa24c55 100644 ---- a/eng/Directory.Packages.props -+++ b/eng/Directory.Packages.props -@@ -190,10 +190,10 @@ - - - -- -+ - - -- -+ - - - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 0e070103b4b0c..7852558f7c3e6 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -64,10 +64,18 @@ - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 -diff --git a/eng/Versions.props b/eng/Versions.props -index 0f39e2822c158..1f9c7b8d08ec2 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -25,7 +25,9 @@ - 8.0.0 - 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 -diff --git a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -index 8a011c5f82948..4310078bf9b32 100644 ---- a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -+++ b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -@@ -27,7 +27,7 @@ - - - -- -+ - - -