Updatingv2

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: [vis2k]

.github/workflows/RunUnityTests.yml

@@ -0,0 +1,59 @@
+name: Run Unity Tests
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  RunUnityTests:
+    name: Run Unity Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        unityVersion:
+          - 2019.4.40f1
+          - 2020.3.46f1
+          - 2021.3.20f1
+          - 2022.2.10f1
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Do Not Enable Caching --- Library needs to be recompiled every time because Weaver
+      # Leaving this here for posterity to ensure we never turn this on.
+      #- name: Cache Library
+      #  id: cache-library
+      #  uses: actions/cache@v3
+      #  with:
+      #    path: Library
+      #    key: Library-${{ matrix.unityVersion }}
+
+      - name: Run editor Tests
+        uses: game-ci/unity-test-runner@main
+
+        # We can use the same license for all Unity versions
+        env:
+          UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+
+        # testMode is set to editMode (editor tests only) until we fix playmode tests (or eliminate them)
+        # `-stackTraceLogType None` speeds up the job and vastly shrinks the log output
+        # If a test actually fails, we'll diagnose it locally anyway, so the stacktrace doesn't really help
+        with:
+          projectPath: ./
+          testMode: editmode
+          unityVersion: ${{ matrix.unityVersion }}
+          customParameters: -stackTraceLogType None
+
+      - name: Archive test results
+        uses: actions/upload-artifact@v3
+        with:
+          name: Test Results ${{ matrix.unityVersion }}
+          path: artifacts
+
+      - name: Publish test results
+        uses: MirrorNetworking/nunit-reporter@master
+        with:
+          reportTitle: Test Report ${{ matrix.unityVersion }}
+          path: "artifacts/*.xml"
+          access-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Semantic.yml

@@ -0,0 +1,49 @@
+name: Semantic Release
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  SemanticRelease:
+    name: Semantic Release
+    runs-on: windows-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Delete Tests
+        run: |
+          Remove-Item -Recurse -Force Assets\Mirror\Tests
+          Remove-Item -Recurse -Force Assets\Mirror\Tests.meta
+
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '3.1.100'
+
+      # Installs nuget package from https://www.nuget.org/packages/unity-packer
+      - name: Install unity-packer
+        run: dotnet tool install -g unity-packer
+
+      - name: Package
+        run: unity-packer pack Mirror.unitypackage Assets/Mirror Assets/Mirror Assets/ScriptTemplates Assets/ScriptTemplates LICENSE Assets/Mirror/LICENSE
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: Mirror.unitypackage
+          path: Mirror.unitypackage
+
+      - name: Release
+        uses: cycjimmy/semantic-release-action@v3
+        with:
+          extra_plugins: |
+            @semantic-release/exec
+            @semantic-release/changelog
+            @semantic-release/git
+          branch: master
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/SonarQube.yml

