SDK Format

Switch to the SDK build of `dotnet format`, and reformat the codebase.

.config/dotnet-tools.json

@@ -2,17 +2,11 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "dotnet-format": {
-      "version": "5.1.250801",
-      "commands": [
-        "dotnet-format"
-      ]
-    },
     "fantomas": {
       "version": "6.0.5",
       "commands": [
         "fantomas"
       ]
     }
   }
-}
+}

azure-pipelines.yml

@@ -54,9 +54,9 @@ jobs:
       #        a spurious re-build for some reason and ends up in NETSDK1085
       #   https://github.com/dotnet/fsharp/issues/12320
       dotnet pack --configuration $(configuration) --output=$(Build.ArtifactStagingDirectory)
-      # Check code format. Fantomas for F#, dotnet-format for C#
+      # Check code format. Fantomas for F#, dotnet format for C#
       dotnet tool run fantomas --check .
-      dotnet tool run dotnet-format --check
+      dotnet format --verify-no-changes
   - task: PublishTestResults@2
     condition: always()
     inputs:

reformat.sh

@@ -7,4 +7,4 @@ workspace="$( dirname "${BASH_SOURCE[0]}" )"
 
 dotnet tool restore
 dotnet tool run fantomas -r "${workspace}"
-dotnet tool run dotnet-format -f "${workspace}"
+dotnet dotnet format "${workspace}"

src/Serehfa/Booleans.cs

@@ -23,7 +23,7 @@ public static object IsBoolean(object[] args)
         public static object BooleanEq(object[] args)
         {
             CheckAtLeastArgs(args, 2);
-            if (!(args[0] is bool comparand))
+            if (args[0] is not bool comparand)
             {
                 return false;
             }

src/Serehfa/Ident.cs

@@ -6,7 +6,7 @@ namespace Serehfa
 {
     public class Ident
     {
-        private string _id;
+        private readonly string _id;
 
         public Ident(string id)
         {

src/Serehfa/RandomBits.cs

@@ -28,6 +28,6 @@ public static object RandomDouble(object[] args)
             }
         }
 
-        private static Random s_RandomInstance = new Random();
+        private static readonly Random s_RandomInstance = new();
     }
 }

src/Serehfa/Strings.cs

@@ -12,7 +12,7 @@ public static class Strings
         public static object StringEquals(object[] args)
         {
             CheckAtLeastArgs(args, 2);
-            if (!(args[0] is string comparand))
+            if (args[0] is not string comparand)
             {
                 return false;
             }

src/Serehfa/Symbols.cs

@@ -17,7 +17,7 @@ public static object IsSymbol(object[] args)
         public static object SymbolEquals(object[] args)
         {
             CheckAtLeastArgs(args, 2);
-            if (!(args[0] is Ident comparand))
+            if (args[0] is not Ident comparand)
             {
                 return false;
             }

src/Serehfa/Undefined.cs

@@ -9,7 +9,7 @@ namespace Serehfa
     /// </summary>
     public class Undefined
     {
-        private static Lazy<Undefined> s_Instance = new Lazy<Undefined>();
+        private static readonly Lazy<Undefined> s_Instance = new();
 
         /// <summary>Shared instance of the undefined type. References to this
         /// are emitted by the compiler when an undefined value is required.