Update to .Net 10.0 (#384)

* Add support for JetBrains Rider

* Minor dotnet format cleanups

* Update CSharpier to 1.2.6

* Update target framework to .NET 10 and packages to latest

* Update to NUnit 4.4

* Update McMaster.Extensions.CommandLineUtils

* Fix build on newer versions of cmake

* Update CI GHA

Author: pmachapman

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "csharpier": {
-      "version": "0.27.2",
+      "version": "1.2.6",
       "commands": [
-        "dotnet-csharpier"
-      ]
+        "csharpier"
+      ],
+      "rollForward": false
     }
   }
 }

.csharpierignore

@@ -0,0 +1,5 @@
+*.config
+*.csproj
+*.props
+*.targets
+*.xml

.github/workflows/ci.yml

@@ -26,14 +26,14 @@ jobs:
             cmake-args: "-A x64"
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: lukka/get-cmake@v3.31.6
+      - uses: actions/checkout@v6
+      - uses: lukka/get-cmake@v4.2.3
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            8.0.x
+            10.0.x
 
       - name: Restore dotnet tools
         run: dotnet tool restore
@@ -51,21 +51,21 @@ jobs:
           cmake --build ${{ github.workspace }}/src/sentencepiece4c/build --config Release --target sentencepiece4c
 
       - name: Upload sentencepiece4c artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.sentencepiece4c-artifact }}
           path: ${{ github.workspace }}/src/sentencepiece4c/bin/${{ matrix.sentencepiece4c-dll }}
 
       - name: Restore dependencies
         run: dotnet restore
       - name: Check formatting
-        run: dotnet csharpier --check .
+        run: dotnet csharpier check .
       - name: Build
         run: dotnet build --no-restore -c Release
       - name: Test
         run: dotnet test --verbosity normal --collect:"Xplat Code Coverage"
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
@@ -75,20 +75,20 @@ jobs:
     runs-on: windows-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v4
+        uses: actions/setup-dotnet@v5
         with:
           dotnet-version: |
-            8.0.x
+            10.0.x
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           name: sp4c-linux-x64
           path: ${{ github.workspace }}/src/sentencepiece4c/bin
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           name: sp4c-win-x64
           path: ${{ github.workspace }}/src/sentencepiece4c/bin
@@ -105,7 +105,7 @@ jobs:
           dotnet pack src\SIL.Machine.Translation.TensorFlow\SIL.Machine.Translation.TensorFlow.csproj -c Release -o artifacts
 
       - name: Upload package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: nuget-package
           path: artifacts/*.nupkg

.gitignore

@@ -54,3 +54,4 @@ tests/SIL.Machine.Tests/Corpora/TestData/usfm/source/*
 tests/SIL.Machine.Tests/Corpora/TestData/usfm/target/*
 tests/SIL.Machine.Tests/Corpora/TestData/project/*
 tests/SIL.Machine.Tests/Corpora/TestData/pretranslations.json
+.idea

local_check.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 dotnet tool restore
 dotnet restore
-dotnet csharpier --check .
+dotnet csharpier check .
 if [ $? -ne 0 ]; then
   exit 1
 fi

src/SIL.Machine.Morphology.HermitCrab.Tool/Program.cs

@@ -31,7 +31,7 @@ public static int Main(string[] args)
                 "continues when an error occurs while loading the configuration",
                 value => quitOnError = value == null
             },
-            { "h|help", "show this help message and exit", value => showHelp = value != null }
+            { "h|help", "show this help message and exit", value => showHelp = value != null },
         };
 
         try
@@ -91,7 +91,7 @@ public static int Main(string[] args)
             new ParseCommand(context),
             new TracingCommand(context),
             new TestCommand(context),
-            new StatsCommand(context)
+            new StatsCommand(context),
         };
 
         string input;

src/SIL.Machine.Morphology.HermitCrab.Tool/SIL.Machine.Morphology.HermitCrab.Tool.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RootNamespace>SIL.Machine.Morphology.HermitCrab</RootNamespace>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>hc</ToolCommandName>

src/SIL.Machine.Morphology.HermitCrab/AllomorphEnvironment.cs

@@ -38,7 +38,7 @@ Pattern<Word, ShapeNode> rightEnv
                         Filter = ann =>
                             ann.Type()
                                 .IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary, HCFeatureSystem.Anchor)
-                            && !ann.IsDeleted()
+                            && !ann.IsDeleted(),
                     }
                 );
             }
@@ -55,7 +55,7 @@ Pattern<Word, ShapeNode> rightEnv
                         Filter = ann =>
                             ann.Type()
                                 .IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary, HCFeatureSystem.Anchor)
-                            && !ann.IsDeleted()
+                            && !ann.IsDeleted(),
                     }
                 );
             }

src/SIL.Machine.Morphology.HermitCrab/CompileException.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace SIL.Machine.Morphology.HermitCrab
 {

src/SIL.Machine.Morphology.HermitCrab/ConstraintType.cs

@@ -3,6 +3,6 @@
     public enum ConstraintType
     {
         Require,
-        Exclude
+        Exclude,
     }
 }