Update to .Net 10.0

.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,
     }
 }

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

@@ -42,7 +42,7 @@ static HCFeatureSystem()
 
             Type = new SymbolicFeature(Guid.NewGuid().ToString(), Anchor, Segment, Boundary, Morph)
             {
-                Description = "Type"
+                Description = "Type",
             };
 
             Dirty = new FeatureSymbol(Guid.NewGuid().ToString()) { Description = "Dirty" };
@@ -51,7 +51,7 @@ static HCFeatureSystem()
             Modified = new SymbolicFeature(Guid.NewGuid().ToString(), Dirty, Clean)
             {
                 Description = "Modified",
-                DefaultValue = new SymbolicFeatureValue(Clean)
+                DefaultValue = new SymbolicFeatureValue(Clean),
             };
 
             Deleted = new FeatureSymbol(Guid.NewGuid().ToString()) { Description = "Deleted" };
@@ -60,15 +60,15 @@ static HCFeatureSystem()
             Deletion = new SymbolicFeature(Guid.NewGuid().ToString(), Deleted, NotDeleted)
             {
                 Description = "Deletion",
-                DefaultValue = new SymbolicFeatureValue(NotDeleted)
+                DefaultValue = new SymbolicFeatureValue(NotDeleted),
             };
 
             LeftSide = new FeatureSymbol(Guid.NewGuid().ToString()) { Description = "LeftSide" };
             RightSide = new FeatureSymbol(Guid.NewGuid().ToString()) { Description = "RightSide" };
 
             AnchorType = new SymbolicFeature(Guid.NewGuid().ToString(), LeftSide, RightSide)
             {
-                Description = "AnchorType"
+                Description = "AnchorType",
             };
 
             StrRep = new StringFeature(Guid.NewGuid().ToString()) { Description = "StrRep" };

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

@@ -25,7 +25,7 @@ public enum FailureReason
         BoundRoot,
         NonPartialRuleProhibitedAfterFinalTemplate,
         NonPartialRuleRequiredAfterNonFinalTemplate,
-        MaxApplicationCount
+        MaxApplicationCount,
     }
 
     public interface ITraceManager

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

@@ -33,7 +33,7 @@ public enum MorphCoOccurrenceAdjacency
         /// <summary>
         /// Adjacent to the right
         /// </summary>
-        AdjacentToRight
+        AdjacentToRight,
     }
 
     /// <summary>

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

@@ -14,7 +14,6 @@
 #if !SINGLE_THREADED
 using System.Collections.Concurrent;
 using System.Threading.Tasks;
-using System.Text;
 #endif
 
 namespace SIL.Machine.Morphology.HermitCrab

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/AffixProcessAllomorph.cs

@@ -22,7 +22,7 @@ public enum ReduplicationHint
         /// <summary>
         /// Suffix
         /// </summary>
-        Suffix
+        Suffix,
     }
 
     public class AffixProcessAllomorph : Allomorph

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/AnalysisAffixProcessRule.cs

@@ -29,7 +29,7 @@ public AnalysisAffixProcessRule(Morpher morpher, AffixProcessRule rule)
                             MatchingMethod = MatchingMethod.Unification,
                             AnchoredToStart = true,
                             AnchoredToEnd = true,
-                            AllSubmatches = true
+                            AllSubmatches = true,
                         }
                     )
                 );

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/AnalysisCompoundingRule.cs

@@ -29,7 +29,7 @@ public AnalysisCompoundingRule(Morpher morpher, CompoundingRule rule)
                             MatchingMethod = MatchingMethod.Unification,
                             AnchoredToStart = true,
                             AnchoredToEnd = true,
-                            AllSubmatches = true
+                            AllSubmatches = true,
                         }
                     )
                 );

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/AnalysisRealizationalAffixProcessRule.cs

@@ -30,7 +30,7 @@ public AnalysisRealizationalAffixProcessRule(Morpher morpher, RealizationalAffix
                             MatchingMethod = MatchingMethod.Unification,
                             AnchoredToStart = true,
                             AnchoredToEnd = true,
-                            AllSubmatches = true
+                            AllSubmatches = true,
                         }
                     )
                 );

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/SynthesisAffixProcessRule.cs

@@ -31,7 +31,7 @@ public SynthesisAffixProcessRule(Morpher morpher, AffixProcessRule rule)
                                 ann.Type().IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary)
                                 && !ann.IsDeleted(),
                             AnchoredToStart = true,
-                            AnchoredToEnd = true
+                            AnchoredToEnd = true,
                         }
                     )
                 );

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/SynthesisCompoundingRule.cs

