diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f554d5536a6f..a4b5085cff08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,46 +15,46 @@ 2b6b80db1ecc7c4165f59184b8b876de3d6d23f0 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 @@ -63,14 +63,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 6755ffefdb9899c08738941d7498d880bc25e52d + 235d38cd586eeed59513cf865f4771914d654e4a - + https://github.com/dotnet/emsdk - 6755ffefdb9899c08738941d7498d880bc25e52d + 235d38cd586eeed59513cf865f4771914d654e4a @@ -230,29 +230,29 @@ 7d34b30433259fb914aaaf276fde663a47b6ef2f - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 https://github.com/dotnet/windowsdesktop @@ -503,89 +503,89 @@ - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 https://github.com/dotnet/aspnetcore a1cb9ed89b8eb2e87d9f0d1b62a2ca41bb073be1 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 @@ -619,9 +619,9 @@ 2a3bf4e3a4c473135d058adcd7193a5a4bcd38a7 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 5b9b8d3ae6aaf2a0eb23ff9e2b32ddd64556d442 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2ffa02d8ee68..8ef14bccff42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,43 +104,43 @@ - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 8.0.0-rc.1.23414.4 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 2.1.0 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 - 10.0.0-alpha.1.24570.9 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 + 10.0.0-alpha.1.24601.1 8.0.0 @@ -322,7 +322,7 @@ 14.2.9714-net9-p6 17.2.9714-net9-p6 - 10.0.0-alpha.1.24569.4 + 10.0.0-alpha.1.24575.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion) 10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch b/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch new file mode 100644 index 000000000000..69fe0a94d85c --- /dev/null +++ b/src/SourceBuild/patches/roslyn/0001-Only-update-roslyn-dependencies-coming-from-maintena.patch @@ -0,0 +1,110 @@ +From 49d5aea80a1c6a9fb0f724f87c9c9e00824dfafa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= + <1175054+carlossanlop@users.noreply.github.com> +Date: Tue, 26 Nov 2024 16:11:41 -0800 +Subject: [PATCH] Only update roslyn dependencies coming from + maintenance-packages when source build is true. Tracking issue: + https://github.com/dotnet/sdk/issues/45155 + +--- + eng/Directory.Packages.props | 18 +++++++----------- + eng/Versions.props | 26 ++++++++++++++++++++++++++ + 2 files changed, 33 insertions(+), 11 deletions(-) + +diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props +index 1466d926085..e9cfd1c429a 100644 +--- a/eng/Directory.Packages.props ++++ b/eng/Directory.Packages.props +@@ -184,7 +184,7 @@ + + + +- ++ + + + +@@ -194,9 +194,9 @@ + + + +- +- +- ++ ++ ++ + + + +@@ -205,7 +205,7 @@ + + + +- ++ + + + +@@ -233,7 +233,7 @@ + --> + + +- ++ + + + +@@ -307,11 +307,7 @@ + + + +- +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 3144be9ee76..97624c7e1e3 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -16,6 +16,32 @@ + --> + $(MajorVersion).$(MinorVersion).0.0 + ++ ++ ++ 6.1.0 ++ 4.6.0 ++ 4.9.0 ++ 4.6.0 ++ 4.6.0 ++ 6.1.0 ++ 4.6.0 ++ ++ ++ 6.0.1 ++ 4.5.1 ++ ++ 4.8.6 ++ 4.5.5 ++ 4.5.0 ++ 6.0.0 ++ 4.5.4 ++ + +-- +2.47.0.windows.2 +