From: Alexander Köplinger <alex.koeplinger@outlook.com>
Date: Wed, 22 Jan 2020 20:20:13 +0000 (+0100)
Subject: Enable Mono build in CI (#1934)
X-Git-Tag: submit/tizen/20210909.063632~10292
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6eb3edf818ced06d698c4148520a86a54c5f427c;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Enable Mono build in CI (#1934)

* Enable Mono in default build

* Integrate Mono into the build system

* Fix System.Private.CoreLib build in Mono

Broken by https://github.com/dotnet/runtime/commit/9c82a36c23235c4d50954cb33a4d5d89b787a1aa

* Disable Windows test runs

Fails due to https://github.com/dotnet/runtime/issues/1933

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---

diff --git a/Directory.Build.props b/Directory.Build.props
index c3809e2..cbf29a7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -52,6 +52,14 @@
     <CoreLibSharedDir>$([MSBuild]::NormalizeDirectory('$(LibrariesProjectRoot)', 'System.Private.CoreLib', 'src'))</CoreLibSharedDir>
   </PropertyGroup>
 
+  <!-- Honor the generic RuntimeConfiguration property. -->
+  <PropertyGroup>
+    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
+    <!-- There's no checked configuration on Mono. -->
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
+  </PropertyGroup>
+
   <!-- Packaging properties -->
   <PropertyGroup>
     <!--
diff --git a/docs/workflow/building/libraries/README.md b/docs/workflow/building/libraries/README.md
index 7580b14..57a356c 100644
--- a/docs/workflow/building/libraries/README.md
+++ b/docs/workflow/building/libraries/README.md
@@ -9,7 +9,7 @@ Here is one example of a daily workflow for a developer working mainly on the li
 git clean -xdf
 git pull upstream master & git push origin master
 build -subsetCategory coreclr -c Release
-build -subsetCategory libraries -coreclrConfiguration Release
+build -subsetCategory libraries -runtimeConfiguration release
 
 :: The above you may only perform once in a day, or when
 :: you pull down significant new changes.
@@ -34,7 +34,7 @@ The instructions for Linux and macOS are essentially the same:
 git clean -xdf
 git pull upstream master & git push origin master
 ./build.sh -subsetcategory coreclr -c Release
-./build.sh -subsetcategory libraries -coreclrconfiguration Release
+./build.sh -subsetcategory libraries -runtimeconfiguration Release
 
 # The above you may only perform once in a day, or when
 # you pull down significant new changes.
@@ -59,12 +59,12 @@ These example commands will build a release CoreCLR (and CoreLib), debug librari
 
 For Linux:
 ```bash
-./build.sh -coreclrconfiguration Release
+./build.sh -runtimeconfiguration Release
 ```
 
 For Windows:
 ```bat
-./build.cmd -coreclrConfiguration Release
+./build.cmd -runtimeconfiguration Release
 ```
 
 Detailed information about building and testing runtimes and the libraries is in the documents linked below.
diff --git a/docs/workflow/testing/coreclr/testing.md b/docs/workflow/testing/coreclr/testing.md
index 18c1f15..757e784 100644
--- a/docs/workflow/testing/coreclr/testing.md
+++ b/docs/workflow/testing/coreclr/testing.md
@@ -8,7 +8,7 @@ Details on test metadata can be found in [test-configuration.md](test-configurat
     * [Unix](../../building/coreclr/linux-instructions.md)
     * [macOS](../../building/coreclr/osx-instructions.md)
     * [Windows](../../building/coreclr/README.md)
-2) [Build the libraries](../../building/libraries/README.md) in Release configuration. Pass the configuration of CoreCLR you just built to the build script (e.g. `-coreclrConfiguration Debug`).
+2) [Build the libraries](../../building/libraries/README.md) in Release configuration. Pass the configuration of CoreCLR you just built to the build script (e.g. `-runtimeconfiguration debug`).
 3) From the src/coreclr directory run the following command:
     * Non-Windows - `./build-test.sh`
     * Windows - `build-test.cmd`
diff --git a/docs/workflow/testing/mono/testing.md b/docs/workflow/testing/mono/testing.md
index 164ac48..f634d21 100644
--- a/docs/workflow/testing/mono/testing.md
+++ b/docs/workflow/testing/mono/testing.md
@@ -6,14 +6,14 @@ The runtime tests will be available at a later date.
 ## Running Library Tests
 Running library tests against Mono is straightforward regardless of configuration.  Simply run the following commands:
 
-1. Build and set the TestRuntimeFlavor
+1. Build and set the RuntimeFlavor
 
 ```bash
-./build.sh /p:TestRuntimeFlavor=mono
+./build.sh /p:RuntimeFlavor=mono
 ```
 or on Windows
 ```bat
-build.cmd /p:TestRuntimeFlavor=mono
+build.cmd /p:RuntimeFlavor=mono
 ```
 
 2. cd into the test library of your choice (`cd src/libraries/<library>/tests`)
@@ -21,5 +21,5 @@ build.cmd /p:TestRuntimeFlavor=mono
 3. Run the tests
 
 ```
-dotnet msbuild /t:BuildAndTest /p:TestRuntimeFlavor=mono
+dotnet msbuild /t:BuildAndTest /p:RuntimeFlavor=mono
 ```
diff --git a/eng/Subsets.props b/eng/Subsets.props
index e2a2cad..3de5e37 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -57,7 +57,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultSubsetCategories>libraries-installer-coreclr</DefaultSubsetCategories>
+    <DefaultSubsetCategories>libraries-installer-coreclr-mono</DefaultSubsetCategories>
     <DefaultInstallerSubsets>corehost-managed-depproj-pkgproj-bundle-installers-test</DefaultInstallerSubsets>
     <!-- TODO: Split into multiple sets. -->
     <DefaultLibrariesSubsets>all</DefaultLibrariesSubsets>
@@ -102,12 +102,26 @@
     <ProjectToBuild Include="$(RepoToolsLocalDir)regenerate-readme-table.proj" />
   </ItemGroup>
 
+  <!-- Honor the generic RuntimeConfiguration property. -->
+  <PropertyGroup>
+    <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(RuntimeConfiguration)</CoreCLRConfiguration>
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' != 'checked'">$(RuntimeConfiguration)</MonoConfiguration>
+    <!-- There's no checked configuration on Mono. -->
+    <MonoConfiguration Condition="'$(MonoConfiguration)' == '' and '$(RuntimeConfiguration.ToLower())' == 'checked'">Debug</MonoConfiguration>
+  </PropertyGroup>
+
   <ItemDefinitionGroup Condition="'$(CoreCLRConfiguration)' != ''">
     <CoreClrProjectToBuild>
       <Properties>Configuration=$(CoreCLRConfiguration)</Properties>
     </CoreClrProjectToBuild>
   </ItemDefinitionGroup>
 
+  <ItemDefinitionGroup Condition="'$(MonoConfiguration)' != ''">
+    <MonoProjectToBuild>
+      <Properties>Configuration=$(MonoConfiguration)</Properties>
+    </MonoProjectToBuild>
+  </ItemDefinitionGroup>
+
   <ItemDefinitionGroup Condition="'$(LibrariesConfiguration)' != ''">
     <LibrariesProjectToBuild>
       <Properties>Configuration=$(LibrariesConfiguration)</Properties>