@@ -37,7 +37,7 @@ private Matcher<Word, ShapeNode> BuildMatcher(IEnumerable<Pattern<Word, ShapeNod
                     Filter = ann =>
                         ann.Type().IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary) && !ann.IsDeleted(),
                     AnchoredToStart = true,
-                    AnchoredToEnd = true
+                    AnchoredToEnd = true,
                 }
             );
         }

src/SIL.Machine.Morphology.HermitCrab/MorphologicalRules/SynthesisRealizationalAffixProcessRule.cs

@@ -31,7 +31,7 @@ public SynthesisRealizationalAffixProcessRule(Morpher morpher, RealizationalAffi
                                 ann.Type().IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary)
                                 && !ann.IsDeleted(),
                             AnchoredToStart = true,
-                            AnchoredToEnd = true
+                            AnchoredToEnd = true,
                         }
                     )
                 );

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

@@ -17,7 +17,7 @@ public enum MprFeatureGroupMatchType
         /// <summary>
         /// only if all features match within the group
         /// </summary>
-        All
+        All,
     }
 
     /// <summary>
@@ -33,7 +33,7 @@ public enum MprFeatureGroupOutput
         /// <summary>
         /// appends features
         /// </summary>
-        Append
+        Append,
     }
 
     /// <summary>

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/AnalysisMetathesisRule.cs

@@ -29,7 +29,7 @@ public AnalysisMetathesisRule(Morpher morpher, MetathesisRule rule)
                 UseDefaults = true,
                 // during analysis shape nodes can have features that are underspecified,
                 // so this must be non-deterministic
-                Nondeterministic = true
+                Nondeterministic = true,
             };
 
             _patternRule = new IterativePhonologicalPatternRule(ruleSpec, settings);

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/AnalysisRewriteRule.cs

@@ -16,7 +16,7 @@ private enum ReapplyType
         {
             Normal,
             Deletion,
-            SelfOpaquing
+            SelfOpaquing,
         }
 
         private readonly Morpher _morpher;
@@ -35,7 +35,7 @@ public AnalysisRewriteRule(Morpher morpher, RewriteRule rule)
                 MatchingMethod = MatchingMethod.Unification,
                 UseDefaults = true,
                 // during analysis shape nodes can have features that are underspecified, so this must be non-deterministic
-                Nondeterministic = true
+                Nondeterministic = true,
             };
 
             _rules = new List<Tuple<ReapplyType, PhonologicalPatternRule>>();
@@ -142,15 +142,13 @@ public IEnumerable<Word> Apply(Word input)
                 switch (sr.Item1)
                 {
                     case ReapplyType.Normal:
-
                         {
                             if (sr.Item2.Apply(input).Any())
                                 srApplied = true;
                         }
                         break;
 
                     case ReapplyType.Deletion:
-
                         {
                             int j = 0;
                             Word data = sr.Item2.Apply(input).SingleOrDefault();
@@ -166,7 +164,6 @@ public IEnumerable<Word> Apply(Word input)
                         break;
 
                     case ReapplyType.SelfOpaquing:
-
                         {
                             Word data = sr.Item2.Apply(input).SingleOrDefault();
                             while (data != null)

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/RewriteRule.cs

@@ -9,7 +9,7 @@ namespace SIL.Machine.Morphology.HermitCrab.PhonologicalRules
     public enum RewriteApplicationMode
     {
         Iterative,
-        Simultaneous
+        Simultaneous,
     }
 
     public class RewriteRule : HCRuleBase, IPhonologicalRule

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/SynthesisMetathesisRule.cs

@@ -26,7 +26,7 @@ public SynthesisMetathesisRule(Morpher morpher, MetathesisRule rule)
                 Filter = ann =>
                     ann.Type().IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary, HCFeatureSystem.Anchor)
                     && !ann.IsDeleted(),
-                UseDefaults = true
+                UseDefaults = true,
             };
 
             _patternRule = new IterativePhonologicalPatternRule(ruleSpec, settings);

src/SIL.Machine.Morphology.HermitCrab/PhonologicalRules/SynthesisRewriteRule.cs

@@ -25,7 +25,7 @@ public SynthesisRewriteRule(Morpher morpher, RewriteRule rule)
                 Filter = ann =>
                     ann.Type().IsOneOf(HCFeatureSystem.Segment, HCFeatureSystem.Boundary, HCFeatureSystem.Anchor)
                     && !ann.IsDeleted(),
-                UseDefaults = true
+                UseDefaults = true,
             };
 
             var ruleSpec = new SynthesisRewriteRuleSpec(