Merge pull request #68 from oliverbooth/develop

3.2.0 update
oliverbooth · Apr 3, 2023 · 7ff391a · 7ff391a
2 parents f5b88e5 + e964e4e
commit 7ff391a
Show file tree

Hide file tree

Showing 325 changed files with 27,920 additions and 1,576 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -211,3 +211,4 @@ dotnet_diagnostic.SA1633.severity = silent
 # https://github.com/JosefPihrt/Roslynator/blob/master/docs/analyzers/RCS1090.md
 dotnet_diagnostic.CA2007.severity = silent
 dotnet_diagnostic.RCS1090.severity = silent
+dotnet_diagnostic.CA1805.severity = none
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Publish Documentation
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
     - uses: nikeee/[email protected]
       name: Build Documentation
       with:

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -16,9 +16,12 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          3.1.x
+          6.0.x
+          7.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"
@@ -29,5 +32,11 @@ jobs:
     - name: Build
       run: dotnet build --no-restore --configuration Release
 
-    - name: Test
-      run: dotnet test --no-build --verbosity normal --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
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
 
@@ -26,16 +26,63 @@ jobs:
       run: dotnet restore
 
     - name: Build
-      run: dotnet build -c Debug
+      run: dotnet build --configuration Debug --no-restore -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
 
     - name: Build NuGet package
       run: |
         mkdir build
-        dotnet pack X10D -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.Unity -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='nightly' -p:BuildNumber=${{ github.run_number }}
+        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
 
     - name: Push NuGet Package to nuget.org
       run: dotnet nuget push "build/*" --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      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 ./X10D.UpmPackageGenerator/X10D.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
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
 
@@ -26,22 +26,69 @@ jobs:
       run: dotnet restore
 
     - name: Build
-      run: dotnet build -c Release
+      run: dotnet build --configuration Release --no-restore -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
 
     - name: Build NuGet package
       run: |
         mkdir build
-        dotnet pack X10D -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
-        dotnet pack X10D.Unity -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build -p:VersionSuffix='prerelease' -p:BuildNumber=${{ github.run_number }}
+        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
 
     - name: Push NuGet Package to nuget.org
       run: dotnet nuget push "build/*" --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
 
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: build
+        path: build/
+
     - name: Create Release
       uses: "marvinpinto/action-automatic-releases@latest"
       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 ./X10D.UpmPackageGenerator/X10D.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
@@ -15,7 +15,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
 
@@ -26,22 +26,69 @@ jobs:
       run: dotnet restore
 
     - name: Build
-      run: dotnet build -c Release
+      run: dotnet build --configuration Release --no-restore
 
     - name: Build NuGet package
       run: |
         mkdir build
-        dotnet pack X10D -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o build
-        dotnet pack X10D.Unity -p:SymbolPackageFormat=snupkg --include-symbols --include-source -o 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
 
     - name: Push NuGet Package to nuget.org
       run: dotnet nuget push "build/*" --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NUGET_API_KEY }} --skip-duplicate
 
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: build
+        path: build/
+
     - name: Create Release
       uses: "marvinpinto/action-automatic-releases@latest"
       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 ./X10D.UpmPackageGenerator/X10D.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
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.11
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Cache SonarCloud packages

diff --git a/.github/workflows/source_validator.yml b/.github/workflows/source_validator.yml
@@ -18,7 +18,7 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v2
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
 

diff --git a/.github/workflows/unity.yml b/.github/workflows/unity.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v3
         with:
           dotnet-version: 7.0.x
 
@@ -40,7 +40,7 @@ jobs:
           cp -r ./X10D.Unity/bin/Release/netstandard2.1/X10D.Unity.dll ./X10D.Unity.Tests/Assets/Libraries/X10D.Unity.dll
 
       - name: Unity - Test runner
-        uses: game-ci/unity-test-runner@v2.0.2
+        uses: game-ci/unity-test-runner@v2.1.0
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}