Merge pull request #206 from Preponderous-Software/copilot/sub-pr-205

Fix EntityId ambiguity, replace CI test runner, restore Legacy Input Manager, and upgrade to Unity 6

Author: dmccoystephenson

.github/workflows/unity-ci.yml

@@ -85,7 +85,6 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      checks: write
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -101,15 +100,15 @@ jobs:
             Library-
 
       - name: Run Tests
-        uses: game-ci/unity-test-runner@v4
+        uses: game-ci/unity-builder@v4
         env:
           UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          unityVersion: 2022.3.7f1
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
-          checkName: Unity Test Results
+          unityVersion: 6000.0.30f1
+          targetPlatform: StandaloneLinux64
+          customParameters: -batchmode -nographics -quit -executeMethod beyondnationstests.Tests.runTests
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
@@ -149,7 +148,7 @@ jobs:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
         with:
-          unityVersion: 2022.3.7f1
+          unityVersion: 6000.0.30f1
           targetPlatform: ${{ matrix.targetPlatform }}
 
       - name: Upload Build

Assets/Scripts/Tests/nation/TestNation.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 
 using beyondnations;
+using EntityId = beyondnations.EntityId;
 
 namespace beyondnationstests {
 

Assets/Scripts/Tests/nation/TestNationRepository.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 
 using beyondnations;
+using EntityId = beyondnations.EntityId;
 
 namespace beyondnationstests {
 

Packages/manifest.json

@@ -5,7 +5,7 @@
     "com.unity.ide.rider": "3.0.24",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.render-pipelines.universal": "14.0.8",
+    "com.unity.render-pipelines.universal": "17.0.3",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.5",

ProjectSettings/ProjectSettings.asset

@@ -695,3 +695,4 @@ PlayerSettings:
   cloudEnabled: 0
   legacyClampBlendShapeWeights: 0
   virtualTexturingSupportEnabled: 0
+  activeInputHandler: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.7f1
-m_EditorVersionWithRevision: 2022.3.7f1 (b16b3b16c7a0)
+m_EditorVersion: 6000.0.30f1
+m_EditorVersionWithRevision: 6000.0.30f1 (4f6d4e0c15e9)