From 5a374e75c9322770fb4928c07efdb15bb8d203da Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sun, 4 Sep 2022 22:21:50 -0700
Subject: [PATCH] chore: Updates workflow to fix Fedora 35/36 (#1161)

---
 .github/workflows/build-test.yml | 30 +++++++++++++++++++++++++++++-
 azure-pipelines.yml              |  8 +-------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 898aba93c..729e0bcfc 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -7,7 +7,7 @@ on:
     branches: [main]
 
 jobs:
-  build:
+  build-macos:
     runs-on: ${{ matrix.os }}
     name: Build (${{ matrix.name }})
     strategy:
@@ -31,3 +31,31 @@ jobs:
       run: ./publish.cmd
     - name: Test
       run: dotnet test --no-restore
+
+  build-linux:
+    runs-on: ubuntu-latest
+    container: ${{ matrix.container }}
+    name: Build (${{ matrix.name }})
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - container: fedora:35
+            name: Fedora 35
+          - container: fedora:36
+            name: Fedora 36
+
+    steps:
+      - name: Install Prerequisites
+        run: dnf makecache --refresh && dnf install -y findutils libicu
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
+      - name: Setup .NET 6
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.400
+      - name: Build
+        run: ./publish.cmd
+      - name: Test
+        run: dotnet test --no-restore
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 476a53911..fa6c77244 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -9,7 +9,7 @@ variables:
 
 jobs:
 - job: BuildWindows
-  displayName: 'Windows Server 2019'
+  displayName: 'Windows Server 2022'
   pool:
     vmImage: 'windows-latest'
 
@@ -40,12 +40,6 @@ jobs:
       'Ubuntu 20':
         containerImage: mcr.microsoft.com/dotnet/sdk:6.0-focal
         os: ubuntu.20.04
-      'Fedora 35':
-        containerImage: fedora:35
-        os: fedora.35
-      'Fedora 36':
-        containerImage: fedora:36
-        os: fedora.36
 
   displayName: Linux