@@ -0,0 +1,37 @@
+name: SonarQube Analysis
+
+on:
+  workflow_dispatch:
+  workflow_call:
+
+jobs:
+  SonarQube:
+    name: SonarQube
+    runs-on: ubuntu-latest
+
+    # available list of containers here:
+    # https://hub.docker.com/r/unityci/editor/tags?page=1&ordering=last_updated&name=ubuntu-2020.1.17f1-base
+    container: unityci/editor:ubuntu-2021.3.16f1-base-1.0.1
+
+    steps:
+      - name: SonarQube analysis
+        uses: MirrorNetworking/[email protected]
+        with:
+          entrypoint: /sonar-scanner.sh
+          projectKey: vis2k_Mirror
+          projectName: Mirror
+          sonarOrganisation: vis2k
+          beginArguments: >-
+              /d:sonar.verbose="true" 
+              /d:sonar.cs.nunit.reportsPaths=Tests/editmode-results.xml,Tests/playimode-results.xml 
+              /d:sonar.cs.opencover.reportsPaths=Tests/workspace-opencov/EditMode/TestCoverageResults_0000.xml,Tests/workspace-opencov/PlayMode/TestCoverageResults_0000.xml
+              /d:sonar.coverage.exclusions=Assets/Mirror/Transports/**,Assets/Mirror/Examples/**,Assets/Mirror/Tests/**
+              /d:sonar.exclusions=Assets/Mirror/Runtime/Transport/SimpleWebTransport/**
+          # files ignored in code coverage:
+          # Assets/Mirror/Transports/**  - Transports have their own tests and Sonar coverage
+          # Assets/Mirror/Examples/**    - Examples don't need test coverage
+          # Assets/Mirror/Tests/**       - Tests don't need test coverage
+        env:
+          FrameworkPathOverride: /opt/Unity/Editor/Data/MonoBleedingEdge/
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/activation.yml

@@ -0,0 +1,27 @@
+name: Acquire Activation File
+
+on:
+  workflow_dispatch:
+
+jobs:
+  activation:
+    name: Acquire Activation File 🔑
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Acquire Activation File
+        id: getManualLicenseFile
+        uses: game-ci/unity-request-activation-file@v2
+        with:
+          unityVersion: 2019.4.40f1
+
+      - name: Upload License Request
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.getManualLicenseFile.outputs.filePath }}
+          path: ${{ steps.getManualLicenseFile.outputs.filePath }}
+
+      - name: Next Steps
+        run: |
+          echo "Upload the alf file to https://license.unity3d.com/manual to get a ulf license file."
+          echo "Unzip and open the ulf license in Notepad and paste into secret called UNITY_LICENSE."

.github/workflows/main.yml

@@ -1,156 +1,39 @@
-name: CI
-#on:
-#  pull_request: {}
-#  push: { branches: [master] }
+name: Main
 
-on: 
+on:
+  workflow_dispatch:
+  pull_request:
   push:
+    branches:
+    - master
     paths-ignore:
-      - 'doc/**'
+      - 'Packages/**'
+      - 'ProjectSettings/**'
+      - '.github/**'
+      - '.gitattributes'
+      - '.gitignore'
+      - '.editorconfig'
+      - 'LICENSE'
       - '*.md'
+      - '*.yml'
+      - '*.txt'
+      - '*.ps1'
 
 jobs:
+  RunUnityTests:
+    name: Run Unity Tests
+    uses: ./.github/workflows/RunUnityTests.yml
+    secrets: inherit
 
-  requestActivationFile:
-    runs-on: ubuntu-latest
-    if: false
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Request manual activation file
-        uses: MirrorNetworking/[email protected]
-        id: getManualLicenseFile
-        with:
-            entrypoint: /request_activation.sh
-
-      - name: Expose as artifact
-        uses: actions/upload-artifact@v1
-        with:
-            name: Manual Activation File
-            path: ${{ steps.getManualLicenseFile.outputs.filePath }}
-
-  CI:
-    name: Test
-    runs-on: ubuntu-latest
-    env:
-      UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
-    if: true
-    steps:
-
-      # Checkout repository (required to test local actions)
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Add Coverage Plugin
-        uses: canastro/[email protected]
-        with:
-          source: Packages/manifest-coverage.json
-          target: Packages/manifest.json
-
-      - name: Activate license
-        uses: MirrorNetworking/[email protected]
-        with:
-          entrypoint: /activate.sh
-
-      - name: Generate Solution
-        uses: MirrorNetworking/[email protected]
-        with:
-          # Arguments to pass to unity
-          args: -buildTarget StandaloneWindows64 -customBuildName Mirror -customBuildPath ./build/StandaloneWindows64 -projectPath . -executeMethod  UnityEditor.SyncVS.SyncSolution -quit
-
-      # Configure test runner
-      - name: Run editor Tests
-        uses: MirrorNetworking/[email protected]
-        with:
-          args: -runTests -testPlatform editmode -testResults Tests/editmode-results.xml -enableCodeCoverage -coverageResultsPath Tests
-
-      - name: Run play Tests
-        uses: MirrorNetworking/[email protected]
-        with:
-          args: -runTests -testPlatform playmode -testResults Tests/playmode-results.xml -enableCodeCoverage -coverageResultsPath Tests
-
-      # Upload artifacts
-      - name: Archive test results
-        uses: actions/upload-artifact@v1
-        if: always()
-        with:
-          name: Test results (editor mode)
-          path: Tests
-
-      - name: Publish test results
-        uses: MirrorNetworking/[email protected]
-        if: always()
-        with:
-          path: "Tests/*.xml"
-          access-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: SonarQube analysis
-        if: always()
-        uses: MirrorNetworking/[email protected]
-        with:
-          entrypoint: /sonar-scanner.sh
-          projectKey: vis2k_Mirror
-          projectName: Mirror
-          sonarOrganisation: vis2k
-          beginArguments: >-
-              /d:sonar.verbose="true" 
-              /d:sonar.cs.nunit.reportsPaths=Tests/editmode-results.xml,Tests/playimode-results.xml 
-              /d:sonar.cs.opencover.reportsPaths=Tests/workspace-opencov/EditMode/TestCoverageResults_0000.xml,Tests/workspace-opencov/PlayMode/TestCoverageResults_0000.xml
-              /d:sonar.coverage.exclusions=Assets/Mirror/Runtime/Transport/Telepathy/**/*.cs,Assets/Mirror/Runtime/Transport/SimpleWebTransport/**,Assets/Mirror/Runtime/Transport/KCP/kcp2k/**,Assets/Mirror/Cloud/**/*.cs,Assets/Mirror/Examples/**/*.cs,Assets/Mirror/Tests/**/*.cs
-              /d:sonar.exclusions=Assets/Mirror/Runtime/Transport/SimpleWebTransport/**
-          # files ignored in code coverage:
-          # Assets/Mirror/Runtime/Transport/Telepathy/** - has its own test in the Telepathy repo
-          # Assets/Mirror/Runtime/Transport/SimpleWebTransport/** - fully exclude this because it has sonar running on its repo
-          # Assets/Mirror/Runtime/Transport/KCP/kcp2k/** - has its own test in the kcp2k repo
-          # Assets/Mirror/Cloud/** - has its own tests in private cloud repo
-          # Assets/Mirror/Examples/** - examples dont need test coverage
-          # Assets/Mirror/Tests/** - tests dont need test coverage
-        env:
-          FrameworkPathOverride: /opt/Unity/Editor/Data/MonoBleedingEdge/
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #SonarQube:
+  #  name: SonarQube Analysis
+  #  needs: RunUnityTests
+  #  uses: ./.github/workflows/SonarQube.yml
+  #  secrets: inherit
 
   Release:
-    runs-on: windows-latest
-    needs: CI
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Delete Tests
-        run: |
-          Remove-Item -Recurse -Force Assets\Mirror\Tests
-          Remove-Item -Recurse -Force Assets\Mirror\Tests.meta
-
-      - name: Setup dotnet
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '3.1.100'
-
-      - name: Install unity-packer
-        run: dotnet tool install -g unity-packer
-
-      - name: Package
-        run: |
-          unity-packer pack Mirror.unitypackage Assets/Mirror Assets/Mirror Assets/ScriptTemplates Assets/ScriptTemplates LICENSE Assets/Mirror/LICENSE
-
-      - uses: actions/upload-artifact@v1
-        with:
-          name: Mirror.unitypackage
-          path: Mirror.unitypackage
-
-      - name: Release
-        uses: cycjimmy/semantic-release-action@v2
-        with:
-          extra_plugins: |
-            @semantic-release/exec
-            @semantic-release/changelog
-            @semantic-release/git
-          branch: master
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    name: Semantic Release
+    if: github.event_name == 'push'
+    needs: RunUnityTests
+    uses: ./.github/workflows/Semantic.yml
+    secrets: inherit

.gitignore

@@ -38,6 +38,7 @@ Source/Source.sln
 Output/
 bin/
 .vs/
+.vscode/
 .idea/
 Mirror/packages
 .mfractor
@@ -52,6 +53,8 @@ Obj
 *.mdb
 *.mdb.meta
 ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
+ProjectSettings/RiderScriptEditorPersistedState.asset
+ProjectSettings/SceneTemplateSettings.json
 UserSettings/
 # Packages/manifest.json is enough. lock is auto generated from it.
 Packages/packages-lock.json