diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2dc58450be8e..bf0583920460 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 543cb4568f28b0d2f2cfecdf2d56365b9252e848 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 26c755f308900a4c708498e58fa67f03c8eeeeed - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 @@ -343,21 +343,21 @@ 611248c0fae9720554c7a14a7408e20acf7b0eb7 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://github.com/dotnet/runtime b66200e5448be50673b0387ca4632d3bfa25887b - + https://github.com/dotnet/aspnetcore - ec77307b34ff97c6270638077ab062dc78544a81 + 61be94cbcb4726afaa107f91c349fc4328263b44 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a8b26b7eb199..e96ed965c35c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,19 +235,19 @@ - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 - 10.0.0-alpha.2.24605.2 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24611.1 diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index b2a730c4b020..d17857410109 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -30,6 +30,8 @@ $(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks + + $(BuildArgs) /p:CrossgenOutput=false diff --git a/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch b/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch new file mode 100644 index 000000000000..204d1c1af2ae --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch @@ -0,0 +1,27 @@ +From 85dd61748f2f589d99142bd4914e8225048e0c96 Mon Sep 17 00:00:00 2001 +From: Jeremy Koritzinsky +Date: Wed, 11 Dec 2024 14:12:35 -0800 +Subject: [PATCH] Use a live crossgen2 always + +Backport: https://github.com/dotnet/aspnetcore/pull/59447 +--- + eng/tools/GenerateFiles/Directory.Build.targets.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in +index 52f289a4acdd..88f09a8c8914 100644 +--- a/eng/tools/GenerateFiles/Directory.Build.targets.in ++++ b/eng/tools/GenerateFiles/Directory.Build.targets.in +@@ -105,10 +105,10 @@ + Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion} + + +- ++ + ${MicrosoftNETCoreAppRuntimeVersion} +- $(TargetRuntimeIdentifier) ++ $(TargetRuntimeIdentifier) + + +