Enable Mono build in CI

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>
     <!--

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.

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`

docs/workflow/testing/mono/testing.md

@@ -6,20 +6,20 @@ 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`)
 
 3. Run the tests
 
 ```
-dotnet msbuild /t:BuildAndTest /p:TestRuntimeFlavor=mono
+dotnet msbuild /t:BuildAndTest /p:RuntimeFlavor=mono
 ```

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>

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])" }
   }
 }
 

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)

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 `

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
 

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

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>
 
   <!--

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 }}

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/

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) }}:

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 }}

eng/pipelines/coreclr/ci.yml

@@ -86,7 +86,7 @@ jobs:
     platformGroup: all
     jobParameters:
       isOfficialBuild: false
-      liveCoreClrBuildConfig: checked
+      liveRuntimeBuildConfig: checked
 
 #
 # Checked test builds