diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index da0865b..254b294 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -12,34 +12,7 @@ env:
   productNamespacePrefix: "Citrus.Avalonia"
 
 jobs:
-  linux-build:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Install .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.x
-
-    - name: NBGV
-      id: nbgv
-      uses: dotnet/nbgv@master
-      with:
-        setAllVars: true
-
-    - name: NuGet Restore
-      run: dotnet restore
-      working-directory: src
-
-    - name: Build
-      run: dotnet msbuild /t:build,pack /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }}
-      working-directory: src
-
-  windows-build:
+  build:
     runs-on: windows-latest
     outputs:
       nbgv: ${{ steps.nbgv.outputs.SemVer2 }}
@@ -48,11 +21,12 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+        submodules: 'recursive'
 
     - name: Install .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: 5.0.100-rc.2.20479.15
 
     - name: NBGV
       id: nbgv
@@ -68,7 +42,7 @@ jobs:
       uses: microsoft/setup-msbuild@v1
 
     - name: Build
-      run: msbuild /t:build,pack /maxcpucount /p:NoPackageAnalysis=true /verbosity:minimal /p:Configuration=${{ env.configuration }}
+      run: dotnet build --configuration ${{ env.configuration }}
       working-directory: src
 
     - name: Create NuGet Artifacts
@@ -79,7 +53,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: windows-build
+    needs: build
     if: contains(github.event.pull_request.labels.*.name, 'release') && github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
     steps:
     - name: Checkout