From 2f3a14356c52fc6d9be483cfc080c1f96729d63d Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Mon, 4 May 2020 15:28:15 -0400
Subject: [PATCH 01/26] Add LLVM Mono runtime build

---
 eng/pipelines/runtime-official.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index bc010a5ce1a182..6783ce17c6dc98 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -92,6 +92,29 @@ stages:
       jobParameters:
         isOfficialBuild: ${{ variables.isOfficialBuild }}
 
+  #
+  # Build Mono LLVM release
+  #
+  - template: /eng/pipelines/common/platform-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/mono/templates/build-job.yml
+      runtimeFlavor: mono
+      buildConfig: release
+      platforms:
+      - OSX_x64
+      - Linux_x64
+      # - Linux_arm
+      # - Linux_arm64
+      # - Linux_musl_x64
+      # - Linux_musl_arm64
+      # - Windows_NT_x64
+      # - Windows_NT_x86
+      # - Windows_NT_arm
+      # - Windows_NT_arm64
+      jobParameters:
+        llvm: true
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+
   #
   # Build libraries using live CoreLib from CoreCLR
   #

From 8c4966638ed9af667ed85230129b9ad2c0e92daa Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 11:58:51 -0400
Subject: [PATCH 02/26] Switch from 'llvm' boolean to 'runtimeVariant' freeform
 string in yaml

This makes it easier to add oddball variant builds, without a big pile of booleans for every possible variant
---
 eng/pipelines/installer/installer-matrix.yml  |  2 +
 eng/pipelines/mono/templates/build-job.yml    | 37 ++++++++-----------
 .../mono/templates/xplat-pipeline-job.yml     |  9 ++---
 eng/pipelines/runtime-official.yml            | 19 +++++++++-
 eng/pipelines/runtime.yml                     |  4 +-
 5 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/eng/pipelines/installer/installer-matrix.yml b/eng/pipelines/installer/installer-matrix.yml
index bb5e6e46f96c43..e9ae06bf267690 100644
--- a/eng/pipelines/installer/installer-matrix.yml
+++ b/eng/pipelines/installer/installer-matrix.yml
@@ -3,6 +3,7 @@ parameters:
   platforms: []
   jobParameters: []
   buildConfig: Release
+  runtimeVariant: ''
 
 jobs:
 
@@ -16,5 +17,6 @@ jobs:
     platforms: ${{ parameters.platforms }}
     passPlatforms: true
     runtimeFlavor: ${{ parameters.runtimeFlavor }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     jobParameters:
       ${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index 136c83cf522d22..df7972690d80da 100644
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -9,7 +9,7 @@ parameters:
   variables: {}
   pool: ''
   condition: true
-  llvm: false
+  runtimeVariant: ''
   isOfficialBuild: false
   crossrootfsDir: ''
 
@@ -24,20 +24,13 @@ jobs:
     helixType: 'build/product/'
     enableMicrobuild: true
     pool: ${{ parameters.pool }}
-    llvm: ${{ parameters.llvm }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     crossrootfsDir: ${{ parameters.crossroofsDir }}
     condition: ${{ parameters.condition }}
 
     # Compute job name from template parameters
-    ${{ if ne(parameters.llvm, true) }}:
-      name: ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      displayName: ${{ format('Mono Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-
-    # if LLVM enabled, set a variable we can consume
-    ${{ if eq(parameters.llvm, true) }}:
-      name: ${{ format('mono_llvm_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      displayName: ${{ format('Mono LLVM Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-
+    name: ${{ format('mono_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+    displayName: ${{ format('Mono {0} Product Build {1}{2} {3} {4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 
     # Run all steps in the container.
     # Note that the containers are defined in platform-matrix.yml
@@ -81,6 +74,9 @@ jobs:
         value: wasm
       - name: osOverride
         value: '-os Browser'
+    - ${{ if startsWith(parameters.runtimeVariant, 'llvm') }}:
+      - name: llvmParameter
+        value: /p:MonoEnableLLVM=true
     - ${{ parameters.variables }}
 
     steps:
@@ -105,10 +101,10 @@ jobs:
 
     # Build
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }}
+      - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter)
         displayName: Build product
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }}
+      - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter)
         displayName: Build product
 
     - ${{ if in(parameters.osGroup, 'OSX', 'iOS','tvOS') }}: 
@@ -129,15 +125,15 @@ jobs:
         displayName: 'product build'
 
     # Build packages
-    - ${{ if and(ne(parameters.llvm, true), ne(parameters.osGroup, 'Windows_NT')) }}:
-      - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
+    - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
+      - script: ./build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg)
         displayName: Build nupkg
-    - ${{ if and(ne(parameters.llvm, true), eq(parameters.osGroup, 'Windows_NT')) }}:
-      - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) /p:MonoEnableLLVM=${{ parameters.llvm }} -pack $(OutputRidArg)
+    - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+      - script: build$(scriptExt) -subset mono -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(llvmParameter) -pack $(OutputRidArg)
         displayName: Build nupkg
 
     # Publish official build
-    - ${{ if and(ne(parameters.llvm, true), eq(parameters.publishToBlobFeed, 'true')) }}:
+    - ${{ if eq(parameters.publishToBlobFeed, 'true') }}:
       - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
         - script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj
           displayName: Publish packages to blob feed
@@ -160,9 +156,6 @@ jobs:
       displayName: Publish Logs
       inputs:
         targetPath: $(Build.SourcesDirectory)/artifacts/log
-        ${{ if ne(parameters.llvm, true) }}:
-          artifactName: 'BuildLogs_Mono_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
-        ${{ if eq(parameters.llvm, true) }}:
-          artifactName: 'BuildLogs_Mono_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+        artifactName: 'BuildLogs_Mono_$(runtimeVariant)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
       continueOnError: true
       condition: always()
diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index 052b0f59fcdaa6..62c25c5508b314 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -9,7 +9,7 @@ parameters:
   liveLibrariesBuildConfig: ''
   strategy: ''
   pool: ''
-  llvm: false
+  runtimeVariant: ''
   liveRuntimeBuildConfig: 'release'
 
   # arcade-specific parameters
@@ -35,7 +35,7 @@ jobs:
     container: ${{ parameters.container }}
     strategy: ${{ parameters.strategy }}
     pool: ${{ parameters.pool }}
-    llvm: ${{ parameters.llvm }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
 
     # arcade-specific parameters
     condition: and(succeeded(), ${{ parameters.condition }})
@@ -55,10 +55,7 @@ jobs:
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).${{ parameters.liveRuntimeBuildConfig }}'
 
     - name: buildProductArtifactName
-      ${{ if ne(parameters.llvm, true) }}:
-        value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
-      ${{ if eq(parameters.llvm, true) }}:
-        value: 'MonoProduct_LLVM_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'MonoProduct_$(runtimeVariant)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: binTestsPath
       value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr'
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index 6783ce17c6dc98..cb17a3fc84820b 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -112,7 +112,7 @@ stages:
       # - Windows_NT_arm
       # - Windows_NT_arm64
       jobParameters:
-        llvm: true
+        runtimeVariant: LLVMJIT
         isOfficialBuild: ${{ variables.isOfficialBuild }}
 
   #
@@ -224,6 +224,23 @@ stages:
       - Android_x86
       - Browser_wasm
 
+    #
+    # Installer Build for platforms using Mono
+    #
+  - template: /eng/pipelines/installer/installer-matrix.yml
+    parameters:
+      jobParameters:
+        liveRuntimeBuildConfig: release
+        liveLibrariesBuildConfig: Release
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+        useOfficialAllConfigurations: false
+        buildFullPlatformManifest: false
+        runtimeVariant: LLVMJIT
+      runtimeFlavor: mono
+      platforms:
+      - OSX_x64
+      - Linux_x64
+
 - ${{ if eq(variables.isOfficialBuild, true) }}:
   - template: /eng/pipelines/official/stages/publish.yml
     parameters:
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 40f22e195782a1..e555490af69904 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -341,7 +341,7 @@ jobs:
     # - Windows_NT_arm
     # - Windows_NT_arm64
     jobParameters:
-      llvm: true
+      runtimeVariant: LLVMJIT
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -369,7 +369,7 @@ jobs:
     # - Windows_NT_arm
     # - Windows_NT_arm64
     jobParameters:
-      llvm: true
+      runtimeVariant: LLVMJIT
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),

From 496ffbb06742ec40d3882799c19ab315a00c12b8 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 12:13:29 -0400
Subject: [PATCH 03/26] Add an LLVM suffix to installer nupkgs

---
 eng/pipelines/installer/jobs/base-job.yml          | 1 +
 src/installer/pkg/projects/Directory.Build.targets | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 8a62e0ba2952bb..28e64e6bea8902 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -13,6 +13,7 @@ parameters:
   variables: []
   name: ''
   displayName: ''
+  runtimeVariant: ''
   pool: ''
 
   packageDistroList:
diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 3617dde42ecad7..25349b4029cff5 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -29,6 +29,9 @@
   <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
     <RuntimeSpecificFrameworkSuffix>.Mono</RuntimeSpecificFrameworkSuffix>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true'">
+    <RuntimeSpecificFrameworkSuffix>.Mono.LLVM</RuntimeSpecificFrameworkSuffix>
+  </PropertyGroup>
 
   <!--
     For any Dependency items with a VersionProp, set it to the property by that name given by the

From f1b44724a54f8221d4ba5d8deb24a765fafc90fd Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 12:19:26 -0400
Subject: [PATCH 04/26] Fix up yaml dependencies.

---
 eng/pipelines/common/templates/runtimes/build-test-job.yml  | 4 +++-
 eng/pipelines/common/templates/runtimes/run-test-job.yml    | 4 +++-
 eng/pipelines/coreclr/templates/build-job.yml               | 6 ++++--
 eng/pipelines/coreclr/templates/crossgen-comparison-job.yml | 4 +++-
 eng/pipelines/installer/jobs/base-job.yml                   | 3 ++-
 eng/pipelines/libraries/build-job.yml                       | 4 +++-
 eng/pipelines/libraries/build-test-job.yml                  | 4 +++-
 eng/pipelines/libraries/run-test-job.yml                    | 4 +++-
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/build-test-job.yml b/eng/pipelines/common/templates/runtimes/build-test-job.yml
index 1c006271f7ec19..7dd2a57412faf6 100644
--- a/eng/pipelines/common/templates/runtimes/build-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/build-test-job.yml
@@ -22,6 +22,7 @@ parameters:
   pool: ''
   runtimeFlavor: 'coreclr'
   runtimeFlavorDisplayName: 'CoreCLR'
+  runtimeVariant: ''
 
 ### Build managed test components (native components are getting built as part
 ### of the the product build job).
@@ -42,6 +43,7 @@ jobs:
     managedTestBuildOsGroup: ${{ parameters.osGroup }}
     managedTestBuildOsSubgroup: ${{ parameters.osSubgroup }}
     container: ${{ parameters.container }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     testGroup: ${{ parameters.testGroup }}
     stagedBuild: ${{ parameters.stagedBuild }}
     liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
@@ -80,7 +82,7 @@ jobs:
     # by switching over to using reference assembly.
     ${{ if ne(parameters.stagedBuild, true) }}:
       dependsOn:
-      - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }}
+      - ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, coalesce(parameters.liveRuntimeBuildConfig, parameters.buildConfig)) }}
       - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
         - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 
diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index d52240be644def..2d976236febcc8 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -19,6 +19,7 @@ parameters:
   stagedBuild: false
   displayNameArgs: ''
   runInUnloadableContext: false
+  runtimeVariant: ''
   variables: {}
   pool: ''
   runtimeFlavor: 'coreclr'
@@ -49,6 +50,7 @@ jobs:
     stagedBuild: ${{ parameters.stagedBuild }}
     liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
     helixType: 'build/tests/'
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     pool: ${{ parameters.pool }}
     condition: ${{ parameters.condition }}
 
@@ -69,7 +71,7 @@ jobs:
         - ${{ if ne(parameters.testGroup, 'innerloop') }}:
           - '${{ parameters.runtimeFlavor }}_common_test_build_p1_AnyOS_AnyCPU_${{parameters.buildConfig }}'
     - ${{ if ne(parameters.stagedBuild, true) }}:
-      - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
         - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 
diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml
index f14883ba46d6c0..870cdc6c0822a4 100644
--- a/eng/pipelines/coreclr/templates/build-job.yml
+++ b/eng/pipelines/coreclr/templates/build-job.yml
@@ -10,6 +10,7 @@ parameters:
   osSubgroup: ''
   platform: ''
   pool: ''
+  runtimeVariant: ''
   signBinaries: false
   stagedBuild: false
   testGroup: ''
@@ -25,6 +26,7 @@ jobs:
     archType: ${{ parameters.archType }}
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     testGroup: ${{ parameters.testGroup }}
     helixType: 'build/product/'
     enableMicrobuild: true
