Skip to content

Commit 1795fc9

Browse files
committed
Don't R2R when explicitly requested not to
1 parent 80bfc79 commit 1795fc9

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
1919
<PublishReadyToRun Condition=" '$(DotNetBuild)' == 'true' AND '$(Crossbuild)' == 'true' ">false</PublishReadyToRun>
2020
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
21+
<!-- Don't use ReadyToRun when explicitly opted out -->
22+
<PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
2123
<!-- Build a composite R2R image -->
2224
<PublishReadyToRunComposite>true</PublishReadyToRunComposite>
2325

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<!-- VMR doesn't produce valid crossgen for the host/build machine https://github.com/dotnet/source-build/issues/3793 -->
1919
<PublishReadyToRun Condition=" '$(DotNetBuild)' == 'true' AND '$(Crossbuild)' == 'true' ">false</PublishReadyToRun>
2020
<PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
21+
<!-- Don't use ReadyToRun when explicitly opted out -->
22+
<PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>
2123

2224
<InstallerName>$(RuntimeInstallerBaseName)</InstallerName>
2325
<GenerateInstallers>true</GenerateInstallers>

0 commit comments

Comments
 (0)