diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index aa9b69c513..ebd636acab 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -18,7 +18,8 @@ jobs:
         ruby-version: '2.6'
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '6.0.x'
+        include-prerelease: true
     - uses: pre-commit/action@v2.0.0
 
   markdown-link-check:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8bce348ede..4baf0f7802 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -84,9 +84,10 @@ repos:
     exclude: ".*localized.*"
 
 - repo: https://github.com/dotnet/format
-  rev: "7e343070a0355c86f72bdee226b5e19ffcbac931"  # TODO - update to a tagged version when one that includes the hook is ready.
+  rev: v5.1.225507
   hooks:
   - id: dotnet-format
+    entry: dotnet-format whitespace
     args: [--folder, --include]
 
 # "Local" hooks, see https://pre-commit.com/#repository-local-hooks