From d121255f1c0b12ffe7b0e9dc030756fcfa3ad4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Strehovsk=C3=BD?=
 <MichalStrehovsky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 17:57:57 +0900
Subject: [PATCH] hm

---
 .../extra-platforms/runtime-extra-platforms-other.yml         | 4 ++--
 src/tests/build.proj                                          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
index 0655522eb1197c..ca839ab509686b 100644
--- a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
+++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
@@ -212,12 +212,12 @@ jobs:
       value: 180
     jobParameters:
       timeoutInMinutes: 240
-      nameSuffix: NativeAOT
+      nameSuffix: NativeAOT_Pri0
       buildArgs: -s clr.aot+host.native+libs -rc $(_BuildConfig) -lc Release -hc Release
       extraStepsTemplate: /eng/pipelines/coreclr/nativeaot-post-build-steps.yml
       extraStepsParameters:
         creator: dotnet-bot
-        testBuildArgs: 'nativeaot'
+        testBuildArgs: 'nativeaot /p:IlcUseServerGc=false'
         liveLibrariesBuildConfig: Release
       testRunNamePrefixSuffix: NativeAOT_Pri0_$(_BuildConfig)
       extraVariablesTemplates:
diff --git a/src/tests/build.proj b/src/tests/build.proj
index cca44fe29bf880..16c97f9978d277 100644
--- a/src/tests/build.proj
+++ b/src/tests/build.proj
@@ -590,6 +590,7 @@
       <GroupBuildCmd Condition="'$(CrossBuild)' == 'true'">$(GroupBuildCmd) "/p:CrossBuild=true"</GroupBuildCmd>
       <GroupBuildCmd Condition="'$(TestBuildMode)' == 'nativeaot'">$(GroupBuildCmd) "/p:DefaultBuildAllTarget=BuildNativeAot"</GroupBuildCmd>
       <GroupBuildCmd Condition="'$(IlcMultiModule)' == 'true'">$(GroupBuildCmd) "/p:IlcMultiModule=true"</GroupBuildCmd>
+      <GroupBuildCmd Condition="'$(IlcUseServerGc)' == 'false'">$(GroupBuildCmd) "/p:IlcUseServerGc=false"</GroupBuildCmd>
       <GroupBuildCmd Condition="'$(BuildNativeAotFrameworkObjects)' == 'true'">$(GroupBuildCmd) "/p:BuildNativeAotFrameworkObjects=true"</GroupBuildCmd>
     </PropertyGroup>