Merge branch 'release/4.0.0' into main

oliverbooth · Jan 6, 2024 · 87f5b39 · 87f5b39
2 parents 790b31a + d5c63fe
commit 87f5b39
Show file tree

Hide file tree

Showing 505 changed files with 3,757 additions and 16,308 deletions.
diff --git a/.github/workflows/activate-unity.yml b/.github/workflows/activate-unity.yml
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -23,9 +23,9 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          3.1.x
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Add NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@@ -36,11 +36,11 @@ jobs:
     - name: Build
       run: dotnet build --no-restore --configuration Release
 
-    - name: Test .NET Core 3.1
-      run: dotnet test --no-build --verbosity normal --configuration Release --framework netcoreapp3.1
-
     - name: Test .NET 6
       run: dotnet test --no-build --verbosity normal --configuration Release --framework net6.0
 
     - name: Test .NET 7
       run: dotnet test --no-build --verbosity normal --configuration Release --framework net7.0
+
+    - name: Test .NET 8
+      run: dotnet test --no-build --verbosity normal --configuration Release --framework net8.0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@@ -33,9 +33,7 @@ jobs:
       run: |
         mkdir build
         dotnet pack X10D --configuration Debug --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.DSharpPlus --configuration Debug --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
         dotnet pack X10D.Hosting --configuration Debug --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.Unity --configuration Debug --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
 
     - name: Push NuGet Package to GitHub
       run: dotnet nuget push "build/*" --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
@@ -48,42 +46,3 @@ jobs:
       with:
         name: build
         path: build/
-
-    - name: Checkout upm branch
-      uses: actions/checkout@v3
-      with:
-        ref: upm
-        path: upm
-
-    - name: Build package.json
-      run: |
-        dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Debug/netstandard2.1/X10D.dll"
-        cp package.json upm/package.json
-
-    - name: Copy built artifacts to upm
-      run: |
-        cd upm
-        cp ../X10D/bin/Debug/netstandard2.1/X10D.dll ./X10D.dll
-        cp ../X10D/bin/Debug/netstandard2.1/X10D.xml ./X10D.xml
-        cp ../X10D.Unity/bin/Debug/netstandard2.1/X10D.Unity.dll ./X10D.Unity.dll
-        cp ../X10D.Unity/bin/Debug/netstandard2.1/X10D.Unity.xml ./X10D.Unity.xml
-
-    - name: Check for changes
-      run: |
-        cd upm
-        git diff --quiet
-      continue-on-error: true
-
-    - name: Commit update
-      if: ${{ success() }}
-      run: |
-        cd upm
-        git config user.name github-actions
-        git config user.email [email protected]
-        git add X10D.dll
-        git add X10D.Unity.dll
-        git add X10D.xml
-        git add X10D.Unity.xml
-        git add package.json
-        git commit -m "Update upm branch ($GITHUB_SHA)"
-        git push
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@@ -32,9 +32,7 @@ jobs:
       run: |
         mkdir build
         dotnet pack X10D --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.DSharpPlus --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
         dotnet pack X10D.Hosting --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.Unity --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
 
     - name: Push NuGet Package to GitHub
       run: dotnet nuget push "build/*" --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
@@ -53,42 +51,3 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: true
-
-    - name: Checkout upm branch
-      uses: actions/checkout@v3
-      with:
-        ref: upm
-        path: upm
-
-    - name: Build package.json
-      run: |
-        dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll"
-        cp package.json upm/package.json
-
-    - name: Copy built artifacts to upm
-      run: |
-        cd upm
-        cp ../X10D/bin/Release/netstandard2.1/X10D.dll ./X10D.dll
-        cp ../X10D/bin/Release/netstandard2.1/X10D.xml ./X10D.xml
-        cp ../X10D.Unity/bin/Release/netstandard2.1/X10D.Unity.dll ./X10D.Unity.dll
-        cp ../X10D.Unity/bin/Release/netstandard2.1/X10D.Unity.xml ./X10D.Unity.xml
-
-    - name: Check for changes
-      run: |
-        cd upm
-        git diff --quiet
-      continue-on-error: true
-
-    - name: Commit update
-      if: ${{ success() }}
-      run: |
-        cd upm
-        git config user.name github-actions
-        git config user.email [email protected]
-        git add X10D.dll
-        git add X10D.Unity.dll
-        git add X10D.xml
-        git add X10D.Unity.xml
-        git add package.json
-        git commit -m "Update upm branch ($GITHUB_SHA)"
-        git push
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@@ -32,9 +32,7 @@ jobs:
       run: |
         mkdir build
         dotnet pack X10D --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build
