Upgrade to Unity 2023.2 (#6071)

This is the minimum version supported by the latest Sentis release 1.3.0: https://discussions.unity.com/t/about-sentis-beta/260899 Remove the TextMeshPro package, which is deprecated in 2023.2 (and causes duplicate symbol errors): https://forum.unity.com/threads/2023-2-latest-development-on-textmesh-pro.1434757/ Tested: ran models in the 3DBall scene on OS X
Unity-Technologies · Mar 9, 2024 · 10887de · 10887de
1 parent 92cbaad
commit 10887de
Show file tree

Hide file tree

Showing 22 changed files with 88 additions and 78 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,7 +24,7 @@ Please wrap in triple backticks (```) to make it easier to read.
 If applicable, add screenshots to help explain your problem.
 
 **Environment (please complete the following information):**
-- Unity Version: [e.g. Unity 2022.3f1]
+- Unity Version: [e.g. Unity 2023.2.12f1]
 - OS + version: [e.g. Windows 10]
 - _ML-Agents version_: (e.g. ML-Agents v0.8, or latest `develop` branch from source)
 - _Torch version_: (you can run `pip3 show torch` to get this)

diff --git a/.yamato/com.unity.ml-agents-pack.yml b/.yamato/com.unity.ml-agents-pack.yml
@@ -9,7 +9,7 @@ pack:
       eval "$($HOME/anaconda/bin/conda shell.bash hook)"
       conda activate python3.10
       python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      unity-downloader-cli -u 2022.3 -c editor --wait --fast
+      unity-downloader-cli -u 2023.2 -c editor --wait --fast
       ./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -
       npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       upm-ci project pack --project-path Project

diff --git a/.yamato/com.unity.ml-agents-performance.yml b/.yamato/com.unity.ml-agents-performance.yml
@@ -1,6 +1,6 @@
 test_editors:
   - version: 2022.3
-  - version: 2023.1
+  - version: 2023.2
 ---
 {% for editor in test_editors %}
 Run_Mac_Perfomance_Tests{{ editor.version }}:

diff --git a/.yamato/com.unity.ml-agents-promotion.yml b/.yamato/com.unity.ml-agents-promotion.yml
@@ -1,5 +1,6 @@
 test_editors:
   - version: 2022.3
+  - version: 2023.2
 test_platforms:
   - name: win
     type: Unity::VM

diff --git a/.yamato/com.unity.ml-agents-test.yml b/.yamato/com.unity.ml-agents-test.yml
@@ -4,7 +4,7 @@ test_editors:
         # We want some scene tests to run in the DevProject, but packages there only support 2020+
       testProject: Project
       enableNoDefaultPackages: !!bool true
-    - version: 2023.1
+    - version: 2023.2
       testProject: DevProject
       enableNoDefaultPackages: !!bool true
 

diff --git a/.yamato/coverage_tests.metafile b/.yamato/coverage_tests.metafile
@@ -1,5 +1,5 @@
 coverage_test_editors:
-    - version: 2022.3
+    - version: 2023.2
       testProject: DevProject
 
 coverage_test_platforms:

diff --git a/.yamato/standalone-build-webgl-test.yml b/.yamato/standalone-build-webgl-test.yml
@@ -1,4 +1,4 @@
-{% capture editor_version %}2022.3{% endcapture %}
+{% capture editor_version %}2023.2{% endcapture %}
 test_webgl_standalone_{{ editor_version }}:
   name: Test WebGL Standalone {{ editor_version }}
   agent:

diff --git a/.yamato/test_versions.metafile b/.yamato/test_versions.metafile
@@ -5,7 +5,7 @@
 test_editors:
   - version: 2022.3
     extra_test: gym
-  - version: 2023.1
+  - version: 2023.3
     extra_test: sensor
   - version: trunk
     extra_test: llapi
diff --git a/DevProject/Packages/manifest.json b/DevProject/Packages/manifest.json
@@ -1,15 +1,16 @@
 {
   "dependencies": {
-    "com.unity.ai.navigation": "1.1.4",
+    "com.unity.ai.navigation": "2.0.0",
     "com.unity.coding": "0.1.0-preview.13",
-    "com.unity.inputsystem": "1.6.1",
+    "com.unity.inputsystem": "1.7.0",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
     "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
     "com.unity.package-manager-doctools": "3.0.0-preview",
     "com.unity.package-validation-suite": "0.59.0-preview",
-    "com.unity.test-framework": "1.1.33",
+    "com.unity.test-framework": "1.3.9",
     "com.unity.test-framework.performance": "3.0.3",
-    "com.unity.testtools.codecoverage": "1.2.4",
+    "com.unity.testtools.codecoverage": "1.2.5",
+    "com.unity.modules.accessibility": "1.0.0",
     "com.unity.modules.imageconversion": "1.0.0",
     "com.unity.modules.physics": "1.0.0",
     "com.unity.modules.physics2d": "1.0.0",

diff --git a/DevProject/Packages/packages-lock.json b/DevProject/Packages/packages-lock.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.ai.navigation": {
-      "version": "1.1.4",
+      "version": "2.0.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -10,11 +10,12 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.burst": {
-      "version": "1.8.10",
+      "version": "1.8.12",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
@@ -28,14 +29,14 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.inputsystem": {
-      "version": "1.6.1",
+      "version": "1.7.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -130,11 +131,11 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.3.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
@@ -151,7 +152,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -161,27 +162,39 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "nuget.castle-core": {
-      "version": "1.0.1",
+      "version": "2.0.0",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "nuget.moq": {
-      "version": "1.0.0",
+      "version": "2.0.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "nuget.castle-core": "1.0.1"
+        "nuget.castle-core": "2.0.0"
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
+    "com.unity.modules.accessibility": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.ai": {
       "version": "1.0.0",
       "depth": 1,
       "source": "builtin",
       "dependencies": {}
     },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imageconversion": {
       "version": "1.0.0",
       "depth": 0,
@@ -225,7 +238,8 @@
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.hierarchycore": "1.0.0"
       }
     },
     "com.unity.modules.unityanalytics": {

diff --git a/DevProject/ProjectSettings/ProjectVersion.txt b/DevProject/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.4f1
-m_EditorVersionWithRevision: 2022.3.4f1 (35713cd46cd7)
+m_EditorVersion: 2023.2.12f1
+m_EditorVersionWithRevision: 2023.2.12f1 (19eeb3b320af)
diff --git a/PerformanceProject/Packages/manifest.json b/PerformanceProject/Packages/manifest.json
@@ -4,7 +4,6 @@
     "com.unity.feature.development": "1.0.1",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
     "com.unity.test-framework.performance": "3.0.3",
-    "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.7.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.9.1",

diff --git a/PerformanceProject/Packages/packages-lock.json b/PerformanceProject/Packages/packages-lock.json
@@ -1,11 +1,12 @@
 {
   "dependencies": {
     "com.unity.burst": {
-      "version": "1.8.11",
+      "version": "1.8.12",
       "depth": 2,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.mathematics": "1.2.1",
+        "com.unity.modules.jsonserialize": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
@@ -24,7 +25,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
@@ -36,16 +37,15 @@
       "source": "builtin",
       "dependencies": {
         "com.unity.ide.visualstudio": "2.0.22",
-        "com.unity.ide.rider": "3.0.26",
-        "com.unity.ide.vscode": "1.2.5",
+        "com.unity.ide.rider": "3.0.27",
         "com.unity.editorcoroutines": "1.0.0",
         "com.unity.performance.profile-analyzer": "1.2.2",
-        "com.unity.test-framework": "1.1.33",
-        "com.unity.testtools.codecoverage": "1.2.4"
+        "com.unity.test-framework": "1.3.9",
+        "com.unity.testtools.codecoverage": "1.2.5"
       }
     },
     "com.unity.ide.rider": {
-      "version": "3.0.26",
+      "version": "3.0.27",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -62,13 +62,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.mathematics": {
       "version": "1.2.6",
       "depth": 3,
@@ -113,11 +106,11 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.33",
+      "version": "1.3.9",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.ext.nunit": "1.0.6",
+        "com.unity.ext.nunit": "2.0.3",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
@@ -134,7 +127,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.testtools.codecoverage": {
-      "version": "1.2.4",
+      "version": "1.2.5",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -143,15 +136,6 @@
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.textmeshpro": {
-      "version": "3.0.6",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.ugui": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.timeline": {
       "version": "1.7.6",
       "depth": 0,
@@ -230,6 +214,12 @@
         "com.unity.modules.animation": "1.0.0"
       }
     },
+    "com.unity.modules.hierarchycore": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {}
+    },
     "com.unity.modules.imageconversion": {
       "version": "1.0.0",
       "depth": 0,
@@ -318,7 +308,8 @@
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0"
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.hierarchycore": "1.0.0"
       }
     },
     "com.unity.modules.umbra": {

diff --git a/PerformanceProject/ProjectSettings/ProjectVersion.txt b/PerformanceProject/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.15f1
-m_EditorVersionWithRevision: 2022.3.15f1 (b58023a2b463)
+m_EditorVersion: 2023.2.12f1
+m_EditorVersionWithRevision: 2023.2.12f1 (19eeb3b320af)
diff --git a/Project/Packages/manifest.json b/Project/Packages/manifest.json
@@ -9,7 +9,6 @@
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.recorder": "4.0.1",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.6",
     "com.unity.toolchain.macos-x86_64-linux-x86_64": "2.0.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.imageconversion": "1.0.0",