diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09f2aa5aa302..ed438c7028fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,46 +15,46 @@ 1dd4fdebb07926ab2d807bceda7d80cc9c857a61 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 @@ -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 + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 https://github.com/dotnet/windowsdesktop @@ -503,89 +503,89 @@ - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 https://github.com/dotnet/aspnetcore ec77307b34ff97c6270638077ab062dc78544a81 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 @@ -619,9 +619,9 @@ 45d845e04c05fbe5da9838c454bbc3af1df6be81 - + https://github.com/dotnet/runtime - b66200e5448be50673b0387ca4632d3bfa25887b + 920a17ac91440abb5b34109104e72da77ec58b59 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d30564ad950e..d7416b2d7c52 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.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 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.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 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.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 + 10.0.0-alpha.1.24610.2 8.0.0 @@ -324,7 +324,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/msbuild/0001-Only-update-msbuild-dependencies-coming-from-mainten.patch b/src/SourceBuild/patches/msbuild/0001-Only-update-msbuild-dependencies-coming-from-mainten.patch new file mode 100644 index 000000000000..99b120bb8425 --- /dev/null +++ b/src/SourceBuild/patches/msbuild/0001-Only-update-msbuild-dependencies-coming-from-mainten.patch @@ -0,0 +1,61 @@ +From 78ed8f0a8b304205c35e2ad1075a9985fee98bb2 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, 3 Dec 2024 14:47:52 -0800 +Subject: [PATCH] Only update msbuild dependencies coming from + maintenance-packages when source build is true. Tracking issue: + https://github.com/dotnet/sdk/issues/45155 + +--- + eng/Versions.props | 24 ++++++++++++++++++------ + 1 file changed, 18 insertions(+), 6 deletions(-) + +diff --git a/eng/Versions.props b/eng/Versions.props +index 961e6ed8c..8b2502b10 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -20,23 +20,35 @@ + true + + +- ++ ++ ++ ++ 6.1.0 ++ 4.6.0 ++ 6.1.0 ++ ++ ++ + 6.0.1 +- 1.0.9 +- 8.0.0 +- 8.0.0 +- 8.0.1 + + 4.5.5 ++ 6.0.0 ++ ++ ++ 1.0.9 ++ 8.0.0 ++ 8.0.0 ++ 8.0.1 + 4.3.4 + 8.0.0 + 8.0.0 + 8.0.0 +- 6.0.0 + 5.0.0 + 7.0.0 + 4.3.1 +-- +2.47.1.windows.1 + diff --git a/src/SourceBuild/patches/razor/0001-Only-update-razor-dependencies-coming-from.patch b/src/SourceBuild/patches/razor/0001-Only-update-razor-dependencies-coming-from.patch new file mode 100644 index 000000000000..0976e62ffe7b --- /dev/null +++ b/src/SourceBuild/patches/razor/0001-Only-update-razor-dependencies-coming-from.patch @@ -0,0 +1,57 @@ +From 519d583b26ef1d6e12c7ed6084a4f3288d363a8b 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: Mon, 9 Dec 2024 15:35:33 -0800 +Subject: [PATCH] Only update razor dependencies coming from + maintenance-packages when source build is true. Tracking issue: + https://github.com/dotnet/sdk/issues/45155 + +--- + Directory.Packages.props | 4 ++-- + eng/Versions.props | 10 ++++++++++ + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index 3d16f73684..fa36bb4024 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -115,7 +115,7 @@ + + + +- ++ + + + +@@ -127,7 +127,7 @@ + at the appropriate version, in combination with using CentralPackageTransitivePinningEnabled, will + ensure the correct version is used in all places + --> +- ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 6be719a0d8..6a02305158 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -100,4 +100,14 @@ + 2.6.6 + 1.7.0 + ++ ++ ++ ++ 6.0.1 ++ 4.5.4 ++ ++ ++ 6.1.0 ++ 4.6.0 ++ + +-- +2.47.1.windows.1 + 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 + diff --git a/src/SourceBuild/patches/runtime/0001-re-enable-bundle-in-source-build.patch b/src/SourceBuild/patches/runtime/0001-re-enable-bundle-in-source-build.patch new file mode 100644 index 000000000000..6a575ef0a894 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-re-enable-bundle-in-source-build.patch @@ -0,0 +1,24 @@ +From ab487578a9e5de5950beed59ed9e4c8906557352 Mon Sep 17 00:00:00 2001 +From: Jeremy Koritzinsky +Date: Thu, 5 Dec 2024 10:11:01 -0800 +Subject: [PATCH] Re-enable bundle archive building in source build + +Backport: https://github.com/dotnet/runtime/pull/110448 + +--- + eng/Subsets.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/eng/Subsets.props b/eng/Subsets.props +index a50fd3e8002..1491a0aeba8 100644 +--- a/eng/Subsets.props ++++ b/eng/Subsets.props +@@ -550,7 +550,7 @@ + + + +- ++ + + +