Use dotnet-format (#66)

* Revert "Change .NET SDK version to a fixed version (#52)"

This reverts commit c05605a.

* Update to latest .NET 6 SDK

* Use `dotnet-format`

  - Due to dotnet/sdk#23972 and dotnet/format#1519, i'm going to start using the `dotnet-format` tool instead of the version integrated into the SDK.

.config/dotnet-tools.json

@@ -7,6 +7,12 @@
       "commands": [
         "nbgv"
       ]
+    },
+    "dotnet-format": {
+      "version": "6.3.315103",
+      "commands": [
+        "dotnet-format"
+      ]
     }
   }
 }

.github/workflows/CI.yml

@@ -14,7 +14,6 @@ on:
 env:
   # Stop wasting time caching packages
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  SETUP_DOTNET_VERSION: 6.0.102
 
 jobs:
   build:
@@ -34,7 +33,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: ${{ env.SETUP_DOTNET_VERSION }}
+          dotnet-version: 6.x
 
       - name: Set version
         id: version
@@ -47,8 +46,11 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
 
+      - name: Install .NET tools
+        run: dotnet tool restore
+
       - name: DotNet Format
-        run: dotnet format --no-restore --verify-no-changes
+        run: dotnet dotnet-format --no-restore --verify-no-changes
 
       - name: Build
         run: dotnet build --configuration Release --no-restore

.github/workflows/PR.yml

@@ -5,7 +5,6 @@ on: pull_request
 env:
   # Stop wasting time caching packages
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  SETUP_DOTNET_VERSION: 6.0.102
 
 jobs:
   build:
@@ -25,13 +24,16 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: ${{ env.SETUP_DOTNET_VERSION }}
+          dotnet-version: 6.x
 
       - name: Install dependencies
         run: dotnet restore
 
+      - name: Install .NET tools
+        run: dotnet tool restore
+
       - name: DotNet Format
-        run: dotnet format --no-restore --verify-no-changes
+        run: dotnet dotnet-format --no-restore --verify-no-changes
 
       - name: Build
         run: dotnet build --configuration Release --no-restore

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "6.0.201",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   },

nuget.config

@@ -3,5 +3,14 @@
   <packageSources>
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
   </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="dotnet6">
+      <package pattern="dotnet-format" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>