diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
new file mode 100644
index 000000000..7f35d2cb1
--- /dev/null
+++ b/.config/dotnet-tools.json
@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-format": {
+      "version": "5.1.250801",
+      "commands": [
+        "dotnet-format"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
index 1fbf4e5d8..1d09080d9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,7 @@ root = true
 # Don't use tabs for indentation.
 [*]
 indent_style = space
+end_of_line = lf
 # (Please don't specify an indent_size here; that has too many unintended consequences.)
 
 # Code files
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b755a43f1..4f9ae9888 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,6 +105,14 @@ jobs:
       - name: Restore packages
         run: nuget restore
 
+      - name: Restore tools
+        run: dotnet tool restore
+        shell: pwsh
+
+      # - name: Verify Format
+      #   run: dotnet tool run dotnet-format --check
+      #   shell: pwsh
+
       - name: Run Core tests
         run: dotnet test test/Core.Test/Core.Test.csproj