From cddfb1b49d8c07d0b952dd84fb6065f5a668cd03 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 17 Jan 2024 12:40:08 +0100
Subject: [PATCH] Update vmr-build.yml (#18274)

---
 eng/pipelines/templates/jobs/vmr-build.yml | 4 ++--
 src/redist/targets/Crossgen.targets        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml
index 6c28af564..1cad2c091 100644
--- a/eng/pipelines/templates/jobs/vmr-build.yml
+++ b/eng/pipelines/templates/jobs/vmr-build.yml
@@ -225,9 +225,9 @@ jobs:
 
       # Allows Arcade to have access to the commit for the build
       customEnvVars="BUILD_SOURCEVERSION=$BUILD_SOURCEVERSION"
-      customBuildArgs=
+      customBuildArgs="--ci"
       if [[ '${{ parameters.runOnline }}' == 'True' ]]; then
-        customBuildArgs='--online'
+        customBuildArgs="$customBuildArgs --online"
       else
         customRunArgs="$customRunArgs --network none"
       fi
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 2723adfb7..076a28be9 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -2,7 +2,7 @@
   <!-- Crossgen is currently not supported on the s390x, ppc64le architecture as using mono instead of CoreCLR.
        Neither crossgen2 nor mono is supported on the loongarch64 architecture at present. -->
   <Target Name="CrossgenLayout"
-          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND !('$(CROSSBUILD)' == 'true' AND '$(DotnetBuildVertical)' == 'true')"
+          Condition="'$(DISABLE_CROSSGEN)' == '' AND '$(Architecture)' != 's390x' AND '$(Architecture)' != 'ppc64le' AND '$(Architecture)' != 'loongarch64' AND !('$(CROSSBUILD)' == 'true' AND '$(DotNetBuildVertical)' == 'true')"
           DependsOnTargets="SetSdkBrandingInfo">
 
     <PropertyGroup>