diff --git a/eng/build.ps1 b/eng/build.ps1
index 32c300c..3c3f6e7 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -14,7 +14,7 @@ Param(
   [string]$arch,
   [string]$subsetCategory,
   [string]$subset,
-  [string]$coreClrConfiguration,
+  [string]$runtimeConfiguration,
   [string]$librariesConfiguration,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -132,17 +132,18 @@ foreach ($argument in $PSBoundParameters.Keys)
 {
   switch($argument)
   {
-    "build"             { $arguments += " -build" }
-    "buildtests"        { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } }
-    "test"              { $arguments += " -test" }
-    "configuration"     { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
+    "build"                { $arguments += " -build" }
+    "buildtests"           { if ($build -eq $true) { $arguments += " /p:BuildTests=true" } else { $arguments += " -build /p:BuildTests=only" } }
+    "test"                 { $arguments += " -test" }
+    "configuration"        { $configuration = (Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])); $arguments += " /p:ConfigurationGroup=$configuration -configuration $configuration" }
+    "runtimeConfiguration" { $arguments += " /p:RuntimeConfiguration=$((Get-Culture).TextInfo.ToTitleCase($($PSBoundParameters[$argument])))" }
     # This should be removed after we have finalized our ci build pipeline.
-    "framework"         { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}}
-    "os"                { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
-    "allconfigurations" { $arguments += " /p:BuildAllConfigurations=true" }
-    "arch"              { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
-    "properties"        { $arguments += " " + $properties }
-    default             { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" }
+    "framework"            { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netcoreapp') { $arguments += " /p:TargetGroup=netcoreapp5.0" } else { if ($PSBoundParameters[$argument].ToLowerInvariant() -eq 'netfx') { $arguments += " /p:TargetGroup=net472" } else { $arguments += " /p:TargetGroup=$($PSBoundParameters[$argument].ToLowerInvariant())"}}}
+    "os"                   { $arguments += " /p:OSGroup=$($PSBoundParameters[$argument])" }
+    "allconfigurations"    { $arguments += " /p:BuildAllConfigurations=true" }
+    "arch"                 { $arguments += " /p:ArchGroup=$($PSBoundParameters[$argument]) /p:TargetArchitecture=$($PSBoundParameters[$argument])" }
+    "properties"           { $arguments += " " + $properties }
+    default                { $arguments += " /p:$argument=$($PSBoundParameters[$argument])" }
   }
 }
 
diff --git a/eng/build.sh b/eng/build.sh
index 5ef5560..337c2ef 100755
--- a/eng/build.sh
+++ b/eng/build.sh
@@ -125,8 +125,9 @@ while [[ $# > 0 ]]; do
       arguments="$arguments /p:BuildNativeStripSymbols=true"
       shift 1
       ;;
-     -coreclrconfiguration)
-      arguments="$arguments /p:CoreCLRConfiguration=$2"
+     -runtimeconfiguration)
+      val="$(tr '[:lower:]' '[:upper:]' <<< ${2:0:1})${2:1}"
+      arguments="$arguments /p:RuntimeConfiguration=$val"
       shift 2
       ;;
      -librariesconfiguration)
diff --git a/eng/docker/build-docker-sdk.ps1 b/eng/docker/build-docker-sdk.ps1
index 546545d..76c1ce7 100755
--- a/eng/docker/build-docker-sdk.ps1
+++ b/eng/docker/build-docker-sdk.ps1
@@ -19,7 +19,7 @@ if ($buildWindowsContainers)
   # Build on the host machine, then simply copy artifacts to the target docker image.
   # This should result in significantly lower build times, for now.
   & "$REPO_ROOT_DIR/coreclr.cmd" -c Release
-  & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration /p:CoreCLRConfiguration=Release
+  & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration -runtimeConfiguration release
   
   # Dockerize the build artifacts
   docker build --tag $imageName `
diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile
index 6ac7c85..efba4fb 100644
--- a/eng/docker/libraries-sdk.linux.Dockerfile
+++ b/eng/docker/libraries-sdk.linux.Dockerfile
@@ -9,7 +9,7 @@ COPY . .
 
 ARG CONFIGURATION=Release
 RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \
-    ./libraries.sh -c $CONFIGURATION /p:CoreCLRConfiguration=Release
+    ./libraries.sh -c $CONFIGURATION -runtimeconfiguration release
 
 FROM $SDK_BASE_IMAGE as target
 
diff --git a/eng/install-native-dependencies.sh b/eng/install-native-dependencies.sh
index aca0e61..7184822 100644
--- a/eng/install-native-dependencies.sh
+++ b/eng/install-native-dependencies.sh
@@ -5,7 +5,7 @@ if [ "$1" = "Linux" ]; then
     if [ "$?" != "0" ]; then
        exit 1;
     fi
-    sudo apt install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev libkrb5-dev libnuma-dev
+    sudo apt install cmake llvm-3.9 clang-3.9 lldb-3.9 liblldb-3.9-dev libunwind8 libunwind8-dev gettext libicu-dev liblttng-ust-dev libcurl4-openssl-dev libssl-dev libkrb5-dev libnuma-dev autoconf automake libtool build-essential
     if [ "$?" != "0" ]; then
         exit 1;
     fi
@@ -14,7 +14,7 @@ elif [ "$1" = "OSX" ]; then
     if [ "$?" != "0" ]; then
         exit 1;
     fi
-    brew install icu4c openssl
+    brew install icu4c openssl autoconf automake libtool pkg-config python3
     if [ "$?" != "0" ]; then
         exit 1;
     fi
diff --git a/eng/liveBuilds.targets b/eng/liveBuilds.targets
index f754c16..a63c178 100644
--- a/eng/liveBuilds.targets
+++ b/eng/liveBuilds.targets
@@ -17,6 +17,10 @@
     <MonoArtifactsPath Condition="'$(MonoOverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(MonoOverridePath)'))</MonoArtifactsPath>
     <LibrariesArtifactsPath Condition="'$(LibrariesOverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(LibrariesOverridePath)'))</LibrariesArtifactsPath>
     <LibrariesAllConfigurationsArtifactsPath Condition="'$(LibrariesAllConfigurationsOverridePath)' != ''">$([MSBuild]::NormalizeDirectory('$(LibrariesAllConfigurationsOverridePath)'))</LibrariesAllConfigurationsArtifactsPath>
+
+    <!-- Honor the RuntimeArtifactsPath property. -->
+    <CoreCLRArtifactsPath Condition="'$(CoreCLRArtifactsPath)' == ''">$(RuntimeArtifactsPath)</CoreCLRArtifactsPath>
+    <MonoArtifactsPath Condition="'$(MonoArtifactsPath)' == ''">$(RuntimeArtifactsPath)</MonoArtifactsPath>
   </PropertyGroup>
 
   <!--
diff --git a/eng/pipelines/common/build-coreclr-and-libraries-job.yml b/eng/pipelines/common/build-coreclr-and-libraries-job.yml
index 8eb2cdd..03b1997 100644
--- a/eng/pipelines/common/build-coreclr-and-libraries-job.yml
+++ b/eng/pipelines/common/build-coreclr-and-libraries-job.yml
@@ -48,4 +48,4 @@ jobs:
     stagedBuild: ${{ parameters.stagedBuild }}
     variables: ${{ parameters.variables }}
     pool: ${{ parameters.pool }}
-    liveCoreClrBuildConfig: ${{ parameters.buildConfig }}
+    liveRuntimeBuildConfig: ${{ parameters.buildConfig }}
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml
index 9f1987d..82dc4d0 100644
--- a/eng/pipelines/common/global-build-job.yml
+++ b/eng/pipelines/common/global-build-job.yml
@@ -25,7 +25,7 @@ jobs:
     - ${{ if eq(parameters.osGroup, 'OSX') }}:
       - script: |
           $(setScriptToEchoAndFailOnNonZero) 
-          brew install pkgconfig icu4c openssl
+          brew install pkgconfig icu4c openssl autoconf automake libtool pkg-config python3
           brew link --force icu4c
           ln -s /usr/local/opt/openssl/lib/pkgconfig/libcrypto.pc /usr/local/lib/pkgconfig/
           ln -s /usr/local/opt/openssl/lib/pkgconfig/libssl.pc /usr/local/lib/pkgconfig/
diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml
index 784b287..46eef08 100644
--- a/eng/pipelines/common/platform-matrix.yml
+++ b/eng/pipelines/common/platform-matrix.yml
@@ -1,4 +1,5 @@
 parameters:
+  runtimeFlavor: 'coreclr'
   jobTemplate: ''
   buildConfig: ''
   platforms: []
@@ -37,9 +38,10 @@ jobs:
       archType: arm
       platform: Linux_arm
       container:
-        image: ubuntu-16.04-cross-14.04-23cacb0-20191023143847
+        image: ubuntu-16.04-cross-14.04-23cacb0-20200121150126
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -60,9 +62,10 @@ jobs:
       archType: arm64
       platform: Linux_arm64
       container:
-        image: ubuntu-16.04-cross-arm64-cfdd435-20191023143847
+        image: ubuntu-16.04-cross-arm64-cfdd435-20200121150126
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -84,9 +87,14 @@ jobs:
       archType: x64
       platform: Linux_musl_x64
       container:
-        image: alpine-3.9-WithNode-0fc54a3-20190918214015
+        # alpine coreclr cmake errors on newer builds
+        ${{ if eq(parameters.runtimeFlavor, 'mono') }}:
+          image: alpine-3.9-WithNode-0fc54a3-20200121145958
+        ${{ if ne(parameters.runtimeFlavor, 'mono') }}:
+          image: alpine-3.9-WithNode-0fc54a3-20190918214015
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -111,9 +119,10 @@ jobs:
       archType: arm64
       platform: Linux_musl_arm64
       container:
-        image: ubuntu-16.04-cross-arm64-alpine-406629a-20191023143847
+        image: ubuntu-16.04-cross-arm64-alpine-406629a-20200121150126
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -134,9 +143,10 @@ jobs:
       archType: x64
       platform: Linux_x64
       container:
-        image: centos-7-f39df28-20191023143754
+        image: centos-7-bfcd90a-20200121150017
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -159,9 +169,10 @@ jobs:
       archType: wasm
       platform: WebAssembly_wasm
       container:
-        image: ubuntu-16.04-a50a721-20191023143845
+        image: ubuntu-16.04-bfcd90a-20200121150106
         registry: mcr
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -179,6 +190,7 @@ jobs:
 #     osGroup: FreeBSD
 #     archType: x64
 #     jobParameters:
+#       runtimeFlavor: ${{ parameters.runtimeFlavor }}
 #       buildConfig: ${{ parameters.buildConfig }}
 #       # There are no FreeBSD helix queues, so we don't run tests at the moment.
 #       helixQueues:
@@ -197,6 +209,7 @@ jobs:
       archType: x64
       platform: OSX_x64
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -216,6 +229,7 @@ jobs:
       archType: x64
       platform: Windows_NT_x64
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -235,6 +249,7 @@ jobs:
       archType: x86
       platform: Windows_NT_x86
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -253,6 +268,7 @@ jobs:
       archType: arm
       platform: Windows_NT_arm
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
@@ -272,6 +288,7 @@ jobs:
       archType: arm64
       platform: Windows_NT_arm64
       jobParameters:
+        runtimeFlavor: ${{ parameters.runtimeFlavor }}
         stagedBuild: ${{ parameters.stagedBuild }}
         buildConfig: ${{ parameters.buildConfig }}
         ${{ if eq(parameters.passPlatforms, true) }}:
diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml
index 61896ff..57cde8c 100644
--- a/eng/pipelines/common/xplat-setup.yml
+++ b/eng/pipelines/common/xplat-setup.yml
@@ -50,6 +50,13 @@ jobs:
         - name: ROOTFS_DIR
           value: ${{ parameters.jobParameters.crossrootfsDir }}
 
+      - ${{ if ne(parameters.jobParameters.runtimeFlavor, '') }}:
+        - name: runtimeFlavorName
+          ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
+            value: Mono
+          ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}:
+            value: CoreCLR
+
     osGroup: ${{ parameters.osGroup }}
     osSubgroup: ${{ parameters.osSubgroup }}
     archType: ${{ parameters.archType }}
diff --git a/eng/pipelines/coreclr/ci.yml b/eng/pipelines/coreclr/ci.yml
index 32d8047..b74dc36 100644
--- a/eng/pipelines/coreclr/ci.yml
+++ b/eng/pipelines/coreclr/ci.yml
@@ -86,7 +86,7 @@ jobs:
     platformGroup: all
     jobParameters:
       isOfficialBuild: false
-      liveCoreClrBuildConfig: checked
+      liveRuntimeBuildConfig: checked
 
 #
 # Checked test builds
diff --git a/eng/pipelines/coreclr/templates/xplat-job.yml b/eng/pipelines/coreclr/templates/xplat-job.yml
index 1d4adc0..ffa0cf3 100644
--- a/eng/pipelines/coreclr/templates/xplat-job.yml
+++ b/eng/pipelines/coreclr/templates/xplat-job.yml
@@ -41,7 +41,7 @@ jobs:
 
     # Send telemetry for all builds
     enableTelemetry: true
-    helixRepo: 'dotnet/coreclr'
+    helixRepo: 'dotnet/runtime'
     helixType: ${{ parameters.helixType }}
 
     enableMicrobuild: ${{ parameters.enableMicrobuild }}
@@ -98,13 +98,13 @@ jobs:
 
     - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - name: _HelixSource
-        value: official/dotnet/coreclr/$(Build.SourceBranch)
+        value: official/dotnet/runtime/$(Build.SourceBranch)
     - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
       - name: _HelixSource
-        value: pr/dotnet/coreclr/$(Build.SourceBranch)
+        value: pr/dotnet/runtime/$(Build.SourceBranch)
     - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
       - name: _HelixSource
-        value: ci/dotnet/coreclr/$(Build.SourceBranch)
+        value: ci/dotnet/runtime/$(Build.SourceBranch)
 
     - ${{ if ne(parameters.crossrootfsDir, '') }}:
       - name: crossArg
diff --git a/eng/pipelines/installer/installer-matrix.yml b/eng/pipelines/installer/installer-matrix.yml
index 131ad24..bb5e6e4 100644
--- a/eng/pipelines/installer/installer-matrix.yml
+++ b/eng/pipelines/installer/installer-matrix.yml
@@ -1,4 +1,5 @@
 parameters:
+  runtimeFlavor: 'coreclr'
   platforms: []
   jobParameters: []
   buildConfig: Release
@@ -14,5 +15,6 @@ jobs:
     buildConfig: ${{ parameters.buildConfig }}
     platforms: ${{ parameters.platforms }}
     passPlatforms: true
+    runtimeFlavor: ${{ parameters.runtimeFlavor }}
     jobParameters:
       ${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index bdd5680..385762a 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -32,8 +32,9 @@ parameters:
   useOfficialAllConfigurations: false
   buildFullPlatformManifest: false
 
-  liveCoreClrBuildConfig: ''
+  liveRuntimeBuildConfig: ''
   liveLibrariesBuildConfig: ''
+  runtimeFlavor: 'coreclr'
   platforms: []
 
 jobs:
@@ -232,12 +233,12 @@ jobs:
 
   - name: LiveOverridePathArgs
     value: >-
-      $(CoreCLRArtifactsArgs)
+      $(RuntimeArtifactsArgs)
       $(LibrariesConfigurationArg)
       $(LibrariesAllConfigurationsOverridePathArg)
       $(AllArtifactsArgs)
 
-  - name: CoreCLRArtifactsArgs
+  - name: RuntimeArtifactsArgs
     value: ''
   - name: LibrariesConfigurationArg
     value: ''
@@ -246,7 +247,7 @@ jobs:
   - name: AllArtifactsArgs
     value: ''
 
-  - name: CoreClrDownloadPath
+  - name: RuntimeDownloadPath
     value: ''
   - name: LibrariesDownloadPath
     value: ''
@@ -255,21 +256,21 @@ jobs:
   - name: AllArtifactsDownloadPath
     value: ''
 
-  - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
-    - name: liveCoreClrLegName
+  - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+    - name: liveRuntimeLegName
       value: ${{ format('{0}{1}_{2}_{3}',
         parameters.osGroup,
         parameters.osSubgroup,
         parameters.archType,
-        parameters.liveCoreClrBuildConfig) }}
-    - name: CoreClrDownloadPath
-      value: 'artifacts/transport/coreclr'
-    - name: CoreCLRArtifactsArgs
+        parameters.liveRuntimeBuildConfig) }}
+    - name: RuntimeDownloadPath
+      value: 'artifacts/transport/${{ parameters.runtimeFlavor }}'
+    - name: RuntimeArtifactsArgs
       value: >-
-        /p:CoreCLROverridePath=${{ parameters.buildCommandSourcesDirectory }}$(CoreClrDownloadPath)
-        /p:CoreCLRConfiguration=${{ parameters.liveCoreClrBuildConfig }}
-    - name: CoreClrArtifactName
-      value: CoreCLRProduct_$(liveCoreClrLegName)
+        /p:RuntimeArtifactsPath=$(buildCommandSourcesDirectory)$(RuntimeDownloadPath)
+        /p:RuntimeConfiguration=${{ parameters.liveRuntimeBuildConfig }}
+    - name: RuntimeArtifactName
+      value: $(runtimeFlavorName)Product_$(liveRuntimeLegName)
 
   - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
     - name: liveLibrariesLegName
@@ -307,12 +308,13 @@ jobs:
   dependsOn:
   - checkout
   - ${{ parameters.dependsOn }}
-  - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
-    - coreclr_product_build_${{ format('{0}{1}_{2}_{3}',
+  - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+    - ${{ format('{0}_product_build_{1}{2}_{3}_{4}',
+        parameters.runtimeFlavor,
         parameters.osGroup,
         parameters.osSubgroup,
         parameters.archType,
-        parameters.liveCoreClrBuildConfig) }}
+        parameters.liveRuntimeBuildConfig) }}
   - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
     - libraries_build_netcoreapp_${{ format('{0}{1}_{2}_{3}',
         parameters.osGroup,
@@ -323,7 +325,7 @@ jobs:
     - libraries_build_allconfigurations_Windows_NT_x64_Release
   - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
     - ${{ each platform in parameters.platforms }}:
-      - coreclr_product_build_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}
+      - ${{ parameters.runtimeFlavor }}_product_build_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}
       - libraries_build_netcoreapp_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}
 
   steps:
@@ -371,17 +373,17 @@ jobs:
       downloadType: specific
       downloadPath: '$(Build.SourcesDirectory)/__download__/AllPlatforms/'
       itemPattern: |
-        CoreCLRProduct_*/**
+        $(runtimeFlavorName)Product_*/**
         libraries_bin_*/**
 
   - ${{ if eq(parameters.buildFullPlatformManifest, true) }}:
     - ${{ each platform in parameters.platforms }}:
       - task: ExtractFiles@1
-        displayName: 'Unzip CoreCLR artifacts: ${{ platform }}'
+        displayName: 'Unzip $(runtimeFlavorName) artifacts: ${{ platform }}'
         inputs:
           archiveFilePatterns: |
-            $(Build.SourcesDirectory)/__download__/AllPlatforms/CoreCLRProduct_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}.*
-          destinationFolder: $(AllArtifactsDownloadPath)/CoreCLRProduct_${{ platform }}_${{ parameters.liveCoreClrBuildConfig }}/
+            $(Build.SourcesDirectory)/__download__/AllPlatforms/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}.*
+          destinationFolder: $(AllArtifactsDownloadPath)/$(runtimeFlavorName)Product_${{ platform }}_${{ parameters.liveRuntimeBuildConfig }}/
           cleanUnpackFolder: false
       - task: ExtractFiles@1
         displayName: 'Unzip Libraries artifacts: ${{ platform }}'
@@ -391,13 +393,13 @@ jobs:
           destinationFolder: $(AllArtifactsDownloadPath)/libraries_bin_${{ platform }}_${{ parameters.liveLibrariesBuildConfig }}/
           cleanUnpackFolder: false
 
-  - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
+  - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
     - template: /eng/pipelines/common/download-artifact-step.yml
       parameters:
-        unpackFolder: $(Build.SourcesDirectory)/$(CoreClrDownloadPath)
-        artifactFileName: '$(CoreClrArtifactName)$(archiveExtension)'
-        artifactName: '$(CoreClrArtifactName)'
-        displayName: 'CoreCLR artifacts'
+        unpackFolder: $(Build.SourcesDirectory)/$(RuntimeDownloadPath)
+        artifactFileName: '$(RuntimeArtifactName)$(archiveExtension)'
+        artifactName: '$(RuntimeArtifactName)'
+        displayName: '$(runtimeFlavorName) artifacts'
 
   - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
     - template: /eng/pipelines/common/download-artifact-step.yml
diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml
index c6c2081..e9ac1f4 100644
--- a/eng/pipelines/libraries/base-job.yml
+++ b/eng/pipelines/libraries/base-job.yml
@@ -6,7 +6,8 @@ parameters:
   framework: ''
   isOfficialBuild: false
   isOfficialAllConfigurations: false
-  liveCoreClrBuildConfig: ''
+  liveRuntimeBuildConfig: ''
+  runtimeFlavor: 'coreclr'
   timeoutInMinutes: 150
   condition: true
   container: ''
@@ -71,21 +72,21 @@ jobs:
         - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
           - _msbuildCommonParameters: /p:OfficialBuildId=$(Build.BuildNumber)
 
-        - _coreClrArtifactName: ''
-        - _coreClrDownloadPath: ''
-        - _coreClrArtifactsPathArg: ''
+        - _runtimeArtifactName: ''
+        - _runtimeDownloadPath: ''
+        - _runtimeArtifactsPathArg: ''
 
-        - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
-          - _coreClrDownloadPath: '$(Build.SourcesDirectory)/artifacts/transport/coreclr'
-          - _coreClrArtifactName: 'CoreCLRProduct_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveCoreClrBuildConfig }}'
+        - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+          - _runtimeDownloadPath: '$(Build.SourcesDirectory)/artifacts/transport/${{ parameters.runtimeFlavor }}'
+          - _runtimeArtifactName: '$(runtimeFlavorName)Product_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.liveRuntimeBuildConfig }}'
           - ${{ if ne(parameters.container, '') }}:
-            - _coreClrArtifactsPathArg: '/p:CoreCLRArtifactsPath=${_CORECLRDOWNLOADPATH}'
+            - _runtimeArtifactsPathArg: '/p:RuntimeArtifactsPath=${_RUNTIMEDOWNLOADPATH}'
           - ${{ if eq(parameters.container, '') }}:
-            - _coreClrArtifactsPathArg: ' /p:CoreCLRArtifactsPath=$(_coreClrDownloadPath)'
+            - _runtimeArtifactsPathArg: ' /p:RuntimeArtifactsPath=$(_runtimeDownloadPath)'
 
           # WebAssembly uses linux implementation detail
           - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
-            - _coreClrArtifactName: 'CoreCLRProduct_Linux_x64_${{ parameters.liveCoreClrBuildConfig }}'
+            - _runtimeArtifactName: '$(runtimeFlavorName)Product_Linux_x64_${{ parameters.liveRuntimeBuildConfig }}'
 
         # Windows variables
         - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
@@ -97,7 +98,7 @@ jobs:
           - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
             - _stripSymbolsArg: -stripSymbols
 
-        - _buildArguments: -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_stripSymbolsArg) $(_testScopeArg) $(_warnAsErrorArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_coreClrArtifactsPathArg)
+        - _buildArguments: -configuration ${{ parameters.buildConfig }} -ci -arch ${{ parameters.archType }} $(_finalFrameworkArg) $(_stripSymbolsArg) $(_testScopeArg) $(_warnAsErrorArg) $(_runtimeOSArg) $(_msbuildCommonParameters) $(_runtimeArtifactsPathArg)
         - ${{ parameters.variables }}
 
       dependsOn:
@@ -112,12 +113,12 @@ jobs:
       steps:
       - template: /eng/pipelines/common/clone-checkout-bundle-step.yml
 
-      - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
+      - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
         - template: /eng/pipelines/common/download-artifact-step.yml
           parameters:
-            unpackFolder: $(_coreClrDownloadPath)
-            artifactFileName: '$(_coreClrArtifactName)$(archiveExtension)'
-            artifactName: '$(_coreClrArtifactName)'
-            displayName: 'CoreCLR build drop'
+            unpackFolder: $(_runtimeDownloadPath)
+            artifactFileName: '$(_runtimeArtifactName)$(archiveExtension)'
+            artifactName: '$(_runtimeArtifactName)'
+            displayName: '$(runtimeFlavorName) build drop'
 
       - ${{ parameters.steps }}
diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml
index 01a4594..0e3e3b8 100644
--- a/eng/pipelines/libraries/build-job.yml
+++ b/eng/pipelines/libraries/build-job.yml
@@ -7,12 +7,13 @@ parameters:
   isOfficialBuild: false
   isOfficialAllConfigurations: false
 
-  # When set to a non-empty value (Debug / Release), it determines CoreCLR
+  # 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
-  # property implies a dependency of this job on the appropriate CoreCLR build
+  # property implies a dependency of this job on the appropriate runtime build
   # and is used to construct the name of the Azure artifact representing
-  # CoreCLR build to use for building the libraries and library tests.
-  liveCoreClrBuildConfig: ''
+  # runtime build to use for building the libraries and library tests.
+  liveRuntimeBuildConfig: ''
+  runtimeFlavor: 'coreclr'
 
   timeoutInMinutes: 150
   preBuildSteps: []
@@ -33,7 +34,7 @@ jobs:
       framework:  ${{ parameters.framework }}
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
       isOfficialAllConfigurations: ${{ parameters.isOfficialAllConfigurations }}
-      liveCoreClrBuildConfig: ${{ parameters.liveCoreClrBuildConfig }}
+      liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       preBuildSteps: ${{ parameters.preBuildSteps }}
       container: ${{ parameters.container }}
@@ -43,12 +44,12 @@ jobs:
       name: build
       displayName: 'Build'
 
-      ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
+      ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
         dependsOn:
         - ${{ if ne(parameters.osGroup, 'WebAssembly') }}:
-          - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveCoreClrBuildConfig) }}
+          - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
         - ${{ if eq(parameters.osGroup, 'WebAssembly') }}:
-          - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', 'linux', parameters.osSubgroup, 'x64', parameters.liveCoreClrBuildConfig) }}
+          - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, 'linux', parameters.osSubgroup, 'x64', parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - _skipTestRestoreArg: /p:SkipTestRestore=true
@@ -80,7 +81,7 @@ jobs:
 
         - ${{ if eq(parameters.osGroup, 'OSX') }}:
           - script: |
-              brew install pkgconfig icu4c openssl
+              brew install pkgconfig icu4c openssl autoconf automake libtool pkg-config python3
               brew link --force icu4c
               ln -s /usr/local/opt/openssl/lib/pkgconfig/libcrypto.pc /usr/local/lib/pkgconfig/
               ln -s /usr/local/opt/openssl/lib/pkgconfig/libssl.pc /usr/local/lib/pkgconfig/
diff --git a/eng/pipelines/libraries/build-test-job.yml b/eng/pipelines/libraries/build-test-job.yml
index 813db15..b122fa3 100644
--- a/eng/pipelines/libraries/build-test-job.yml
+++ b/eng/pipelines/libraries/build-test-job.yml
@@ -5,7 +5,7 @@ parameters:
   archType: ''
   framework: netcoreapp
   isOfficialBuild: false
-  liveCoreClrBuildConfig: ''
+  liveRuntimeBuildConfig: ''
   timeoutInMinutes: 150
   container: ''
   publishTestArtifacs: true
@@ -25,7 +25,7 @@ jobs:
       framework:  ${{ parameters.framework }}
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
       condition: ${{ parameters.condition }}
-      liveCoreClrBuildConfig: ${{ parameters.liveCoreClrBuildConfig }}
+      liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       container: ${{ parameters.container }}
       pool: ${{ parameters.pool }}
diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml
index 52f8bde..e2bde7b 100644
--- a/eng/pipelines/libraries/helix.yml
+++ b/eng/pipelines/libraries/helix.yml
@@ -1,4 +1,5 @@
 parameters:
+  runtimeFlavor: ''
   archGroup: ''
   configuration: ''
   creator: ''
@@ -14,6 +15,7 @@ steps:
   - script: ${{ parameters.msbuildScript }}
             $(Build.SourcesDirectory)/src/libraries/sendtohelix.proj
             /t:test
+            /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
             /p:ArchGroup=${{ parameters.archGroup }}
             /p:ConfigurationGroup=${{ parameters.configuration }}
             /p:OSGroup=${{ parameters.targetOS }}
diff --git a/eng/pipelines/libraries/outerloop.yml b/eng/pipelines/libraries/outerloop.yml
index ded8246..5edc57a 100644
--- a/eng/pipelines/libraries/outerloop.yml
+++ b/eng/pipelines/libraries/outerloop.yml
@@ -64,7 +64,7 @@ jobs:
         framework: netcoreapp
         runTests: true
         testScope: outerloop
-        liveCoreClrBuildConfig: release
+        liveRuntimeBuildConfig: release
   
   - ${{ if eq(variables['isFullMatrix'], false) }}:
     - template: /eng/pipelines/common/platform-matrix.yml
@@ -86,7 +86,7 @@ jobs:
           framework: netcoreapp
           runTests: true
           testScope: outerloop
-          liveCoreClrBuildConfig: release
+          liveRuntimeBuildConfig: release
 
   - ${{ if eq(variables['includeWindowsOuterloop'], true) }}:
     - template: /eng/pipelines/common/platform-matrix.yml
diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml
index fc05a88..1f2de2a 100644
--- a/eng/pipelines/libraries/run-test-job.yml
+++ b/eng/pipelines/libraries/run-test-job.yml
@@ -5,7 +5,8 @@ parameters:
   archType: ''
   framework: netcoreapp
   isOfficialBuild: false
-  liveCoreClrBuildConfig: ''
+  liveRuntimeBuildConfig: ''
+  runtimeFlavor: 'coreclr'
   timeoutInMinutes: 150
   pool: ''
   testScope: ''
@@ -24,31 +25,32 @@ jobs:
       archType:  ${{ parameters.archType }}
       framework:  ${{ parameters.framework }}
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
-      liveCoreClrBuildConfig: ${{ parameters.liveCoreClrBuildConfig }}
+      liveRuntimeBuildConfig: ${{ parameters.liveRuntimeBuildConfig }}
+      runtimeFlavor: ${{ parameters.runtimeFlavor }}
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       container: '' # we just send to helix, no need to use a container.
       condition: ${{ parameters.condition }}
       pool: ${{ parameters.pool }}
-      ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
-        displayName: ${{ format('Test Run {0} CoreCLR', parameters.liveCoreClrBuildConfig) }}
-        name: ${{ format('test_run_{0}_coreclr', parameters.liveCoreClrBuildConfig) }}
-      ${{ if eq(parameters.liveCoreClrBuildConfig, '') }}:
+      ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+        displayName: ${{ format('Test Run {0} {1}', parameters.liveRuntimeBuildConfig, parameters.runtimeFlavor) }}
+        name: ${{ format('test_run_{0}_{1}', parameters.liveRuntimeBuildConfig, parameters.runtimeFlavor) }}
+      ${{ if eq(parameters.liveRuntimeBuildConfig, '') }}:
         displayName: 'Test Run'
         name: test_run
 
       dependsOn:
       - ${{ 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.liveCoreClrBuildConfig, '') }}:
-        - ${{ format('coreclr_product_build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveCoreClrBuildConfig) }}
+      - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+        - ${{ format('{0}_product_build_{1}{2}_{3}_{4}', parameters.runtimeFlavor, parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveRuntimeBuildConfig) }}
 
       variables:
         - librariesTestsArtifactName: ${{ format('libraries_test_assets_{0}_{1}_{2}', parameters.osGroup, parameters.dependsOnTestArchitecture, parameters.dependsOnTestBuildConfiguration) }}
         - _archiveTestsParameter: /p:ArchiveTests=true
         - _skipTestRestoreArg: /p:SkipTestRestore=false
         - _testRunNamePrefixSuffix: ''
-        - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
-          - _testRunNamePrefixSuffix: CoreCLR_${{ parameters.liveCoreClrBuildConfig }}
+        - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
+          - _testRunNamePrefixSuffix: $(runtimeFlavorName)_${{ parameters.liveRuntimeBuildConfig }}
         - ${{ parameters.variables }}
 
       steps:
@@ -68,16 +70,18 @@ jobs:
             artifactName: $(librariesTestsArtifactName)
             artifactFileName: $(librariesTestsArtifactName)$(archiveExtension)
 
-        - ${{ if ne(parameters.liveCoreClrBuildConfig, '') }}:
+        - ${{ if ne(parameters.liveRuntimeBuildConfig, '') }}:
           - script: $(_msbuildCommand) src/libraries/restore/runtime/runtime.depproj 
-                    $(_coreClrArtifactsPathArg)
+                    $(_runtimeArtifactsPathArg)
                     $(_runtimeOSArg)
+                    /p:RuntimeFlavor=${{ parameters.runtimeFlavor }}
                     /p:ArchGroup=${{ parameters.archType }}
                     /p:ConfigurationGroup=${{ parameters.buildConfig }}
-            displayName: Override CoreCLR from live drop
+            displayName: Override $(runtimeFlavorName) from live drop
 
         - template: /eng/pipelines/libraries/helix.yml
           parameters:
+            runtimeFlavor: ${{ parameters.runtimeFlavor }}
             targetOS: ${{ parameters.osGroup }}
             archGroup: ${{ parameters.archType }}
             configuration: ${{ parameters.buildConfig }}
diff --git a/eng/pipelines/mono/templates/build-job.yml b/eng/pipelines/mono/templates/build-job.yml
new file mode 100644
index 0000000..903fc23
--- /dev/null
+++ b/eng/pipelines/mono/templates/build-job.yml
@@ -0,0 +1,88 @@
+parameters:
+  buildConfig: ''
+  archType: ''
+  osGroup: ''
+  osSubgroup: ''
+  platform: ''
+  container: ''
+  timeoutInMinutes: ''
+  stagedBuild: false
+  variables: {}
+  pool: ''
+  condition: true
+
+### Product build
+jobs:
+- template: xplat-pipeline-job.yml
+  parameters:
+    buildConfig: ${{ parameters.buildConfig }}
+    _BuildConfig: ${{ parameters.buildConfig }}
+    archType: ${{ parameters.archType }}
+    osGroup: ${{ parameters.osGroup }}
+    osSubgroup: ${{ parameters.osSubgroup }}
+    helixType: 'build/product/'
+    enableMicrobuild: true
+    stagedBuild: ${{ parameters.stagedBuild }}
+    pool: ${{ parameters.pool }}
+    condition: ${{ parameters.condition }}
+
+    # Compute job name from template parameters
+    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) }}
+
+    # Run all steps in the container.
+    # Note that the containers are defined in platform-matrix.yml
+    container: ${{ parameters.container }}
+
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+
+    gatherAssetManifests: true
+    variables:
+    - name: osGroup
+      value: ${{ parameters.osGroup }}
+    - name: osSubgroup
+      value: ${{ parameters.osSubgroup }}
+
+    - ${{ parameters.variables }}
+
+    steps:
+
+    # Install native dependencies
+    # Linux builds use docker images with dependencies preinstalled,
+    # and FreeBSD builds use a build agent with dependencies
+    # preinstalled, so we only need this step for OSX and Windows.
+    - ${{ if eq(parameters.osGroup, 'OSX') }}:
+      - script: sh $(Build.SourcesDirectory)/eng/install-native-dependencies.sh $(osGroup)
+        displayName: Install native dependencies
+    - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+      # Necessary to install python
+      - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
+        displayName: Install native dependencies
+
+    # Build
+    - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
+      - script: ./mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
+        displayName: Build product
+    - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+      - script: mono$(scriptExt) -configuration $(buildConfig) -arch $(archType) -ci
+        displayName: Build product
+
+    # Publish product output directory for consumption by tests.
+    - template: /eng/pipelines/common/upload-artifact-step.yml
+      parameters:
+        rootFolder: $(buildProductRootFolderPath)
+        includeRootFolder: false
+        archiveType: $(archiveType)
+        tarCompression: $(tarCompression)
+        archiveExtension: $(archiveExtension)
+        artifactName: $(buildProductArtifactName)
+        displayName: 'product build'
+
+    # Publish Logs
+    - task: PublishBuildArtifacts@1
+      displayName: Publish Logs
+      inputs:
+        pathtoPublish: $(Build.SourcesDirectory)/artifacts/log
+        artifactName: 'BuildLogs_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+      continueOnError: true
+      condition: always()
diff --git a/eng/pipelines/mono/templates/xplat-job.yml b/eng/pipelines/mono/templates/xplat-job.yml
new file mode 100644
index 0000000..4ff0833
--- /dev/null
+++ b/eng/pipelines/mono/templates/xplat-job.yml
@@ -0,0 +1,111 @@
+parameters:
+  buildConfig: ''
+  archType: ''
+  osGroup: ''
+  osSubgroup: ''
+  name: ''
+  helixType: '(unspecified)'
+  container: ''
+  crossrootfsDir: ''
+  stagedBuild: false
+  strategy: ''
+  pool: ''
+
+  # arcade-specific parameters
+  condition: ''
+  continueOnError: false
+  dependsOn: ''
+  displayName: ''
+  timeoutInMinutes: ''
+  enableMicrobuild: ''
+  gatherAssetManifests: false
+
+  variables: {} ## any extra variables to add to the defaults defined below
+
+jobs:
+- template: /eng/common/templates/job/job.yml
+  parameters:
+
+    name: ${{ parameters.name }}
+    displayName: ${{ parameters.displayName }}
+    container: ${{ parameters.container }}
+    condition: ${{ parameters.condition }}
+    dependsOn:
+      - ${{ if ne(parameters.stagedBuild, true) }}:
+        - checkout
+      - ${{ if ne(parameters.dependsOn, '') }}:
+        - ${{ parameters.dependsOn }}
+
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    continueOnError: ${{ parameters.continueOnError }}
+
+    # Send telemetry for all builds
+    enableTelemetry: true
+    helixRepo: 'dotnet/runtime'
+    helixType: ${{ parameters.helixType }}
+
+    enableMicrobuild: ${{ parameters.enableMicrobuild }}
+    enablePublishUsingPipelines: true
+
+    strategy: ${{ parameters.strategy }}
+
+    pool: ${{ parameters.pool }}
+
+    workspace:
+      clean: all
+
+    ${{ if eq(parameters.osGroup, 'Linux') }}:
+      agentOs: Ubuntu
+    ${{ if eq(parameters.osGroup, 'FreeBSD') }}:
+      agentOs: FreeBSD
+    ${{ if eq(parameters.osGroup, 'OSX') }}:
+      agentOs: MacOS
+    ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
+      agentOs: Windows_NT
+
+    # Setting this results in the arcade job template including a step
+    # that gathers asset manifests and publishes them to pipeline
+    # storage. Only relevant for build jobs.
+    enablePublishBuildAssets: ${{ parameters.gatherAssetManifests }}
+
+    variables:
+    - name: buildConfig
+      value: ${{ parameters.buildConfig }}
+
+    - ${{ if eq(parameters.buildConfig, 'debug') }}:
+      - name: buildConfigUpper
+        value: 'Debug'
+
+    - ${{ if eq(parameters.buildConfig, 'release') }}:
+      - name: buildConfigUpper
+        value: 'Release'
+
+    - name: _BuildConfig
+      value: $(buildConfigUpper)
+
+    - name: archType
+      value: ${{ parameters.archType }}
+
+    - name: osGroup
+      value: ${{ parameters.osGroup }}
+
+    - name: osSubgroup
+      value: ${{ parameters.osSubgroup }}
+
+    - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+      - name: _HelixSource
+        value: official/dotnet/runtime/$(Build.SourceBranch)
+    - ${{ if and(eq(variables['System.TeamProject'], 'public'), eq(variables['Build.Reason'], 'PullRequest')) }}:
+      - name: _HelixSource
+        value: pr/dotnet/runtime/$(Build.SourceBranch)
+    - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
+      - name: _HelixSource
+        value: ci/dotnet/runtime/$(Build.SourceBranch)
+
+    - ${{ each variable in parameters.variables }}:
+      - ${{insert}}: ${{ variable }}
+
+    steps:
+    - template: /eng/pipelines/common/clone-checkout-bundle-step.yml
+
+    - ${{ parameters.steps }}
diff --git a/eng/pipelines/mono/templates/xplat-pipeline-job.yml b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
new file mode 100644
index 0000000..51190c2
--- /dev/null
+++ b/eng/pipelines/mono/templates/xplat-pipeline-job.yml
@@ -0,0 +1,67 @@
+parameters:
+  buildConfig: ''
+  archType: ''
+  osGroup: ''
+  osSubgroup: ''
+  name: ''
+  helixType: '(unspecified)'
+  container: ''
+  liveLibrariesBuildConfig: ''
+  stagedBuild: false
+  strategy: ''
+  pool: ''
+
+  # arcade-specific parameters
+  condition: true
+  continueOnError: false
+  dependsOn: ''
+  displayName: ''
+  timeoutInMinutes: ''
+  enableMicrobuild: ''
+  gatherAssetManifests: false
+
+  variables: {} ## any extra variables to add to the defaults defined below
+
+jobs:
+- template: xplat-job.yml
+  parameters:
+    buildConfig: ${{ parameters.buildConfig }}
+    archType: ${{ parameters.archType }}
+    osGroup: ${{ parameters.osGroup }}
+    osSubgroup: ${{ parameters.osSubgroup }}
+    name: ${{ parameters.name }}
+    helixType: ${{ parameters.helixType }}
+    container: ${{ parameters.container }}
+    stagedBuild: ${{ parameters.stagedBuild }}
+    strategy: ${{ parameters.strategy }}
+    pool: ${{ parameters.pool }}
+
+    # arcade-specific parameters
+    condition: and(succeeded(), ${{ parameters.condition }})
+    continueOnError: ${{ parameters.continueOnError }}
+    dependsOn: ${{ parameters.dependsOn }}
+    displayName: ${{ parameters.displayName }}
+    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
+    enableMicrobuild: ${{ parameters.enableMicrobuild }}
+    gatherAssetManifests: ${{ parameters.gatherAssetManifests }}
+
+    variables:
+    - name: buildProductArtifactName
+      value: 'MonoProduct_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+
+    - name: buildProductRootFolderPath
+      value: '$(Build.SourcesDirectory)/artifacts/bin/mono/$(osGroup).$(archType).$(buildConfigUpper)'
+
+    - librariesBuildArtifactName: ''
+    - librariesOverrideArg: ''
+    - librariesDownloadDir: ''
+
+    - ${{ if ne(parameters.liveLibrariesBuildConfig, '') }}:
+      - librariesBuildArtifactName: ${{ format('libraries_bin_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.liveLibrariesBuildConfig) }}
+      - librariesDownloadDir: $(Build.SourcesDirectory)/artifacts
+      - librariesOverrideArg: ' /p:LibrariesConfiguration=${{ parameters.liveLibrariesBuildConfig }}'
+
+    - ${{ each variable in parameters.variables }}:
+      - ${{insert}}: ${{ variable }}
+
+    steps: ${{ parameters.steps }}
diff --git a/eng/pipelines/runtime-official.yml b/eng/pipelines/runtime-official.yml
index f6b5ef8..20ac28bb 100644
--- a/eng/pipelines/runtime-official.yml
+++ b/eng/pipelines/runtime-official.yml
@@ -80,7 +80,7 @@ stages:
       - Windows_NT_arm64
       jobParameters:
         isOfficialBuild: ${{ variables.isOfficialBuild }}
-        liveCoreClrBuildConfig: release
+        liveRuntimeBuildConfig: release
 
   #
   # Build libraries AllConfigurations for packages
@@ -95,7 +95,7 @@ stages:
         framework: allConfigurations
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         isOfficialAllConfigurations: true
-        liveCoreClrBuildConfig: release
+        liveRuntimeBuildConfig: release
 
   #
   # Installer Build
@@ -103,7 +103,7 @@ stages:
   - template: /eng/pipelines/installer/installer-matrix.yml
     parameters:
       jobParameters:
-        liveCoreClrBuildConfig: release
+        liveRuntimeBuildConfig: release
         liveLibrariesBuildConfig: Release
         isOfficialBuild: ${{ variables.isOfficialBuild }}
         useOfficialAllConfigurations: true
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 8b9b344..63de290 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -64,8 +64,26 @@ jobs:
       - THIRD-PARTY-NOTICES.TXT
       - docs/*
       - src/installer/*
+      - src/mono/*
       - src/libraries/*
       - eng/pipelines/installer/*
+      - eng/pipelines/mono/*
+      - eng/pipelines/libraries/*
+    - subset: mono
+      include:
+      - src/libraries/System.Private.CoreLib/*
+      exclude:
+      - eng/Version.Details.xml
+      - '*.md'
+      - LICENSE.TXT
+      - PATENTS.TXT
+      - THIRD-PARTY-NOTICES.TXT
+      - docs/*
+      - src/installer/*
+      - src/coreclr/*
+      - src/libraries/*
+      - eng/pipelines/installer/*
+      - eng/pipelines/coreclr/*
       - eng/pipelines/libraries/*
     - subset: libraries
       exclude:
@@ -76,8 +94,10 @@ jobs:
       - THIRD-PARTY-NOTICES.TXT
       - docs/*
       - src/installer/*
+      - src/mono/*
       - src/coreclr/*
       - eng/pipelines/coreclr/*
+      - eng/pipelines/mono/*
       - eng/pipelines/installer/*
     - subset: installer
       include:
@@ -90,8 +110,10 @@ jobs:
       - THIRD-PARTY-NOTICES.TXT
       - docs/*
       - src/coreclr/*
+      - src/mono/*
       - src/libraries/*
       - eng/pipelines/coreclr/*
+      - eng/pipelines/mono/*
       - eng/pipelines/libraries/*
 
 #
@@ -138,7 +160,6 @@ jobs:
 
 #
 # Build CoreCLR release
-# Only when CoreCLR is changed
 # Always as they are needed by Installer and we always build and test the Installer.
 #
 - template: /eng/pipelines/common/platform-matrix.yml
@@ -176,6 +197,52 @@ jobs:
           eq(variables['isFullMatrix'], true))
 
 #
+# Build Mono debug
+# Only when Mono is changed
+#
+- 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:
+      condition: >-
+        or(
+          eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true),
+          eq(variables['isFullMatrix'], true))
+
+#
+# Build Mono 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
+
+#
 # Build libraries using live CoreLib
 # These set of libraries are built always no matter what changed
 # The reason for that is because Corelib and Installer needs it and
@@ -192,7 +259,7 @@ jobs:
     - Windows_NT_arm64
     - Windows_NT_x86
     jobParameters:
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
 
 - template: /eng/pipelines/common/platform-matrix.yml
   parameters:
@@ -205,7 +272,7 @@ jobs:
     - OSX_x64
     - Windows_NT_x64
     jobParameters:
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
 #
 # Libraries Build that only run when libraries is changed
 #
@@ -219,7 +286,7 @@ jobs:
       - Windows_NT_x86
     jobParameters:
       framework: netcoreapp
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -255,7 +322,7 @@ jobs:
       isFullMatrix: ${{ variables.isFullMatrix }}
       framework: allConfigurations
       runTests: true
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       condition: >-
         or(
           eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true),
@@ -276,7 +343,7 @@ jobs:
       - Windows_NT_arm
       - Windows_NT_arm64
     jobParameters:
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       liveLibrariesBuildConfig: Release
 
 - template: /eng/pipelines/installer/installer-matrix.yml
@@ -289,7 +356,7 @@ jobs:
       - Linux_musl_x64
       - Windows_NT_x64
     jobParameters:
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
 
 #
@@ -306,7 +373,7 @@ jobs:
     - Windows_NT_x64
     jobParameters:
       isOfficialBuild: false
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       testScope: innerloop
       condition: >- 
         or(
@@ -417,7 +484,29 @@ jobs:
           eq(variables['isFullMatrix'], true))
 
 #
-# Libraries Release Test Execution against a release runtime
+# Libraries Release Test Execution against a release mono runtime.
+#
+- template: /eng/pipelines/common/platform-matrix.yml
+  parameters:
+    jobTemplate: /eng/pipelines/libraries/run-test-job.yml
+    runtimeFlavor: mono
+    buildConfig: ${{ variables.debugOnPrReleaseOnRolling }}
+    platforms:
+    # - Windows_NT_x64
+    - OSX_x64
+    - Linux_x64
+    helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml
+    jobParameters:
+      isOfficialBuild: false
+      isFullMatrix: ${{ variables.isFullMatrix }}
+      framework: netcoreapp
+      testScope: innerloop
+      liveRuntimeBuildConfig: release
+      dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
+      dependsOnTestArchitecture: x64
+
+#
+# Libraries Release Test Execution against a release coreclr runtime
 # Only when the PR contains a libraries change
 #
 - template: /eng/pipelines/common/platform-matrix.yml
@@ -432,7 +521,7 @@ jobs:
       isFullMatrix: ${{ variables.isFullMatrix }}
       framework: netcoreapp
       testScope: innerloop
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
       condition: >-
@@ -441,7 +530,7 @@ jobs:
           eq(variables['isFullMatrix'], true))
 
 #
-# Libraries Debug Test Execution against a release runtime
+# Libraries Debug Test Execution against a release coreclr runtime
 # Only when the PR contains a libraries change
 #
 - template: /eng/pipelines/common/platform-matrix.yml
@@ -465,7 +554,7 @@ jobs:
       isFullMatrix: ${{ variables.isFullMatrix }}
       framework: netcoreapp
       testScope: innerloop
-      liveCoreClrBuildConfig: release
+      liveRuntimeBuildConfig: release
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
       condition: >-
@@ -489,7 +578,7 @@ jobs:
     jobParameters:
       framework: netcoreapp
       testScope: innerloop
-      liveCoreClrBuildConfig: checked
+      liveRuntimeBuildConfig: checked
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
       condition: >-
@@ -510,7 +599,7 @@ jobs:
     jobParameters:
       framework: netcoreapp
       testScope: innerloop
-      liveCoreClrBuildConfig: checked
+      liveRuntimeBuildConfig: checked
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
       condition: >-
@@ -533,7 +622,7 @@ jobs:
     jobParameters:
       framework: netcoreapp
       testScope: innerloop
-      liveCoreClrBuildConfig: checked
+      liveRuntimeBuildConfig: checked
       dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}
       dependsOnTestArchitecture: x64
       condition: >-
diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index d692ebb..f35845f 100644
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -17,7 +17,8 @@
     <RunScriptHost Condition="'$(TargetOS)' == 'Windows_NT'">$(RunScriptHostDir)dotnet.exe</RunScriptHost>
     <RunScriptHost Condition="'$(TargetOS)' != 'Windows_NT'">$(RunScriptHostDir)dotnet</RunScriptHost>
 
-    <MonoRspFile>$(RunWorkingDirectory)mono.issues.rsp</MonoRspFile>
+    <!-- TODO: remove rsp argument when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
+    <MonoRspFile>$(RunWorkingDirectory)$(MonoRspFileName)</MonoRspFile>
   </PropertyGroup>
 
   <!-- Archive test binaries. -->
@@ -76,17 +77,19 @@
     <Exec Condition="'$(TargetOS)' != 'Windows_NT'" Command="chmod +x $(RunScriptOutputPath)" />
 
     <!-- Generate Mono .rsp file -->
+    <!-- TODO: remove when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
     <ItemGroup>
-      <MonoRspFiles Include="$(MonoProjectRoot)netcore\CoreFX.issues.rsp" />
-      <MonoRspFiles Include="$(MonoProjectRoot)netcore\CoreFX.issues_mac.rsp" Condition="'$(TargetOS)' == 'OSX'" />
-      <MonoRspFiles Include="$(MonoProjectRoot)netcore\CoreFX.issues_linux.rsp" Condition="'$(TargetOS)' == 'Linux'" />
-      <MonoRspFiles Include="$(MonoProjectRoot)netcore\CoreFX.issues_windows.rsp" Condition="'$(TargetOS)' == 'Windows_NT'" />
+      <_rspFile Include="$(TestRspFile)" Condition="'$(TestRspFile)' != ''" />
+      <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues.rsp" />
+      <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_mac.rsp" Condition="'$(TargetOS)' == 'OSX'" />
+      <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_linux.rsp" Condition="'$(TargetOS)' == 'Linux'" />
+      <_rspFile Include="$(MonoProjectRoot)netcore\CoreFX.issues_windows.rsp" Condition="'$(TargetOS)' == 'Windows_NT'" />
     </ItemGroup>
     <ItemGroup>
-      <MonoRspFileContent Include="$([System.IO.File]::ReadAllText(%(MonoRspFiles.Identity)))" />
+      <_rspFileContent Include="$([System.IO.File]::ReadAllText(%(_rspFile.Identity)))" />
     </ItemGroup>
 
-    <WriteLinesToFile File="$(MonoRspFile)" Lines="@(MonoRspFileContent)" Overwrite="true" />
+    <WriteLinesToFile File="$(MonoRspFile)" Lines="@(_rspFileContent)" Overwrite="true" />
   </Target>
 
   <Target Name="ValidateTestPlatform">
@@ -115,8 +118,9 @@
 
     <PropertyGroup>
       <RunTestsCommand>"$(RunScriptOutputPath)" --runtime-path "$(TestHostRootPath.TrimEnd('\/'))"</RunTestsCommand>
-      <RunTestsCommand Condition="'$(TestRuntimeFlavor)' == 'Mono'">$(RunTestsCommand) --rsp-file "$(MonoRspFile)"</RunTestsCommand>
-      <RunTestsCommand Condition="'$(TestRspFile)' != ''">$(RunTestsCommand) --rsp-file "$(TestRspFile)"</RunTestsCommand>
+      <!-- TODO: remove rsp argument when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
+      <RunTestsCommand Condition="'$(RuntimeFlavor)' == 'Mono'">$(RunTestsCommand) --rsp-file "$(MonoRspFile)"</RunTestsCommand>
+      <RunTestsCommand Condition="'$(TestRspFile)' != '' and '$(RuntimeFlavor)' != 'Mono'">$(RunTestsCommand) --rsp-file "$(TestRspFile)"</RunTestsCommand>
     </PropertyGroup>
 
     <!-- Invoke the run script with the test host as the runtime path. -->
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index e0a2a43..37add71 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -300,6 +300,10 @@
     <ILLinkClearInitLocals Condition="'$(IsSourceProject)' == 'true' and '$(Language)' != 'VB'">true</ILLinkClearInitLocals>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MonoRspFileName>mono.issues.rsp</MonoRspFileName>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(BuildAllConfigurations)' != 'true'">
     <!-- We add extra binplacing for the test shared framework until we can get hardlinking with the runtime directory working on all platforms -->
     <BinPlaceTestSharedFramework Condition="'$(_bc_TargetGroup)' == '$(NetCoreAppCurrent)'">true</BinPlaceTestSharedFramework>
diff --git a/src/libraries/restore/runtime/runtime.depproj b/src/libraries/restore/runtime/runtime.depproj
index cda8a12..c286eb8 100644
--- a/src/libraries/restore/runtime/runtime.depproj
+++ b/src/libraries/restore/runtime/runtime.depproj
@@ -4,7 +4,7 @@
     <!-- We're using ToolRuntimeRID as a placeholder for the real corelib/runtime components until we have an actual set of runtime bits to consume for webassembly. -->
     <RuntimeIdentifier Condition="'$(RuntimeOS)' == 'webassembly'">$(ToolRuntimeRID)</RuntimeIdentifier>
     <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
-    <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' and ('$(ConfigurationGroup)' == 'Debug' or '$(Coverage)' == 'true') and '$(TestRuntimeFlavor)' != 'Mono'">true</SwapNativeForIL>
+    <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' and ('$(ConfigurationGroup)' == 'Debug' or '$(Coverage)' == 'true') and '$(RuntimeFlavor)' != 'Mono'">true</SwapNativeForIL>
     <CoreCLROSGroup Condition="'$(CoreCLROSGroup)' == ''">$(DefaultOSGroup)</CoreCLROSGroup>
     <CoreCLRConfiguration Condition="'$(CoreCLRConfiguration)' == ''">$(ConfigurationGroup)</CoreCLRConfiguration>
     <MonoOSGroup Condition="'$(MonoOSGroup)' == ''">$(DefaultOSGroup)</MonoOSGroup>
@@ -66,7 +66,7 @@
   <Target Name="OverrideRuntimeCoreCLR"
           DependsOnTargets="ResolveCoreCLRFilesFromLocalBuild"
           AfterTargets="AfterResolveReferences;FilterNugetPackages"
-          Condition="'$(TestRuntimeFlavor)' != 'Mono'">
+          Condition="'$(RuntimeFlavor)' != 'Mono'">
     <ItemGroup>
       <!-- CoreRun is not used for testing anymore, but we still use it for benchmarking and profiling -->
       <CoreCLRFiles Include="$(CoreCLRArtifactsPath)/corerun*" />
@@ -78,7 +78,7 @@
   <Target Name="OverrideRuntimeMono"
           DependsOnTargets="ResolveMonoFilesFromLocalBuild"
           AfterTargets="AfterResolveReferences;FilterNugetPackages"
-          Condition="'$(TestRuntimeFlavor)' == 'Mono'">
+          Condition="'$(RuntimeFlavor)' == 'Mono'">
     <ItemGroup>
       <ReferenceCopyLocalPaths Include="@(MonoFiles)" />
     </ItemGroup>
diff --git a/src/libraries/sendtohelix.proj b/src/libraries/sendtohelix.proj
index 746c65c..c3eb763 100644
--- a/src/libraries/sendtohelix.proj
+++ b/src/libraries/sendtohelix.proj
@@ -65,6 +65,8 @@
     -->
     <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD%</HelixCommand>
     <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD"</HelixCommand>
+    <!-- TODO: remove rsp argument when rsp files are removed: https://github.com/dotnet/runtime/issues/1980. -->
+    <HelixCommand Condition="'$(RuntimeFlavor)' == 'mono'">$(HelixCommand) --rsp-file "$(MonoRspFileName)"</HelixCommand>
   </PropertyGroup>
 
   <!--
diff --git a/src/mono/Directory.Build.props b/src/mono/Directory.Build.props
index 2e05f56..4ee0739 100644
--- a/src/mono/Directory.Build.props
+++ b/src/mono/Directory.Build.props
@@ -1,12 +1,69 @@
 <Project>
-
   <PropertyGroup>
     <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot>
   </PropertyGroup>
   <Import Project="..\..\Directory.Build.props" />
+  
+  <!-- Set default Configuration and Platform -->
+  <PropertyGroup>
+    <OSGroup Condition="'$(OSGroup)' == '' and '$([MSBuild]::IsOSPlatform(Windows))' == 'true'">Windows_NT</OSGroup>
+    <OSGroup Condition="'$(OSGroup)' == '' and '$([MSBuild]::IsOSPlatform(Linux))' == 'true'">Linux</OSGroup>
+    <OSGroup Condition="'$(OSGroup)' == '' and '$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</OSGroup>
+
+    <ArchGroup Condition="'$(ArchGroup)' == ''">x64</ArchGroup>
+    <Platform>$(ArchGroup)</Platform>
+
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+
+    <PlatformConfigPathPart>$(OSGroup).$(Platform).$(Configuration)</PlatformConfigPathPart>
+  </PropertyGroup>
+
+  <!-- Common properties -->
+  <PropertyGroup>
+    <ProjectDir>$(MSBuildThisFileDirectory)</ProjectDir>
+    <SourceDir>$(ProjectDir)src\</SourceDir>
+    <BinDir>$(ArtifactsBinDir)mono\$(PlatformConfigPathPart)\</BinDir>
+
+    <BaseIntermediateOutputPath>$(ArtifactsObjDir)mono\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Central place to set the versions of all nuget packages produced in the repo -->
+    <PackageVersion Condition="'$(PackageVersion)' == ''">5.0.0</PackageVersion>
+
+    <!-- Set the boolean below to true to generate packages with stabilized versions -->
+    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
+    <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
+
+    <PreReleaseLabel>preview8</PreReleaseLabel>
+  </PropertyGroup>
+
+  <!-- Set up common target properties that we use to conditionally include sources -->
+  <PropertyGroup>
+    <TargetsFreeBSD Condition="'$(OSGroup)' == 'FreeBSD'">true</TargetsFreeBSD>
+    <TargetsLinux Condition="'$(OSGroup)' == 'Linux'">true</TargetsLinux>
+    <TargetsNetBSD Condition="'$(OSGroup)' == 'NetBSD'">true</TargetsNetBSD>
+    <TargetsOSX Condition="'$(OSGroup)' == 'OSX'">true</TargetsOSX>
+    <TargetsWindows Condition="'$(OSGroup)' == 'Windows_NT'">true</TargetsWindows>
+    <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
+    <UseSharedCompilation>true</UseSharedCompilation>
+  </PropertyGroup>
+
+  <!-- Set the kind of PDB to Portable -->
+  <PropertyGroup>
+    <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType>
+  </PropertyGroup>
+
+  <!-- Output paths -->
+  <PropertyGroup>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+  </PropertyGroup>
 
   <!-- Ensure our properties are set before Arcade defines defaults -->
-  <Import Project="dir.common.props" />
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
   <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
diff --git a/src/mono/Directory.Build.targets b/src/mono/Directory.Build.targets
index 92465d4..da331b3 100644
--- a/src/mono/Directory.Build.targets
+++ b/src/mono/Directory.Build.targets
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Import Project="..\..\Directory.Build.targets" />
 
diff --git a/src/mono/configure.ac b/src/mono/configure.ac
index 86993d8..7a038f5 100644
--- a/src/mono/configure.ac
+++ b/src/mono/configure.ac
@@ -5024,21 +5024,23 @@ case "$host" in
         SQLITE3="libsqlite3.so"
 	;;
     *-*-*linux*)
-	AC_PATH_X
-	dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
-	AC_MSG_CHECKING(for the soname of libX11.so)
-	for i in $x_libraries $dlsearch_path; do
-		for r in 4 5 6; do
-			if test -f $i/libX11.so.$r; then
-				X11=libX11.so.$r
-				AC_MSG_RESULT($X11)
-			fi
+	if test "x$with_core" != "xonly"; then
+		AC_PATH_X
+		dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
+		AC_MSG_CHECKING(for the soname of libX11.so)
+		for i in $x_libraries $dlsearch_path; do
+			for r in 4 5 6; do
+				if test -f $i/libX11.so.$r; then
+					X11=libX11.so.$r
+					AC_MSG_RESULT($X11)
+				fi
+			done
 		done
-	done
-	
-	if test "x$X11" = "xlibX11.so"; then
-		AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]);
-		X11=libX11.so.6
+		
+		if test "x$X11" = "xlibX11.so"; then
+			AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]);
+			X11=libX11.so.6
+		fi
 	fi
 	;;
 esac
diff --git a/src/mono/dir.common.props b/src/mono/dir.common.props
deleted file mode 100644
index 00282d2..0000000
--- a/src/mono/dir.common.props
+++ /dev/null
@@ -1,102 +0,0 @@
-<Project>
-
-  <!-- Set default Configuration and Platform -->
-  <PropertyGroup>
-    <BuildArch>$(__BuildArch)</BuildArch>
-    <BuildArch Condition="'$(__BuildArch)'==''">x64</BuildArch>
-    <BuildArch Condition="'$(__BuildArch)' == 'amd64'">x64</BuildArch>
-
-    <BuildType>$(__BuildType)</BuildType>
-    <BuildType Condition="'$(__BuildType)'==''">Debug</BuildType>
-    <BuildType Condition="'$(__BuildType)' == 'debug'">Debug</BuildType>
-    <BuildType Condition="'$(__BuildType)' == 'release'">Release</BuildType>
-    <BuildType Condition="'$(__BuildType)' == 'checked'">Checked</BuildType>
-
-    <BuildOS>$(__BuildOS)</BuildOS>
-    <BuildOS Condition="'$(__BuildOS)' == '' And '$([MSBuild]::IsOSPlatform(Windows))' == 'true'">Windows_NT</BuildOS>
-    <BuildOS Condition="'$(__BuildOS)' == '' And '$([MSBuild]::IsOSPlatform(Linux))' == 'true'">Linux</BuildOS>
-    <BuildOS Condition="'$(__BuildOS)' == '' And '$([MSBuild]::IsOSPlatform(OSX))' == 'true'">OSX</BuildOS>
-
-    <!-- TODO: converge on one property for BuildOS and __BuildOS (and similar), and remove these extra lines. -->
-    <__BuildOS>$(BuildOS)</__BuildOS>
-    <__BuildArch>$(BuildArch)</__BuildArch>
-
-    <Configuration Condition="'$(Configuration)' == ''">$(BuildType)</Configuration>
-    <Platform Condition="'$(Platform)' == ''">$(BuildArch)</Platform>
-
-    <PlatformConfigPathPart>$(BuildOS).$(BuildArch).$(BuildType)</PlatformConfigPathPart>
-
-  </PropertyGroup>
-
-  <!-- Common properties -->
-  <PropertyGroup>
-
-    <__ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</__ProjectDir>
-    <ProjectDir>$(__ProjectDir)\</ProjectDir>
-    <RootRepoDir>$(ProjectDir)\..\..\</RootRepoDir>
-    <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)</ProjectDir>
-
-    <BaseIntermediateOutputPath>$(RootRepoDir)artifacts\obj\mono\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-
-    <SourceDir>$(__SourceDir)\</SourceDir>
-    <SourceDir Condition="'$(__SourceDir)'==''">$(ProjectDir)src\</SourceDir>
-
-    <RootBinDir>$(__RootBinDir)\</RootBinDir>
-    <RootBinDir Condition="'$(__RootBinDir)'==''">$(RootRepoDir)artifacts\</RootBinDir>
-
-    <BinDir>$(__BinDir)\</BinDir>
-    <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)bin\mono\$(PlatformConfigPathPart)\</BinDir>
-
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- Central place to set the versions of all nuget packages produced in the repo -->
-    <PackageVersion Condition="'$(PackageVersion)' == ''">5.0.0</PackageVersion>
-
-    <!-- Set the boolean below to true to generate packages with stabilized versions -->
-    <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
-    <StableVersion Condition="'$(StabilizePackageVersion)' == 'true' and '$(StableVersion)' == ''">$(PackageVersion)</StableVersion>
-
-    <PreReleaseLabel>preview8</PreReleaseLabel>
-  </PropertyGroup>
-
-  <!-- Set up common target properties that we use to conditionally include sources -->
-  <PropertyGroup>
-    <TargetsFreeBSD Condition="'$(BuildOS)' == 'FreeBSD'">true</TargetsFreeBSD>
-    <TargetsLinux Condition="'$(BuildOS)' == 'Linux'">true</TargetsLinux>
-    <TargetsNetBSD Condition="'$(BuildOS)' == 'NetBSD'">true</TargetsNetBSD>
-    <TargetsOSX Condition="'$(BuildOS)' == 'OSX'">true</TargetsOSX>
-    <TargetsWindows Condition="'$(BuildOS)' == 'Windows_NT'">true</TargetsWindows>
-
-    <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsNetBSD)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix>
-
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <LangVersion>8.0</LangVersion>
-    <UseSharedCompilation>true</UseSharedCompilation>
-  </PropertyGroup>
-
-  <!-- Set the kind of PDB to Portable -->
-  <PropertyGroup>
-    <DebugType Condition="'$(DebugType)' == ''">Portable</DebugType>
-  </PropertyGroup>
-
-  <!-- Common properties -->
-  <PropertyGroup>
-
-    <!-- Default to portable build if not explicitly set -->
-    <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
-
-    <!-- If true, indicates that this is not an officially supported release -->
-    <!-- It is important to flip this to false in official release branches -->
-    <!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
-    <IsPrerelease>true</IsPrerelease>
-  </PropertyGroup>
-
-  <!-- Output paths -->
-  <PropertyGroup>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/mono/mono.proj b/src/mono/mono.proj
index e384211..3b7451d 100644
--- a/src/mono/mono.proj
+++ b/src/mono/mono.proj
@@ -20,7 +20,7 @@
     </PropertyGroup>
     <PropertyGroup>
         <_MonoConfigureParams Condition="$(MonoEnableLLVM) == true">$(_MonoConfigureParams) --enable--llvm </_MonoConfigureParams>
-        <_MonoConfigureParams>$(_MonoConfigureParams) --with-core=only CFLAGS="$(_MonoExtraCFLAGS)" CXXFLAGS="$(_MonoExtraCXXFLAGS)"</_MonoConfigureParams>
+        <_MonoConfigureParams>$(_MonoConfigureParams) --with-core=only CC=clang CXX=clang++ CFLAGS="$(_MonoExtraCFLAGS)" CXXFLAGS="$(_MonoExtraCXXFLAGS)"</_MonoConfigureParams>
     </PropertyGroup>
 
     <Message Text="Configuring Mono with '$(_MonoConfigureParams)'" Importance="High" />
@@ -39,19 +39,22 @@
     <PropertyGroup>
         <_MonoBuildParams>/p:MONO_BUILD_DIR_PREFIX=&quot;&quot;$(MonoObjDir)&quot;&quot; /p:MONO_ENABLE_NETCORE=true /p:CL_MPCount=8 /v:minimal</_MonoBuildParams>
         <_MonoBuildParams Condition="$(MonoEnableLLVM) == true">/p:MONO_ENABLE_LLVM=true $(_MonoBuildParams)</_MonoBuildParams>
+        <_MonoBuildPlatform Condition="'$(Platform)' == 'x64'">x64</_MonoBuildPlatform>
+        <_MonoBuildPlatform Condition="'$(Platform)' == 'x86'">win32</_MonoBuildPlatform>
     </PropertyGroup>
-    <Exec Command="msvc\run-msbuild.bat build $(Platform) $(Configuration) sgen &quot;$(_MonoBuildParams)&quot; msvc\mono-netcore.sln" IgnoreStandardErrorWarningFormat="true" />
+    <Exec Command="msvc\run-msbuild.bat build $(_MonoBuildPlatform) $(Configuration) sgen &quot;$(_MonoBuildParams)&quot; msvc\mono-netcore.sln" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
   <!-- General targets -->
   <Target Name="Build" DependsOnTargets="BuildMonoRuntimeUnix;BuildMonoRuntimeWindows">
     <PropertyGroup>
-      <_MonoRuntimeFilePath Condition="'$(BuildOS)' == 'Windows_NT'">$(MonoObjDir)$(Platform)\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
-      <_MonoRuntimeFilePath Condition="'$(BuildOS)' == 'OSX'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib</_MonoRuntimeFilePath>
+      <_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x64'">$(MonoObjDir)x64\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
+      <_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x86'">$(MonoObjDir)Win32\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath>
+      <_MonoRuntimeFilePath Condition="'$(TargetsOSX)' == 'true'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib</_MonoRuntimeFilePath>
       <_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.so</_MonoRuntimeFilePath>
 
-      <_CoreClrFileName Condition="'$(BuildOS)' == 'Windows_NT'">coreclr.dll</_CoreClrFileName>
-      <_CoreClrFileName Condition="'$(BuildOS)' == 'OSX'">libcoreclr.dylib</_CoreClrFileName>
+      <_CoreClrFileName Condition="'$(TargetsWindows)' == 'true'">coreclr.dll</_CoreClrFileName>
+      <_CoreClrFileName Condition="'$(TargetsOSX)' == 'true'">libcoreclr.dylib</_CoreClrFileName>
       <_CoreClrFileName Condition="'$(_CoreClrFileName)' == ''">libcoreclr.so</_CoreClrFileName>
     </PropertyGroup>
 
diff --git a/src/mono/msvc/Directory.Build.props b/src/mono/msvc/Directory.Build.props
new file mode 100644
index 0000000..4de865b
--- /dev/null
+++ b/src/mono/msvc/Directory.Build.props
@@ -0,0 +1,3 @@
+<Project>
+  <!-- Ignore Directory.Build.props from root for msvc build -->
+</Project>
diff --git a/src/mono/msvc/Directory.Build.targets b/src/mono/msvc/Directory.Build.targets
new file mode 100644
index 0000000..c43cec2
--- /dev/null
+++ b/src/mono/msvc/Directory.Build.targets
@@ -0,0 +1,3 @@
+<Project>
+  <!-- Ignore Directory.Build.targets from root for msvc build -->
+</Project>
diff --git a/src/mono/netcore/CoreFX.issues.rsp b/src/mono/netcore/CoreFX.issues.rsp
index 57fca81..3c05a6a 100644
--- a/src/mono/netcore/CoreFX.issues.rsp
+++ b/src/mono/netcore/CoreFX.issues.rsp
@@ -27,6 +27,13 @@
 -nomethod System.Collections.Specialized.Tests.NameValueCollectionCtorTests.Ctor_NegativeCapacity_ThrowsArgumentOutOfRangeException
 
 ####################################################################
+##  System.Collections.Concurrent.Tests
+####################################################################
+
+# fails only with release mono
+-nomethod System.Collections.Concurrent.Tests.ConcurrentQueueTests.ReferenceTypes_NulledAfterDequeue
+
+####################################################################
 ##  System.Diagnostics.Tracing.Tests
 ####################################################################
 
@@ -353,6 +360,9 @@
 -nomethod System.Reflection.Tests.AssemblyTests.LoadFile_PartiallyQualifiedPath_ThrowsArgumentException
 -nomethod System.Reflection.Tests.AssemblyTests.LoadFile_NoSuchPath_ThrowsFileNotFoundException
 
+# fails on Helix
+-nomethod System.Reflection.Tests.AssemblyTests.LoadFromStream_Location_IsEmpty
+
 ####################################################################
 ##  System.Runtime.InteropServices.Tests
 ####################################################################
@@ -800,6 +810,15 @@
 -nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromNativeImagePath_PartiallyQualifiedPath_ThrowsArgumentException
 -nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromNativeImagePath_PartiallyQualifiedPath_ThrowsArgumentException2
 
+# fails
+-nomethod System.Runtime.Loader.Tests.DefaultLoadContextTests.LoadNonExistentInDefaultContext
+-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.GetLoadContextTest_ValidUserAssembly
+-nomethod System.Runtime.Loader.Tests.DefaultLoadContextTests.LoadInDefaultContext
+-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromAssemblyName_AssemblyNotFound
+-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadAssemblyByPath_ValidUserAssembly
+-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadAssemblyByStream_ValidUserAssembly
+-nomethod System.Runtime.Loader.Tests.AssemblyLoadContextTest.LoadFromAssemblyName_ValidTrustedPlatformAssembly
+
 ####################################################################
 ##  System.Reflection.MetadataLoadContext.Tests
 ####################################################################
@@ -832,6 +851,13 @@
 -nomethod System.Net.Http.Tests.Utf8StringContentTests.*
 
 ####################################################################
+##  System.Text.RegularExpressions.Tests
+####################################################################
+
+# hits OOM
+-nomethod System.Text.RegularExpressions.Tests.RegexMatchTests.Match_Timeout_Loop_Throws
+
+####################################################################
 ##  System.ComponentModel.Composition.Registration.Tests
 ####################################################################
 
diff --git a/src/mono/netcore/CoreFX.issues_linux.rsp b/src/mono/netcore/CoreFX.issues_linux.rsp
index b442e54..5cd79c5 100644
--- a/src/mono/netcore/CoreFX.issues_linux.rsp
+++ b/src/mono/netcore/CoreFX.issues_linux.rsp
@@ -37,3 +37,13 @@
 
 # https://github.com/mono/mono/issues/18067 LLVM: try-catch doesn't catch an exception
 -nomethod System.Reflection.Tests.BindingFlagsDoNotWrapTests.*
+
+# fail on Helix on RedHat systems because libgdiplus can't be loaded
+-nomethod System.Runtime.Serialization.Formatters.Tests.BinaryFormatterTests.RoundtripManyObjectsInOneStream
+-nomethod System.Runtime.Serialization.Formatters.Tests.BinaryFormatterTests.ValidateBasicObjectsRoundtrip
+-nomethod System.Resources.Tests.ResourceManagerTests.GetObject_Images
+-nomethod System.Resources.Tests.ResourceManagerTests.GetObject_Images_ResourceSet
+-nomethod System.Resources.Tests.ResourceManagerTests.GetResourceSet_Images
+-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.BinaryFormattedResources
+-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.StreamResources
+-nomethod System.Resources.Extensions.Tests.PreserializedResourceWriterTests.BinaryFormattedResourcesWithoutTypeName
diff --git a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
index d9a33a7..97c177b 100644
--- a/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/mono/netcore/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -33,9 +33,6 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">$(BuildType)</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">$(BuildArch)</Platform>
-    <Platform Condition=" '$(Platform)' == 'armel' ">arm</Platform>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <!-- This prevents the default MsBuild targets from referencing System.Core.dll -->
     <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
diff --git a/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs b/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs
index 40bf279..bc13dd6 100644
--- a/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs
+++ b/src/mono/netcore/System.Private.CoreLib/src/System/Runtime/InteropServices/Marshal.Mono.cs
@@ -153,7 +153,7 @@ namespace System.Runtime.InteropServices
 				return new System.NotFiniteNumberException ();
 			case HResults.COR_E_NOTSUPPORTED:
 				return new System.NotSupportedException ();
-			case HResults.COR_E_NULLREFERENCE:
+			case HResults.E_POINTER:
 				return new System.NullReferenceException ();
 			case HResults.COR_E_OBJECTDISPOSED:
 				return new System.ObjectDisposedException ("");
@@ -220,16 +220,16 @@ namespace System.Runtime.InteropServices
 			case HResults.COR_E_AMBIGUOUSIMPLEMENTATION:
 			case HResults.COR_E_CANNOTUNLOADAPPDOMAIN:
 			case HResults.COR_E_CONTEXTMARSHAL:
-			case HResults.COR_E_HOSTPROTECTION:
+			//case HResults.COR_E_HOSTPROTECTION:
 			case HResults.COR_E_INSUFFICIENTMEMORY:
 			case HResults.COR_E_INVALIDCOMOBJECT:
 			case HResults.COR_E_KEYNOTFOUND:
 			case HResults.COR_E_MISSINGSATELLITEASSEMBLY:
 			case HResults.COR_E_SAFEARRAYRANKMISMATCH:
 			case HResults.COR_E_SAFEARRAYTYPEMISMATCH:
-			case HResults.COR_E_SAFEHANDLEMISSINGATTRIBUTE:
-			case HResults.COR_E_SEMAPHOREFULL:
-			case HResults.COR_E_THREADSTOP:
+			//case HResults.COR_E_SAFEHANDLEMISSINGATTRIBUTE:
+			//case HResults.COR_E_SEMAPHOREFULL:
+			//case HResults.COR_E_THREADSTOP:
 			case HResults.COR_E_TIMEOUT:
 			case HResults.COR_E_WAITHANDLECANNOTBEOPENED:
 			case HResults.DISP_E_OVERFLOW:
diff --git a/src/mono/netcore/nuget/Directory.Build.props b/src/mono/netcore/nuget/Directory.Build.props
index a4160fb..56e8310 100644
--- a/src/mono/netcore/nuget/Directory.Build.props
+++ b/src/mono/netcore/nuget/Directory.Build.props
@@ -14,16 +14,12 @@
 
     <!-- Distro rid is passed as runtimeos-arch-->
     <_parseDistroRid>$(__DistroRid)</_parseDistroRid>
-    <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.12-x64</_parseDistroRid>
+    <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(TargetsOSX)' == 'true'">osx.10.12-x64</_parseDistroRid>
     <_distroRidIndex>$(_parseDistroRid.IndexOfAny("-"))</_distroRidIndex>
     <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1))</_archRidIndex>
     <OSRid Condition="'$(OSRid)' == '' and '$(_distroRidIndex)' != '-1'">$(_parseDistroRid.SubString(0, $(_distroRidIndex)))</OSRid>
     <OSRid Condition="'$(OSRid)' == ''">win10</OSRid>
 
-    <ArchGroup Condition="'$(ArchGroup)' == '' and '$(_archRidIndex)' != '0'">$(_parseDistroRid.SubString($(_archRidIndex)))</ArchGroup>
-    <ArchGroup Condition="'$(ArchGroup)' == '' and '$(Platform)' != ''">$(Platform)</ArchGroup>
-    <ArchGroup Condition="'$(ArchGroup)' == ''">$(BuildArch)</ArchGroup>
-
     <RuntimeOS Condition="'$(RuntimeOS)' == ''">$(OSRid)</RuntimeOS>
 
     <SupportedPackageOSGroups Condition="'$(SupportedPackageOSGroups)' == ''">Windows_NT;OSX;Android;Linux;FreeBSD</SupportedPackageOSGroups>
@@ -43,7 +39,7 @@
     <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'osx'">OSX</_derivedPackageTargetOSGroup>
     <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'android'">Android</_derivedPackageTargetOSGroup>
     <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(_runtimeOSFamily)' == 'win'">Windows_NT</_derivedPackageTargetOSGroup>
-    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(__BuildOS)' != ''">$(__BuildOS)</_derivedPackageTargetOSGroup>
+    <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == '' and '$(OSGroup)' != ''">$(OSGroup)</_derivedPackageTargetOSGroup>
     <_derivedPackageTargetOSGroup Condition="'$(_derivedPackageTargetOSGroup)' == ''">Linux</_derivedPackageTargetOSGroup>
 
     <_isSupportedOSGroup Condition="!$(SupportedPackageOSGroups.Contains(';$(_derivedPackageTargetOSGroup);'))">false</_isSupportedOSGroup>
diff --git a/src/mono/netcore/nuget/builds.targets b/src/mono/netcore/nuget/builds.targets
index d58f010..6aa99f6 100644
--- a/src/mono/netcore/nuget/builds.targets
+++ b/src/mono/netcore/nuget/builds.targets
@@ -9,7 +9,7 @@
     <BuildingAnOfficialBuildLeg Condition="'$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
 
     <!-- During an official build, only build identity packages on windows x64 legs -->
-    <BuildIdentityPackage Condition="'$(BuildingAnOfficialBuildLeg)' == 'true' AND ('$(OS)' != 'Windows_NT' OR '$(BuildArch)' != 'x64')">false</BuildIdentityPackage>
+    <BuildIdentityPackage Condition="'$(BuildingAnOfficialBuildLeg)' == 'true' AND ('$(OS)' != 'Windows_NT' OR '$(Platform)' != 'x64')">false</BuildIdentityPackage>
   </PropertyGroup>
 
   <Target Name="FilterProjects" BeforeTargets="Build">