@@ -37,8 +39,8 @@ jobs:
       name: ${{ format('coreclr_{0}_product_build_{1}{1}_{3}_{4}', parameters.compilerName, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       displayName: ${{ format('CoreCLR GCC Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
     ${{ if eq(parameters.compilerName, 'clang') }}:
-      name: ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      displayName: ${{ format('CoreCLR Product Build {0}{1} {2} {3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      name: ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      displayName: ${{ format('CoreCLR {0} Product Build {1}{2} {3} {4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 
     # Run all steps in the container.
     # Note that the containers are defined in platform-matrix.yml
diff --git a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
index cfecf9bbd5c06f..0e537cb6c7e171 100644
--- a/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
+++ b/eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
@@ -5,6 +5,7 @@ parameters:
   osSubgroup: ''
   container: ''
   helixQueues: ''
+  runtimeVariant: ''
   crossrootfsDir: ''
   stagedBuild: false
   variables: {}
@@ -30,6 +31,7 @@ jobs:
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
     stagedBuild: ${{ parameters.stagedBuild }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
     helixType: 'test/crossgen-comparison/'
     pool: ${{ parameters.pool }}
@@ -72,7 +74,7 @@ jobs:
 
     # Test job depends on the corresponding build job
     dependsOn:
-    - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+    - ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
     - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
       - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 
diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 28e64e6bea8902..b2706771713c73 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -321,8 +321,9 @@ jobs:
   - checkout
   - ${{ parameters.dependsOn }}
   - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
-    - ${{ format('{0}_product_build_{1}{2}_{3}_{4}',
+    - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}',
         parameters.runtimeFlavor,
+        parameters.runtimeVariant,
         parameters.osGroup,
         parameters.osSubgroup,
         parameters.archType,
diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index 3f01453db7e3a6..c728a2ed353c57 100644
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -7,6 +7,7 @@ parameters:
   framework: ''
   isOfficialBuild: false
   isOfficialAllConfigurations: false
+  runtimeVariant: ''
 
   # When set to a non-empty value (Debug / Release), it determines the runtime's
   # build configuration to use for building libraries and tests. Setting this
@@ -43,6 +44,7 @@ jobs:
       container: ${{ parameters.container }}
       condition: ${{ parameters.condition }}
       pool: ${{ parameters.pool }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
       testScope: ${{ parameters.testScope }}
       name: build
       displayName: 'Build'
@@ -51,7 +53,7 @@ jobs:
         dependsOn:
         # Use full product dependency for non-coreclr and test builds
         - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
-          - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
+          - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - _subset: libs
diff --git a/eng/pipelines/libraries/build-test-job.yml b/eng/pipelines/libraries/build-test-job.yml
index c58de839dbdafb..0ce715add47c9d 100644
--- a/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@ -7,6 +7,7 @@ parameters:
   isOfficialBuild: false
   liveRuntimeBuildConfig: ''
   runtimeFlavor: 'coreclr'
+  runtimeVariant: ''
   timeoutInMinutes: 150
   container: ''
   publishTestArtifacs: true
@@ -29,6 +30,7 @@ jobs:
       liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       container: ${{ parameters.container }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
       pool: ${{ parameters.pool }}
       testScope: ${{ parameters.testScope }}
       name: test_build
@@ -38,7 +40,7 @@ jobs:
       - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       # Libraries Test also depends on Product, now that the libraries build only depends on corelib
       - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
-        - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
+        - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.archType, parameters.buildConfig) }}
diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml
index 7d982c09e72024..053d7f90044ae1 100644
--- a/eng/pipelines/libraries/run-test-job.yml
+++ b/eng/pipelines/libraries/run-test-job.yml
@@ -9,6 +9,7 @@ parameters:
   runtimeFlavor: 'coreclr'
   timeoutInMinutes: 150
   pool: ''
+  runtimeVariant: ''
   testScope: ''
   helixQueues: []
   dependsOnTestBuildConfiguration: Debug
@@ -27,6 +28,7 @@ jobs:
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
       liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
       runtimeFlavor: ${{ parameters.runtimeFlavor }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       container: '' # we just send to helix, no need to use a container.
       condition: ${{ parameters.condition }}
@@ -47,7 +49,7 @@ jobs:
         - ${{ format('libraries_build_{0}_{1}{2}_{3}_{4}', parameters.framework, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
         - ${{ format('libraries_test_build_{0}_{1}_{2}_{3}', parameters.framework, parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
       - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
-        - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
+        - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}

From 65f0a4a9aa4fe3529071afc0ae4fe80e085f618f Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 12:55:37 -0400
Subject: [PATCH 05/26] Fix another dependency

---
 eng/pipelines/coreclr/templates/perf-job.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
index d71e26001c44c1..dddb4002328ae4 100644
--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -4,6 +4,7 @@ parameters:
   osGroup: ''
   osSubgroup: ''
   container: ''
+  runtimeVariant: ''
   framework: netcoreapp5.0 # Specify the appropriate framework when running release branches (ie netcoreapp3.0 for release/3.0)
   liveLibrariesBuildConfig: ''
   variables: {}
@@ -25,10 +26,11 @@ jobs:
     archType: ${{ parameters.archType }}
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
+    runtimeVariant: ${{ parameters.runtimeVariant }}
     liveLibrariesBuildConfig: ${{ parameters.liveLibrariesBuildConfig }}
     # Test job depends on the corresponding build job
     dependsOn:
-    - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+    - ${{ format('coreclr_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
     - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
       - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 

From fab5365204c1ffe186f3a89a5dc821338b2c42ee Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 13:52:41 -0400
Subject: [PATCH 06/26] Resolve runtimeVariant variable properly

---
 eng/pipelines/mono/templates/build-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index df7972690d80da..06e9390715c006 100644
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -156,6 +156,6 @@ jobs:
       displayName: Publish Logs
       inputs:
         targetPath: $(Build.SourcesDirectory)/artifacts/log
-        artifactName: 'BuildLogs_Mono_$(runtimeVariant)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+        artifactName: 'BuildLogs_Mono_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
       continueOnError: true
       condition: always()

From 393c10caf7d9328ed01b489827a711db8ab9aae7 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 13:58:12 -0400
Subject: [PATCH 07/26] Fixup

---
 eng/pipelines/mono/templates/xplat-pipeline-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index 62c25c5508b314..587c830e11fb54 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -55,7 +55,7 @@ jobs:
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).${{ parameters.liveRuntimeBuildConfig }}'
 
     - name: buildProductArtifactName
-      value: 'MonoProduct_$(runtimeVariant)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: binTestsPath
       value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr'

From 5d755a76f8438f575af2bcd8ecddca6e24871eff Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 14:38:16 -0400
Subject: [PATCH 08/26] Tweak runtime artifact download name

---
 eng/pipelines/libraries/base-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index 2793183d99ae6a..53305711a23b59 100644
--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -91,7 +91,7 @@ jobs:
           - _runtimeConfigurationArg: -rc ${{ parameters.liveRuntimeBuildConfig }}
           # Download full product dependencies for mono or test
           - ${{ if or(ne(parameters.runtimeFlavor, 'coreclr'), ne(parameters.testScope, '')) }}:
-            - _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
+            - _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.runtimeVariant}}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
             - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
           - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}
 

From 2c4bdeaac4d3b1504a2bde5ac4110190a32f486b Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 15:36:38 -0400
Subject: [PATCH 09/26] Another runtimeVariant

---
 eng/pipelines/installer/jobs/base-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index b2706771713c73..d405069b73c400 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -282,7 +282,7 @@ jobs:
         /p:RuntimeArtifactsPath=$(buildCommandSourcesDirectory)$(RuntimeDownloadPath)
         /p:RuntimeConfiguration=${{ parameters.liveRuntimeBuildConfig }}
     - name: RuntimeArtifactName
-      value: $(runtimeFlavorName)Product_$(liveRuntimeLegName)
+      value: $(runtimeFlavorName)Product_${{ parameters.runtimeVariant }}_$(liveRuntimeLegName)
 
   - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
     - name: liveLibrariesLegName

From c36a78fa7baa45d53322a7609be953559548bcd8 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Tue, 5 May 2020 18:12:23 -0400
Subject: [PATCH 10/26] Add runtimeVariant to CoreCLR artifact names

---
 eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 4 ++--
 eng/pipelines/mono/templates/xplat-pipeline-job.yml    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
index 3034285857d46f..4dcb8286c32b59 100644
--- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
@@ -71,14 +71,14 @@ jobs:
      
     # Build product defines what we are trying to build, either coreclr or mono
     - name: buildProductArtifactName
-      value: 'CoreCLRProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: buildProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
 
     # We need this because both mono and coreclr build currently depends on CoreClr
     - name: coreClrProductArtifactName
-      value: 'CoreCLRProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: coreClrProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index 587c830e11fb54..d017327f31d96a 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -49,7 +49,7 @@ jobs:
     variables:
 
     - name: coreClrProductArtifactName
-      value: 'CoreCLRProduct_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
+      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
 
     - name: coreClrProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).${{ parameters.liveRuntimeBuildConfig }}'

From 42308111329ca6ba0609c9076af247346f72d0ea Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 6 May 2020 09:15:37 -0400
Subject: [PATCH 11/26] Add installer run for LLVM JIT Mono

---
 eng/pipelines/runtime.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index e555490af69904..acde6217aa8a9e 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -555,6 +555,18 @@ jobs:
       liveRuntimeBuildConfig: release
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 
+- template: /eng/pipelines/installer/installer-matrix.yml
+  parameters:
+    buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+    runtimeFlavor: mono
+    platforms:
+    - OSX_x64
+    - Linux_x64
+    jobParameters:
+      runtimeVariant: LLVMJIT
+      liveRuntimeBuildConfig: release
+      liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+
 #
 # Libraries Test Build
 # Only when CoreCLR, Mono or Libraries is changed

From f5885de0b9be94e7bbdd42605d8f622e5a72f56f Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 6 May 2020 09:29:48 -0400
Subject: [PATCH 12/26] Actually specifiy LLVM or not to installer build

---
 eng/pipelines/installer/jobs/base-job.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index d405069b73c400..9286cab7abc95b 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -73,6 +73,10 @@ jobs:
   - name: SignType
     value: test
 
+  - ${{ if startsWith(parameters.runtimeVariant, 'llvm') }}:
+    - name: llvmParameter
+      value: /p:MonoEnableLLVM=true
+
   # Set up non-PR build from internal project
   - ${{ if eq(parameters.isOfficialBuild, true) }}:
     - name: SignType
@@ -99,6 +103,7 @@ jobs:
         /p:PortableBuild=true
         /p:SkipTests=$(SkipTests)
         /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
+        $(llvmParameter)
         $(OfficialBuildArg)
     - name: MsbuildSigningArguments
       value: >-
@@ -122,6 +127,7 @@ jobs:
         /p:PortableBuild=true
         /p:SkipTests=$(SkipTests)
         /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
+        $(llvmParameter)
 
     - name: BaseJobBuildCommand
       value: >-
@@ -137,6 +143,7 @@ jobs:
       value: >-
         /p:PortableBuild=true
         /p:SkipTests=$(SkipTests)
+        $(llvmParameter)
 
     - name: BaseJobBuildCommand
       value: >-
@@ -186,6 +193,7 @@ jobs:
         /p:TargetArchitecture=${{ parameters.archType }}
         /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
         $(OfficialBuildArg)
+        $(llvmParameter)
 
     - name: _PortableBuild
       value: ${{ eq(parameters.osSubgroup, '') }}

From 6d188aa6e22437b9cbed7d944f09ebd6220f02a2 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 6 May 2020 10:09:22 -0400
Subject: [PATCH 13/26] Unique name for LLVM installer run

---
 eng/pipelines/installer/jobs/base-job.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index e7e10abb88921d..40629b20621796 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -39,8 +39,8 @@ parameters:
   platforms: []
 
 jobs:
-- job: ${{ format('installer_{0}_{1}_{2}', parameters.runtimeFlavor, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
-  displayName: ${{ format('Installer Build and Test {0} {1} {2}', parameters.runtimeFlavor, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
+- job: ${{ format('installer_{0}_{1}_{2}_{3}', parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
+  displayName: ${{ format('Installer Build and Test {0} {1} {2} {3}', parameters.runtimeFlavor, parameters.runtimeVariant, coalesce(parameters.name, parameters.platform), parameters.buildConfig) }}
 
   condition: and(succeeded(), ${{ parameters.condition }})
   pool: ${{ parameters.pool }}

From 5ba82c70b4479ce81a478a9b4807fd2ff80ff501 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 6 May 2020 10:45:20 -0400
Subject: [PATCH 14/26] Ensure log uploads are disambiguated

---
 eng/pipelines/installer/jobs/base-job.yml                   | 1 +
 eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 40629b20621796..1cf234b989511e 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -529,6 +529,7 @@ jobs:
     parameters:
       name: ${{ coalesce(parameters.name, parameters.platform) }}
       runtimeFlavor: ${{ parameters.runtimeFlavor }}
+      runtimeVariant: ${{ parameters.runtimeVariant }}
       skipTests: $(SkipTests)
       isOfficialBuild: ${{ eq(parameters.isOfficialBuild, true) }}
 
diff --git a/eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml b/eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml
index 672a12aa61be71..884ca0177e7f81 100644
--- a/eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml
+++ b/eng/pipelines/installer/jobs/steps/upload-job-artifacts.yml
@@ -1,7 +1,7 @@
 parameters:
   name: ''
   runtimeFlavor: 'coreclr'
-
+  runtimeVariant: ''
   isOfficialBuild: false
 
 steps:
@@ -38,6 +38,6 @@ steps:
   displayName: Publish BuildLogs
   inputs:
     targetPath: '$(Build.StagingDirectory)/BuildLogs'
-    artifactName: Installer-Logs-${{ parameters.runtimeFlavor }}-${{ parameters.name }}-$(_BuildConfig)
+    artifactName: Installer-Logs-${{ parameters.runtimeFlavor }}-${{ parameters.runtimeVariant }}-${{ parameters.name }}-$(_BuildConfig)
   continueOnError: true
   condition: succeededOrFailed()

From 775cd6c453f14af1e33d4e9f2edc461083cfb9e5 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 6 May 2020 12:39:49 -0400
Subject: [PATCH 15/26] Fix dependency in full matrix

---
 eng/pipelines/installer/jobs/base-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 1cf234b989511e..46e3a7f331162c 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -357,7 +357,7 @@ jobs:
     - libraries_build_allconfigurations_Windows_NT_x64_Release
   - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
     - ${{ each platform in parameters.platforms }}:
-      - ${{ parameters.runtimeFlavor }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}
+      - ${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}
       - libraries_build_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
 
   steps:

From 45849b69a2d54ff0736b1059aea620e9de6dc60b Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Thu, 7 May 2020 10:28:09 -0400
Subject: [PATCH 16/26] Add LLVMAOT variant, which bundles llc/opt for current
 arch

---
 eng/pipelines/installer/jobs/base-job.yml     |  6 +-
 eng/pipelines/mono/templates/build-job.yml    |  5 +-
 eng/pipelines/runtime-official.yml            | 34 +++++++++++
 eng/pipelines/runtime.yml                     | 60 +++++++++++++++++++
 .../pkg/projects/Directory.Build.targets      |  3 +
 src/mono/mono.proj                            |  6 ++
 6 files changed, 112 insertions(+), 2 deletions(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 46e3a7f331162c..49c45b7a92e00e 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -80,10 +80,14 @@ jobs:
   - name: SignType
     value: test
 
-  - ${{ if startsWith(parameters.runtimeVariant, 'llvm') }}:
+  - ${{ if eq(parameters.runtimeVariant, 'llvmjit') }}:
     - name: llvmParameter
       value: /p:MonoEnableLLVM=true
 
+  - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
+    - name: llvmParameter
+      value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
+
   # Set up non-PR build from internal project
   - ${{ if eq(parameters.isOfficialBuild, true) }}:
     - name: SignType
diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index 06e9390715c006..6cb8d0ed820fd9 100644
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -74,9 +74,12 @@ jobs:
         value: wasm
       - name: osOverride
         value: '-os Browser'
-    - ${{ if startsWith(parameters.runtimeVariant, 'llvm') }}:
+    - ${{ if eq(parameters.runtimeVariant, 'llvmjit') }}:
       - name: llvmParameter
         value: /p:MonoEnableLLVM=true
+    - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
+      - name: llvmParameter
+        value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
     - ${{ parameters.variables }}
 
     steps:
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index cb17a3fc84820b..0a848746b13128 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -115,6 +115,26 @@ stages:
         runtimeVariant: LLVMJIT
         isOfficialBuild: ${{ variables.isOfficialBuild }}
 
+  - template: /eng/pipelines/common/platform-matrix.yml
+    parameters:
+      jobTemplate: /eng/pipelines/mono/templates/build-job.yml
+      runtimeFlavor: mono
+      buildConfig: release
+      platforms:
+      - OSX_x64
+      - Linux_x64
+      # - Linux_arm
+      # - Linux_arm64
+      # - Linux_musl_x64
+      # - Linux_musl_arm64
+      # - Windows_NT_x64
+      # - Windows_NT_x86
+      # - Windows_NT_arm
+      # - Windows_NT_arm64
+      jobParameters:
+        runtimeVariant: LLVMAOT
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+
   #
   # Build libraries using live CoreLib from CoreCLR
   #
@@ -241,6 +261,20 @@ stages:
       - OSX_x64
       - Linux_x64
 
+  - template: /eng/pipelines/installer/installer-matrix.yml
+    parameters:
+      jobParameters:
+        liveRuntimeBuildConfig: release
+        liveLibrariesBuildConfig: Release
+        isOfficialBuild: ${{ variables.isOfficialBuild }}
+        useOfficialAllConfigurations: false
+        buildFullPlatformManifest: false
+        runtimeVariant: LLVMAOT
+      runtimeFlavor: mono
+      platforms:
+      - OSX_x64
+      - Linux_x64
+
 - ${{ if eq(variables.isOfficialBuild, true) }}:
   - template: /eng/pipelines/official/stages/publish.yml
     parameters:
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 611f315578fc05..4f5501a01dc845 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -348,6 +348,30 @@ jobs:
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
           eq(variables['isFullMatrix'], true))
 
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/mono/templates/build-job.yml
+    runtimeFlavor: mono
+    buildConfig: debug
+    platforms:
+    - OSX_x64
+    - Linux_x64
+    # - Linux_arm
+    # - Linux_arm64
+    # - Linux_musl_x64
+    # - Linux_musl_arm64
+    # - Windows_NT_x64
+    # - Windows_NT_x86
+    # - Windows_NT_arm
+    # - Windows_NT_arm64
+    jobParameters:
+      runtimeVariant: LLVMAOT
+      condition: >-
+        or(
+          eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
+
 #
 # Build Mono LLVM release
 # Only when libraries or mono changed
@@ -376,6 +400,30 @@ jobs:
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
           eq(variables['isFullMatrix'], true))
 
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/mono/templates/build-job.yml
+    runtimeFlavor: mono
+    buildConfig: release
+    platforms:
+    - OSX_x64
+    - Linux_x64
+    # - Linux_arm
+    # - Linux_arm64
+    # - Linux_musl_x64
+    # - Linux_musl_arm64
+    # - Windows_NT_x64
+    # - Windows_NT_x86
+    # - Windows_NT_arm
+    # - Windows_NT_arm64
+    jobParameters:
+      runtimeVariant: LLVMAOT
+      condition: >-
+        or(
+          eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
+          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
+
 #
 # Build libraries using live CoreLib
 # These set of libraries are built always no matter what changed
@@ -567,6 +615,18 @@ jobs:
       liveRuntimeBuildConfig: release
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 
+- template: /eng/pipelines/installer/installer-matrix.yml
+  parameters:
+    buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+    runtimeFlavor: mono
+    platforms:
+    - OSX_x64
+    - Linux_x64
+    jobParameters:
+      runtimeVariant: LLVMAOT
+      liveRuntimeBuildConfig: release
+      liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+
 #
 # Libraries Test Build
 # Only when CoreCLR, Mono or Libraries is changed
diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 25349b4029cff5..754837727c53e8 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -32,6 +32,9 @@
   <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true'">
     <RuntimeSpecificFrameworkSuffix>.Mono.LLVM</RuntimeSpecificFrameworkSuffix>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(MonoBundleLLVMOptimizer)' == 'true'">
+    <RuntimeSpecificFrameworkSuffix>.Mono.LLVM.AOT</RuntimeSpecificFrameworkSuffix>
+  </PropertyGroup>
 
   <!--
     For any Dependency items with a VersionProp, set it to the property by that name given by the
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index e6849d99028bba..68c7d265a35000 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -975,6 +975,12 @@
       <_MonoRuntimeArtifacts Include="$(_MonoAotCrossFilePath)">
         <Destination>$(BinDir)cross\mono-aot-cross</Destination>
       </_MonoRuntimeArtifacts>
+      <_MonoRuntimeArtifacts Condition="'$(MonoBundleLLVMOptimizer)' == 'true'" Include="$(MonoLLVMDir)\bin\llc">
+        <Destination>$(BinDir)\llc</Destination>
+      </_MonoRuntimeArtifacts>
+      <_MonoRuntimeArtifacts Condition="'$(MonoBundleLLVMOptimizer)' == 'true'" Include="$(MonoLLVMDir)\bin\opt">
+        <Destination>$(BinDir)\opt</Destination>
+      </_MonoRuntimeArtifacts>
       <_MonoRuntimeArtifacts Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'" Include="$(MonoLLVMDir)\bin\llc">
         <Destination>$(BinDir)cross\llc</Destination>
       </_MonoRuntimeArtifacts>

From 482dae7ec7ea90c60dafe6b3d19d469ce34723b0 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 09:19:15 -0400
Subject: [PATCH 17/26] Unify runtimeMode into runtimeVariant

---
 .../templates/runtimes/run-test-job.yml       | 22 +++++++++----------
 .../templates/runtimes/send-to-helix-step.yml |  6 ++---
 eng/pipelines/runtime.yml                     |  3 +--
 src/coreclr/tests/helixpublishwitharcade.proj |  8 +++----
 4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index cf44f1a3527027..6c89645889743a 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -24,8 +24,6 @@ parameters:
   pool: ''
   runtimeFlavor: 'coreclr'
   runtimeFlavorDisplayName: 'CoreCLR'
-  runtimeMode: ''
-  runtimeModeDisplayName: ''
 
 ### Test run job
 
@@ -63,18 +61,24 @@ jobs:
       - ${{ if ne(parameters.testGroup, 'innerloop') }}:
         - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}'
     - ${{ if ne(parameters.stagedBuild, true) }}:
-      - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+        ### runtimeVariant affects build artifacts, but we want to use "normal" 
+        ### build artifacts for interpreter - there's no special interpreter 
+        ###artifact to download
+        - ${{ format('{0}__product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+        - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
         - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 
     # Compute job name from template parameters
     ${{ if eq(parameters.testGroup, 'innerloop') }}:
-      name: 'run_test_p0_${{ parameters.runtimeFlavor }}${{ parameters.runtimeMode }}_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeModeDisplayName}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+      name: 'run_test_p0_${{ parameters.runtimeFlavor }}${{ parameters.runtimeVariant }}_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant}} Pri0 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
 
     ${{ if ne(parameters.testGroup, 'innerloop') }}:
       name: 'run_test_p1_${{ parameters.displayNameArgs }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
-      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeModeDisplayName }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
+      displayName: '${{ parameters.runtimeFlavorDisplayName }} ${{ parameters.runtimeVariant }} Pri1 Runtime Tests Run ${{ parameters.displayNameArgs }} ${{ parameters.osGroup }}${{ parameters.osSubgroup }} ${{ parameters.archType }} ${{ parameters.buildConfig }}'
 
     variables:
     - name: testhostArg
@@ -109,10 +113,6 @@ jobs:
         - name: crossgenArg
           value: 'composite'
 
-    - ${{ if eq(parameters.runtimeMode, 'interpreter') }}:
-      - name: RuntimeModeDisplayName
-        value: 'Interpreter' 
-
     # Set job timeouts
     #
     # "timeoutPerTestCollectionInMinutes" is the time needed for the "biggest" xUnit test collection to complete.
@@ -461,6 +461,6 @@ jobs:
       displayName: Publish Logs
       inputs:
         targetPath: $(Build.SourcesDirectory)/artifacts/log
-        artifactName: '${{ parameters.runtimeFlavor }}_${{ parameters.runtimeMode }}_$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}'
+        artifactName: '${{ parameters.runtimeFlavor }}_${{ parameters.runtimeVariant }}_$(LogNamePrefix)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_${{ parameters.testGroup }}'
       continueOnError: true
       condition: always()
diff --git a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
index 2fc09a15ecd6bd..ca58a7eff31654 100644
--- a/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
+++ b/eng/pipelines/common/templates/runtimes/send-to-helix-step.yml
@@ -23,7 +23,7 @@ parameters:
   gcSimulatorTests: ''
   coreClrRepoRoot: ''
   runtimeFlavorDisplayName: 'CoreCLR'
-  runtimeMode: ''
+  runtimeVariant: ''
 
 steps:
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
@@ -58,7 +58,7 @@ steps:
       _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }}
       _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }}
       runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
-      _RuntimeMode: ${{ parameters.runtimeMode }}
+      _RuntimeVariant: ${{ parameters.runtimeVariant }}
       ${{ if eq(parameters.publishTestResults, 'true') }}:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
@@ -100,7 +100,7 @@ steps:
       _TimeoutPerTestCollectionInMinutes: ${{ parameters.timeoutPerTestCollectionInMinutes }}
       _TimeoutPerTestInMinutes: ${{ parameters.timeoutPerTestInMinutes }}
       runtimeFlavorDisplayName: ${{ parameters.runtimeFlavorDisplayName }}
-      _RuntimeMode: ${{ parameters.runtimeMode }}
+      _RuntimeVariant: ${{ parameters.runtimeVariant }}
       ${{ if eq(parameters.publishTestResults, 'true') }}:
         SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       # TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 370f82250fef82..521ca3fbbd86c4 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -815,8 +815,7 @@ jobs:
       testGroup: innerloop
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
       liveRuntimeBuildConfig: release
-      runtimeMode: 'interpreter'
-      runtimeModeDisplayName: 'Interpreter'
+      runtimeVariant: 'interpreter'
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj
index c7aa3174852f92..f6b7a2107faa65 100644
--- a/src/coreclr/tests/helixpublishwitharcade.proj
+++ b/src/coreclr/tests/helixpublishwitharcade.proj
@@ -33,7 +33,7 @@
         RunInUnloadableContext=$(_RunInUnloadableContext);
         TimeoutPerTestCollectionInMinutes=$(_TimeoutPerTestCollectionInMinutes);
         TimeoutPerTestInMinutes=$(_TimeoutPerTestInMinutes);
-        RuntimeMode=$(_RuntimeMode)
+        RuntimeVariant=$(_RuntimeVariant)
       </_PropertiesToPass>
     </PropertyGroup>
 
@@ -181,7 +181,7 @@
     <TestRunNamePrefix Condition=" '$(RunCrossGen2)' == 'true' ">R2R-CG2 </TestRunNamePrefix>
     <TestRunNamePrefix Condition=" '$(Scenario)' == 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) @ </TestRunNamePrefix>
     <TestRunNamePrefix Condition=" '$(Scenario)' != 'normal' ">$(TestRunNamePrefix)$(TargetOS) $(TargetArchitecture) $(Configuration) $(Scenario) @ </TestRunNamePrefix>
-    <TestRunNamePrefix Condition=" '$(RuntimeMode)' == 'interpreter' ">$(TestRunNamePrefix) Interpreter </TestRunNamePrefix>  
+    <TestRunNamePrefix Condition=" '$(RuntimeVariant)' == 'interpreter' ">$(TestRunNamePrefix) Interpreter </TestRunNamePrefix>  
     <TimeoutPerTestInMilliseconds Condition=" '$(TimeoutPerTestInMinutes)' != '' ">$([System.TimeSpan]::FromMinutes($(TimeoutPerTestInMinutes)).TotalMilliseconds)</TimeoutPerTestInMilliseconds>
     <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
     <_XUnitParallelMode>collections</_XUnitParallelMode>
@@ -208,7 +208,7 @@
     <HelixPreCommand Include="set __CollectDumps=1" />
     <HelixPreCommand Include="set __CrashDumpFolder=%HELIX_DUMP_FOLDER%" />
     <HelixPreCommand Include="type %__TestEnv%" />
-    <HelixPreCommand Include="set MONO_ENV_OPTIONS='--interpreter'" Condition=" '$(RuntimeMode)' == 'interpreter' " />
+    <HelixPreCommand Include="set MONO_ENV_OPTIONS='--interpreter'" Condition=" '$(RuntimeVariant)' == 'interpreter' " />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetsWindows)' != 'true' ">
@@ -228,7 +228,7 @@
     <HelixPreCommand Include="cat $__TestEnv" />
     <HelixPreCommand Include="sudo bash -c 'echo $HELIX_DUMP_FOLDER/core.%u.%p > /proc/sys/kernel/core_pattern'" Condition=" '$(TargetOS)' != 'OSX' " />
     <HelixPreCommand Include="ulimit -c unlimited" Condition=" '$(TargetOS)' == 'OSX' " />
-    <HelixPreCommand Include="export MONO_ENV_OPTIONS='--interpreter" Condition=" '$(RuntimeMode)' == 'interpreter' " />
+    <HelixPreCommand Include="export MONO_ENV_OPTIONS='--interpreter" Condition=" '$(RuntimeVariant)' == 'interpreter' " />
   </ItemGroup>
 
   <PropertyGroup>

From 49a6d92239450aff3b6aa3a9bae77dd842210f6b Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 09:21:47 -0400
Subject: [PATCH 18/26] Make sure we don't use Mono.LLVM package names on
 CoreCLR or Mobile

---
 src/installer/pkg/projects/Directory.Build.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 754837727c53e8..21a8f5521f7d47 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -29,10 +29,10 @@
   <PropertyGroup Condition="'$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
     <RuntimeSpecificFrameworkSuffix>.Mono</RuntimeSpecificFrameworkSuffix>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true'">
+  <PropertyGroup Condition="'$(MonoEnableLLVM)' == 'true' and '$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
     <RuntimeSpecificFrameworkSuffix>.Mono.LLVM</RuntimeSpecificFrameworkSuffix>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(MonoBundleLLVMOptimizer)' == 'true'">
+  <PropertyGroup Condition="'$(MonoBundleLLVMOptimizer)' == 'true' and '$(RuntimeFlavor)' == 'Mono' and '$(TargetsMobile)' != 'true' and '$(TargetsBrowser)' != 'true'">
     <RuntimeSpecificFrameworkSuffix>.Mono.LLVM.AOT</RuntimeSpecificFrameworkSuffix>
   </PropertyGroup>
 

From 09946d44076a2c7f1a2e1bc8feda2d40aa2fb0b8 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 09:30:08 -0400
Subject: [PATCH 19/26] Fix perf runs to deal with runtimeVariant

---
 eng/pipelines/coreclr/templates/perf-job.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
index 890249686bc40c..3a0a0396a56584 100644
--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -36,7 +36,7 @@ jobs:
     - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
       - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
     - ${{ if eq(parameters.runtimeType, 'mono') }}:
-      - ${{ format('mono_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ format('mono_{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
 
     ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
       ${{ if eq(parameters.runtimeType, 'mono') }}:

From 2fba6259853bd8228d5c9f2872d788b771e7ed06 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 10:53:11 -0400
Subject: [PATCH 20/26] Try to reconcile perf test artifact names

---
 eng/pipelines/coreclr/templates/perf-job.yml        | 8 ++++++--
 eng/pipelines/mono/templates/xplat-pipeline-job.yml | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
index 3a0a0396a56584..0089e0f3b64668 100644
--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -80,8 +80,12 @@ jobs:
         parameters:
           unpackFolder: $(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)
           cleanUnpackFolder: false
-          artifactFileName: 'MonoProduct_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
-          artifactName: 'MonoProduct_$(osGroup)_$(archType)_$(buildConfig)'
+          ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+            artifactFileName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
+            artifactName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)'
+          ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+            artifactFileName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
+            artifactName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)'
           displayName: 'Mono runtime'
 
     # Create Core_Root
diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index 0701073c669c61..dafc7b1fce89b7 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -54,7 +54,10 @@ jobs:
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(liveRuntimeBuildConfigUpper)'
 
     - name: buildProductArtifactName
-      value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'MonoProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: binTestsPath
       value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr'

From 42f4cfeac0b79a12c2b88b65ef2c2b2bdc12bb68 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 12:42:48 -0400
Subject: [PATCH 21/26] Another "except for interpreter"

---
 eng/pipelines/coreclr/templates/xplat-pipeline-job.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
index daa189d88d6da3..999f1966c7b671 100644
--- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
@@ -71,7 +71,10 @@ jobs:
      
     # Build product defines what we are trying to build, either coreclr or mono
     - name: buildProductArtifactName
-      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'CoreCLRProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: buildProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'

From 7be3b29697301a9914427285735a9e4d41491a40 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Wed, 13 May 2020 13:45:08 -0400
Subject: [PATCH 22/26] And again

---
 eng/pipelines/mono/templates/xplat-pipeline-job.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index dafc7b1fce89b7..0a8c1edabf0726 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -48,7 +48,10 @@ jobs:
 
     variables:
     - name: coreClrProductArtifactName
-      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
+      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'CoreCLRProduct__$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
+      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
+        value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
 
     - name: coreClrProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(liveRuntimeBuildConfigUpper)'

From 90e64c94866a1b68e75cb3b4f728be87b97a8754 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Thu, 14 May 2020 10:29:36 -0400
Subject: [PATCH 23/26] Make bundling llc/opt the default when LLVM enabled on
 Mono

---
 eng/pipelines/mono/templates/build-job.yml         | 2 +-
 src/installer/pkg/projects/Directory.Build.targets | 1 +
 src/mono/mono.proj                                 | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
index 6cb8d0ed820fd9..8593d864810339 100644
--- a/eng/pipelines/mono/templates/build-job.yml
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -76,7 +76,7 @@ jobs:
         value: '-os Browser'
     - ${{ if eq(parameters.runtimeVariant, 'llvmjit') }}:
       - name: llvmParameter
-        value: /p:MonoEnableLLVM=true
+        value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=false
     - ${{ if eq(parameters.runtimeVariant, 'llvmaot') }}:
       - name: llvmParameter
         value: /p:MonoEnableLLVM=true /p:MonoBundleLLVMOptimizer=true
diff --git a/src/installer/pkg/projects/Directory.Build.targets b/src/installer/pkg/projects/Directory.Build.targets
index 21a8f5521f7d47..860f3ff5000079 100644
--- a/src/installer/pkg/projects/Directory.Build.targets
+++ b/src/installer/pkg/projects/Directory.Build.targets
@@ -12,6 +12,7 @@
       Needs to happen in Directory.Build.targets to allow all the pkgproj's to set Version property first.
     -->
     <StableVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' != 'true'">$(Version)</StableVersion>
+    <MonoBundleLLVMOptimizer Condition="'$(MonoEnableLLVM)' == 'true'">true</MonoBundleLLVMOptimizer>
   </PropertyGroup>
 
   <!--
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index 39bed5d48cb350..9a41bfe9f4fa6b 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -33,6 +33,7 @@
     <BuildMonoAOTCrossCompiler Condition="'$(TargetstvOS)' == 'true'">true</BuildMonoAOTCrossCompiler>
     <BuildMonoAOTCrossCompiler Condition="'$(TargetsBrowser)' == 'true'">true</BuildMonoAOTCrossCompiler>
     <CrossConfigH Condition="'$(BuildMonoAOTCrossCompiler)' == 'true'">$(MonoObjDir)cross\config.h</CrossConfigH>
+    <MonoBundleLLVMOptimizer Condition="'$(MonoEnableLLVM)' == 'true'">true</MonoBundleLLVMOptimizer>
   </PropertyGroup>
 
   <!-- OSX/iOS/tvOS/Android/Linux Mono runtime build -->

From 4187fd86b8eb7146c59aa70ea24bff05421eed58 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Thu, 14 May 2020 10:33:12 -0400
Subject: [PATCH 24/26] Capitalise Interpreter, so it's prettier on AzDO

---
 eng/pipelines/runtime.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 521ca3fbbd86c4..3c99b048a237df 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -815,7 +815,7 @@ jobs:
       testGroup: innerloop
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
       liveRuntimeBuildConfig: release
-      runtimeVariant: 'interpreter'
+      runtimeVariant: 'Interpreter'
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),

From 902f2a2beedb4eb61892cfe004ebf002782d4bec Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Mon, 18 May 2020 08:38:54 -0400
Subject: [PATCH 25/26] Remove some Interpreter runtimeVariant stuff, now it's
 a Scenario instead

---
 .../common/templates/runtimes/run-test-job.yml         |  8 +-------
 eng/pipelines/coreclr/templates/perf-job.yml           |  8 ++------
 eng/pipelines/coreclr/templates/xplat-pipeline-job.yml |  5 +----
 eng/pipelines/mono/templates/xplat-pipeline-job.yml    | 10 ++--------
 4 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/eng/pipelines/common/templates/runtimes/run-test-job.yml b/eng/pipelines/common/templates/runtimes/run-test-job.yml
index d8b7d7156cddec..760dad39c85d8c 100644
--- a/eng/pipelines/common/templates/runtimes/run-test-job.yml
+++ b/eng/pipelines/common/templates/runtimes/run-test-job.yml
@@ -61,13 +61,7 @@ jobs:
       - ${{ if ne(parameters.testGroup, 'innerloop') }}:
         - '${{ parameters.runtimeFlavor }}_common_test_build_p1_${{ parameters.managedTestBuildOsGroup }}${{ parameters.managedTestBuildOsSubgroup }}_${{ parameters.archType }}_${{parameters.buildConfig }}'
     - ${{ if ne(parameters.stagedBuild, true) }}:
-      - ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
-        ### runtimeVariant affects build artifacts, but we want to use "normal" 
-        ### build artifacts for interpreter - there's no special interpreter 
-        ###artifact to download
-        - ${{ format('{0}__product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
-      - ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
-        - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
+      - ${{ format('{0}_{1}_product_build_{2}{3}_{4}_{5}', parameters.runtimeFlavor, parameters.runtimeVariant, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
       - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
         - ${{ format('libraries_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
 
diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml
index 0089e0f3b64668..003e58f276146d 100644
--- a/eng/pipelines/coreclr/templates/perf-job.yml
+++ b/eng/pipelines/coreclr/templates/perf-job.yml
@@ -80,12 +80,8 @@ jobs:
         parameters:
           unpackFolder: $(librariesDownloadDir)/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)
           cleanUnpackFolder: false
-          ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
-            artifactFileName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
-            artifactName: 'MonoProduct__$(osGroup)_$(archType)_$(buildConfig)'
-          ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
-            artifactFileName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
-            artifactName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)'
+          artifactFileName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)$(archiveExtension)'
+          artifactName: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)_$(archType)_$(buildConfig)'
           displayName: 'Mono runtime'
 
     # Create Core_Root
diff --git a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
index 999f1966c7b671..daa189d88d6da3 100644
--- a/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
@@ -71,10 +71,7 @@ jobs:
      
     # Build product defines what we are trying to build, either coreclr or mono
     - name: buildProductArtifactName
-      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'CoreCLRProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
-      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: buildProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(buildConfigUpper)'
diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
index 0a8c1edabf0726..0701073c669c61 100644
--- a/eng/pipelines/mono/templates/xplat-pipeline-job.yml
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -48,19 +48,13 @@ jobs:
 
     variables:
     - name: coreClrProductArtifactName
-      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'CoreCLRProduct__$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
-      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
+      value: 'CoreCLRProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_${{ parameters.liveRuntimeBuildConfig }}'
 
     - name: coreClrProductRootFolderPath
       value: '$(Build.SourcesDirectory)/artifacts/bin/coreclr/$(osGroup).$(archType).$(liveRuntimeBuildConfigUpper)'
 
     - name: buildProductArtifactName
-      ${{ if eq(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'MonoProduct__$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
-      ${{ if ne(parameters.runtimeVariant, 'interpreter') }}:
-        value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      value: 'MonoProduct_${{ parameters.runtimeVariant }}_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
 
     - name: binTestsPath
       value: '$(Build.SourcesDirectory)/artifacts/tests/coreclr'

From 821d386f5e15228578c6f69eff372b42a0f06b99 Mon Sep 17 00:00:00 2001
From: Joseph Shields <directhex@apebox.org>
Date: Mon, 18 May 2020 14:23:51 -0400
Subject: [PATCH 26/26] Fix tpyo

---
 src/coreclr/tests/helixpublishwitharcade.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/coreclr/tests/helixpublishwitharcade.proj b/src/coreclr/tests/helixpublishwitharcade.proj
index 773d20d78b59b4..c1d2de4f8b7131 100644
--- a/src/coreclr/tests/helixpublishwitharcade.proj
+++ b/src/coreclr/tests/helixpublishwitharcade.proj
@@ -33,7 +33,7 @@
         RunInUnloadableContext=$(_RunInUnloadableContext);
         TimeoutPerTestCollectionInMinutes=$(_TimeoutPerTestCollectionInMinutes);
         TimeoutPerTestInMinutes=$(_TimeoutPerTestInMinutes);
-        RuntimeVariant=$(_RuntimeVariant)
+        RuntimeVariant=$(_RuntimeVariant);
         BundledNETCoreAppPackageVersion=$(BundledNETCoreAppPackageVersion)
       </_PropertiesToPass>
     </PropertyGroup>