From 3ccc284e69345bd29f8fe11474801045b3114c20 Mon Sep 17 00:00:00 2001
From: Joey Robichaud <jorobich@microsoft.com>
Date: Sun, 20 Mar 2022 15:14:12 -0700
Subject: [PATCH] Run OmniSharpMSBuild.Tests on Mono in CI

---
 .github/workflows/tests-net6.yml |  2 +-
 .github/workflows/tests.yml      | 72 ++++----------------------------
 2 files changed, 10 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/tests-net6.yml b/.github/workflows/tests-net6.yml
index c9d66b10ad..d77576b6fc 100644
--- a/.github/workflows/tests-net6.yml
+++ b/.github/workflows/tests-net6.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, windows-2022, macos-11]
         testProjects:
           - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3db16ef715..77bc274575 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,11 +25,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # TODO: mono 6.12 is installed on ubuntu and macos images, but ships with MSBuild 16.6.
-        # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
         os: [ubuntu-20.04, windows-2022, macos-11]
         testProjects:
-          - OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
+          - OmniSharp.MSBuild.Tests,OmniSharp.Roslyn.CSharp.Tests,OmniSharp.Cake.Tests,OmniSharp.Script.Tests,OmniSharp.Stdio.Tests,OmniSharp.Http.Tests,OmniSharp.Tests,OmniSharp.Lsp.Tests
           - OmniSharp.DotNetTest.Tests
     name: 'Test'
     steps:
@@ -39,6 +37,14 @@ jobs:
           clean: 'false'
           fetch-depth: '0'
 
+      # TODO: Need to figure out the correct way to install mono on linux / mac
+      # Currently the latest image has mono 6.12
+      # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu1804-README.md
+      # - name: 🔨 Use Mono ${{ env.MonoVersion }} SDK
+      #   uses: maxim-lobanov/setup-xamarin@v1
+      #   with:
+      #     mono-version: ${{ env.MonoVersion }}
+
       - name: Setup NuGet.exe
         uses: nuget/setup-nuget@v1
         with:
@@ -102,63 +108,3 @@ jobs:
         with:
           name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
           path: '${{ env.Artifacts }}/logs/'
-
-  test-msbuild:
-    # Limit the .NET Framework OmniSharp.MSBuild.Tests to the Windows Platform,
-    # since we have access to a MSBuild newer than version 16.6.
-    runs-on: windows-2022
-    strategy:
-      fail-fast: false
-      matrix:
-        testProjects:
-          - OmniSharp.MSBuild.Tests
-    name: 'Test'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          clean: 'false'
-          fetch-depth: '0'
-
-      - name: Setup NuGet.exe
-        uses: nuget/setup-nuget@v1
-        with:
-          nuget-version: ${{ env.NuGetVersion }}
-
-      - name: 🔨 Use .NET Core ${{ env.DotNetVersion2 }} SDK
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: ${{ env.DotNetVersion2 }}
-
-      - name: 🔨 Use .NET Core ${{ env.DotNetVersion }} SDK
-        uses: actions/setup-dotnet@v1.7.2
-        with:
-          dotnet-version: ${{ env.DotNetVersion }}
-
-      - name: 🎁 dotnet tool restore
-        run: |
-          dotnet tool restore
-
-      - name: 🎁 nuget install
-        run: |
-          nuget install tools/packages.config -ExcludeVersion -OutputDirectory tools
-
-      - name: 🍰 Run Cake
-        uses: nick-invision/retry@v2
-        with:
-          shell: powershell
-          timeout_minutes: 40
-          max_attempts: 3
-          retry_on: error
-          command: |
-            .\build.ps1 -configuration Release -verbosity Verbose -target Test --test-project="$ENV:TEST_PROJECT"
-        env:
-          TEST_PROJECT: ${{ matrix.testProjects }}
-
-      - name: ⬆ Publish Logs
-        uses: actions/upload-artifact@v2
-        continue-on-error: true
-        if: ${{ always() }}
-        with:
-          name: 'logs - ${{ github.workflow }} ${{ matrix.os }}'
-          path: '${{ env.Artifacts }}/logs/'