Update to .Net 10.0 (#873)

* Add support for JetBrains Rider

* Update CSharpier to 1.2.6

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

* Update dockerfiles

* Update GHAs

Author: pmachapman

.config/dotnet-tools.json

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

.csharpierignore

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

.github/workflows/ci-e2e.yml

@@ -26,11 +26,11 @@ jobs:
       # ASPNETCORE_ENVIRONMENT: Development
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
         # get version of machine.py - MACHINE_PY_IMAGE will force the docker compose to use the proper version of machine.py
       - name: Install regctl
-        uses: iarekylew00t/regctl-installer@v1
+        uses: iarekylew00t/regctl-installer@v4.0.8
 
       - name: Set proper version of Machine.py
         run: |
@@ -43,12 +43,12 @@ jobs:
           echo $MACHINE_PY_IMAGE $MACHINE_PY_CPU_IMAGE
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
 
       - name: Start containers
-        run:  dotnet build && docker compose -f "docker-compose.yml" up -d && sleep 20 #allow time for mongo to start up properly
+        run: dotnet build && docker compose -f "docker-compose.yml" up -d && sleep 20 #allow time for mongo to start up properly
 
       - name: Debug network
         run: docker ps -a && docker logs --since 10m serval_cntr && docker logs --since 10m echo_cntr && docker logs --since 10m machine-engine-cntr && docker logs --since 10m serval-mongo-1 && docker logs --since 10m machine-job-cntr
@@ -63,7 +63,7 @@ jobs:
         run: docker ps -a && docker logs --since 10m serval_cntr && docker logs --since 10m echo_cntr && docker logs --since 10m machine-engine-cntr && docker logs --since 10m serval-mongo-1 && docker logs --since 10m machine-job-cntr
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

.github/workflows/ci.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-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
+          dotnet-version: 10.0.x
       - name: Start MongoDB
-        uses: supercharge/mongodb-github-action@1.8.0
+        uses: supercharge/mongodb-github-action@1.12.1
         with:
           mongodb-version: "8.0"
           mongodb-replica-set: rs0
@@ -34,21 +34,21 @@ jobs:
       - 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: Pre-Test
         run: sudo mkdir -p /var/lib/serval && sudo chmod 777 /var/lib/serval
       - name: Test
         run: dotnet test --verbosity normal --filter "TestCategory!=E2E&TestCategory!=E2EMissingServices" --collect:"Xplat Code Coverage" --logger "trx;LogFileName=test-results.trx"
       - name: Test report
-        uses: dorny/test-reporter@v1
+        uses: dorny/test-reporter@v2.5.0
         if: success() || failure()
         with:
           name: NUnit Tests
           path: src/**/TestResults/test-results.trx
           reporter: dotnet-trx
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/docker-build-push.yml

@@ -3,19 +3,19 @@ name: docker build
 on:
   push:
     tags:
-      - 'docker_*'
+      - "docker_*"
 
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: |
             ghcr.io/${{ github.repository }}
@@ -24,15 +24,15 @@ jobs:
           flavor: |
             latest=true
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true

.github/workflows/missing-services-e2e-tests.yml

@@ -26,7 +26,7 @@ jobs:
 
         # get version of machine.py - MACHINE_PY_IMAGE will force the docker compose to use the proper version of machine.py
       - name: Install regctl
-        uses: iarekylew00t/regctl-installer@v1
+        uses: iarekylew00t/regctl-installer@v4.0.8
 
       - name: Set proper version of Machine.py
         run: |
@@ -41,7 +41,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 10.0.x
 
       - name: Get Machine
         run: cd .. && git clone https://github.com/sillsdev/machine.git && cd machine && dotnet build && cd ../serval && dotnet build
@@ -114,7 +114,7 @@ jobs:
 
       #Coverage export
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

.github/workflows/release-api.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 10.0.x
       - name: Pack
         run: dotnet pack src/Serval/src/Serval.Grpc/Serval.Grpc.csproj -c Release -o artifacts
       - name: Upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v6
         with:
           name: nuget-package
           path: artifacts/*.nupkg

.github/workflows/release-client.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-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
+          dotnet-version: 10.0.x
       - name: Pack
         run: dotnet pack src/Serval/src/Serval.Client/Serval.Client.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

.github/workflows/release-data-access.yml

@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
       - name: Setup .NET
-        uses: actions/setup-dotnet@v3
+        uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 10.0.x
       - name: Pack
         run: dotnet pack src/Serval/src/SIL.DataAccess/SIL.DataAccess.csproj -c Release -o artifacts
       - name: Upload package
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v6
         with:
           name: nuget-package
           path: artifacts/*.nupkg

.gitignore

@@ -50,4 +50,5 @@ artifacts
 *src_test*
 *trg_test*
 *.pyc
-scripts/clearml_stats/*
+scripts/clearml_stats/*
+.idea