diff --git a/.github/workflows/build-on-pr.yml b/.github/workflows/build-on-pr.yml
index 1495b9ab..4a1b160b 100644
--- a/.github/workflows/build-on-pr.yml
+++ b/.github/workflows/build-on-pr.yml
@@ -15,16 +15,15 @@ jobs:
       - name: System Info
         run: systeminfo
 
-      - uses: actions/checkout@v2
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
 
       - name: Build
         run: ./build.cmd DotnetBuild
         env:
-          # Work around https://github.com/actions/setup-dotnet/issues/29
-          DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64
           CI: true
 
   linux-build:
@@ -34,18 +33,17 @@ jobs:
       - name: System Info
         run: lscpu
 
-      - uses: actions/checkout@v1
-
-      - name: Setup .NET Core
-        uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v3
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v3
+        with:
+          global-json-file: global.json
 
       - name: Build
         run: |
           chmod +x ./build.sh
           ./build.sh DotnetBuild
         env:
-          # Work around https://github.com/actions/setup-dotnet/issues/29
-          DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64
           CI: true
 
   linux-test-self-hosted:
@@ -55,7 +53,7 @@ jobs:
       - name: System Info
         run: lscpu
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v3
 
       - name: OpenCL Info
         run: clinfo
@@ -65,6 +63,4 @@ jobs:
           chmod +x ./build.sh
           ./build.sh
         env:
-          # Work around https://github.com/actions/setup-dotnet/issues/29
-          DOTNET_ROOT: ${{ runner.tool_cache }}/dncs/${{ matrix.dotnet }}/x64
           CI: true