Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Unity 2023.2 #6071

Merged
merged 1 commit into from
Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .yamato/com.unity.ml-agents-pack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .yamato/com.unity.ml-agents-performance.yml
Original file line number Diff line number Diff line change
@@ -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 }}:
Expand Down
1 change: 1 addition & 0 deletions .yamato/com.unity.ml-agents-promotion.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
test_editors:
- version: 2022.3
- version: 2023.2
test_platforms:
- name: win
type: Unity::VM
Expand Down
2 changes: 1 addition & 1 deletion .yamato/com.unity.ml-agents-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .yamato/coverage_tests.metafile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
coverage_test_editors:
- version: 2022.3
- version: 2023.2
testProject: DevProject

coverage_test_platforms:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/standalone-build-webgl-test.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/test_versions.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 5 additions & 4 deletions DevProject/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
38 changes: 26 additions & 12 deletions DevProject/Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"com.unity.ai.navigation": {
"version": "1.1.4",
"version": "2.0.0",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -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"
},
Expand All @@ -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": {
Expand Down Expand Up @@ -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"
},
Expand All @@ -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": {
Expand All @@ -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,
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions DevProject/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion PerformanceProject/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
47 changes: 19 additions & 28 deletions PerformanceProject/Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -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"
},
Expand All @@ -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": {},
Expand All @@ -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": {
Expand All @@ -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,
Expand Down Expand Up @@ -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"
},
Expand All @@ -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": {
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions PerformanceProject/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -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)
1 change: 0 additions & 1 deletion Project/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading
Loading