-        dotnet pack X10D.DSharpPlus --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build
         dotnet pack X10D.Hosting --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build
-        dotnet pack X10D.Unity --configuration Release --no-build -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build
 
     - name: Push NuGet Package to GitHub
       run: dotnet nuget push "build/*" --source "github" --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
@@ -53,42 +51,3 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
-
-    - name: Checkout upm branch
-      uses: actions/checkout@v3
-      with:
-        ref: upm
-        path: upm
-
-    - name: Build package.json
-      run: |
-        dotnet run --project ./tools/UpmPackageGenerator/UpmPackageGenerator.csproj "./X10D/bin/Release/netstandard2.1/X10D.dll"
-        cp package.json upm/package.json
-
-    - name: Copy built artifacts to upm
-      run: |
-        cd upm
-        cp ../X10D/bin/Release/netstandard2.1/X10D.dll ./X10D.dll
-        cp ../X10D/bin/Release/netstandard2.1/X10D.xml ./X10D.xml
-        cp ../X10D.Unity/bin/Release/netstandard2.1/X10D.Unity.dll ./X10D.Unity.dll
-        cp ../X10D.Unity/bin/Release/netstandard2.1/X10D.Unity.xml ./X10D.Unity.xml
-
-    - name: Check for changes
-      run: |
-        cd upm
-        git diff --quiet
-      continue-on-error: true
-
-    - name: Commit update
-      if: ${{ success() }}
-      run: |
-        cd upm
-        git config user.name github-actions
-        git config user.email [email protected]
-        git add X10D.dll
-        git add X10D.Unity.dll
-        git add X10D.xml
-        git add X10D.Unity.xml
-        git add package.json
-        git commit -m "Update upm branch ($GITHUB_SHA)"
-        git push
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
@@ -1,50 +1,61 @@
-name: Build
+name: SonarCloud
 on:
   push:
     branches:
       - main
   workflow_dispatch:
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [ opened, synchronize, reopened ]
+
 jobs:
-  build:
-    name: Build
+  sonarcloud:
+    name: SonarCloud Analysis
     runs-on: windows-latest
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.11
+          java-version: 17
+          distribution: 'zulu'
+
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
+
       - name: Cache SonarCloud scanner
         id: cache-sonar-scanner
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner
           restore-keys: ${{ runner.os }}-sonar-scanner
+
       - name: Install SonarCloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           New-Item -Path .\.sonar\scanner -ItemType Directory
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+
+      - name: Install dotCover
+        shell: powershell
+        run: |
+          dotnet tool install --global JetBrains.dotCover.GlobalTool
+
       - name: Build and analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          dotnet tool install JetBrains.dotCover.GlobalTool -g
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"oliverbooth_X10D" /o:"oliverbooth" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.dotcover.reportsPaths=dotCover.Output.html
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"oliverbooth_X10D" /o:"oliverbooth" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
           dotnet build --no-incremental
           dotnet dotcover test --dcReportType=HTML
-          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/.github/workflows/source_validator.yml b/.github/workflows/source_validator.yml
@@ -19,7 +19,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Add GitHub NuGet source
       run: dotnet nuget add source --username oliverbooth --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/oliverbooth/index.json"
@@ -31,4 +31,4 @@ jobs:
       run: dotnet build -c Debug
 
     - name: Run Source Validation
-      run: dotnet run --project ./tools/SourceValidator/SourceValidator.csproj ./X10D/src ./X10D.Unity/src
+      run: dotnet run --project ./tools/SourceValidator/SourceValidator.csproj ./X10D/src
diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml