diff --git a/build/pr-code-cleanup.yml b/build/pr-code-cleanup.yml
index bdcd232b72..da9f751916 100644
--- a/build/pr-code-cleanup.yml
+++ b/build/pr-code-cleanup.yml
@@ -49,7 +49,11 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        dotnet tool restore
+        # Workaround for bug in .NET 8 RC2 at https://github.com/dotnet/sdk/issues/35989
+        $tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
+        foreach ($tool in $tools.tools.PsObject.Properties) {
+            & dotnet tool install $tool.Name --version $tool.Value.version
+        }
   - task: PowerShell@2
     displayName: Restore packages
     inputs:
diff --git a/build/verify-code-style.yml b/build/verify-code-style.yml
index f210799be4..07d29e5612 100644
--- a/build/verify-code-style.yml
+++ b/build/verify-code-style.yml
@@ -36,7 +36,11 @@ jobs:
     inputs:
       targetType: 'inline'
       script: |
-        dotnet tool restore
+        # Workaround for bug in .NET 8 RC2 at https://github.com/dotnet/sdk/issues/35989
+        $tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
+        foreach ($tool in $tools.tools.PsObject.Properties) {
+            & dotnet tool install $tool.Name --version $tool.Value.version
+        }
   - task: PowerShell@2
     displayName: Restore packages
     inputs: