Rename DISABLE_CROSSGEN (dotnet#48389)

Author: kasperk81

build.cmd

@@ -4,9 +4,8 @@ echo %* | findstr /C:"-pack" >nul
 if %errorlevel%==0 (
     set SkipBuildingInstallers=
 ) else (
-    REM disable crossgen for inner-loop builds to save a ton of time
-    set SkipBuildingInstallers=/p:SkipBuildingInstallers=true
-    set DISABLE_CROSSGEN=true
+    REM skip crossgen for inner-loop builds to save a ton of time
+    set skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
 )
-powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %SkipBuildingInstallers% %*"
+powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine dotnet %skipFlags% %*"
 exit /b %ErrorLevel%

build.sh

@@ -9,11 +9,8 @@ done
 ScriptRoot="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
 if [[ "$@" != *"-pack"* ]]; then
-  # disable crossgen for inner-loop builds to save a ton of time
-  export DISABLE_CROSSGEN=true
-  skipBuildingInstallersFlag="/p:SkipBuildingInstallers=true"
-else
-  skipBuildingInstallersFlag=
+  # skip crossgen for inner-loop builds to save a ton of time
+  skipFlags="/p:SkipUsingCrossgen=true /p:SkipBuildingInstallers=true"
 fi
 
-. "$ScriptRoot/eng/common/build.sh" --build --restore $skipBuildingInstallersFlag "$@"
+. "$ScriptRoot/eng/common/build.sh" --build --restore $skipFlags "$@"

src/Layout/redist/targets/Crossgen.targets

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR. -->
-    <IsCrossgenSupported Condition="'$(DISABLE_CROSSGEN)' == '' and
+    <IsCrossgenSupported Condition="'$(SkipUsingCrossgen)' != 'true' and
                                     '$(TargetArchitecture)' != 's390x' and
                                     '$(TargetArchitecture)' != 'ppc64le' and
                                     '$(DotNetBuildUseMonoRuntime)' != 'true'">true</IsCrossgenSupported>

src/SourceBuild/content/repo-projects/sdk.proj

@@ -31,7 +31,7 @@
     <BuildArgs>$(BuildArgs) /p:UsePortableLinuxSharedFramework=false</BuildArgs>
 
     <BuildArgs Condition="'$(PgoInstrument)' == 'true'">$(BuildArgs) /p:PgoInstrument=true</BuildArgs>
-    <BuildArgs Condition="'$(EnablePoison)' == 'true'">$(BuildArgs) /p:DISABLE_CROSSGEN=true</BuildArgs>
+    <BuildArgs Condition="'$(EnablePoison)' == 'true' or '$(SkipUsingCrossgen)' == 'true'">$(BuildArgs) /p:SkipUsingCrossgen=true</BuildArgs>
 
     <BuildArgs Condition="'$(BuildWorkloads)' == 'true'">$(BuildArgs) /p:BuildWorkloads=true</BuildArgs>
   </PropertyGroup>