Skip to content

Commit c513f8f

Browse files
committed
Post Unity 6 fixes back to 2022 LTS
Maintain 2022 for main project while preserving upgrade path compatibility for Unity 6 without losing asmdef ref
1 parent abd2dc1 commit c513f8f

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

Assets/Thirdweb/Plugins/Thirdweb.Plugins.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Thirdweb.Plugins",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:6055be8ebefd69e48b49212b09b47b2f"
5+
"Unity.TextMeshPro"
66
],
77
"includePlatforms": [],
88
"excludePlatforms": [],

Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"com.unity.ide.visualstudio": "2.0.22",
55
"com.unity.mobile.android-logcat": "1.4.2",
66
"com.unity.test-framework": "1.4.5",
7+
"com.unity.textmeshpro": "3.0.9",
78
"com.unity.timeline": "1.8.7",
89
"com.unity.toolchain.macos-arm64-linux-x86_64": "2.0.3",
910
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.9",
1011
"com.unity.ugui": "2.0.0",
11-
"com.unity.modules.accessibility": "1.0.0",
1212
"com.unity.modules.ai": "1.0.0",
1313
"com.unity.modules.androidjni": "1.0.0",
1414
"com.unity.modules.animation": "1.0.0",

Packages/packages-lock.json

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
33
"com.unity.ext.nunit": {
4-
"version": "2.0.5",
4+
"version": "2.0.3",
55
"depth": 1,
66
"source": "registry",
77
"dependencies": {},
@@ -59,6 +59,15 @@
5959
},
6060
"url": "https://packages.unity.com"
6161
},
62+
"com.unity.textmeshpro": {
63+
"version": "3.0.9",
64+
"depth": 0,
65+
"source": "registry",
66+
"dependencies": {
67+
"com.unity.ugui": "1.0.0"
68+
},
69+
"url": "https://packages.unity.com"
70+
},
6271
"com.unity.timeline": {
6372
"version": "1.8.7",
6473
"depth": 0,
@@ -100,12 +109,6 @@
100109
"com.unity.modules.imgui": "1.0.0"
101110
}
102111
},
103-
"com.unity.modules.accessibility": {
104-
"version": "1.0.0",
105-
"depth": 0,
106-
"source": "builtin",
107-
"dependencies": {}
108-
},
109112
"com.unity.modules.ai": {
110113
"version": "1.0.0",
111114
"depth": 0,
@@ -153,12 +156,6 @@
153156
"com.unity.modules.animation": "1.0.0"
154157
}
155158
},
156-
"com.unity.modules.hierarchycore": {
157-
"version": "1.0.0",
158-
"depth": 1,
159-
"source": "builtin",
160-
"dependencies": {}
161-
},
162159
"com.unity.modules.imageconversion": {
163160
"version": "1.0.0",
164161
"depth": 0,
@@ -247,8 +244,7 @@
247244
"dependencies": {
248245
"com.unity.modules.ui": "1.0.0",
249246
"com.unity.modules.imgui": "1.0.0",
250-
"com.unity.modules.jsonserialize": "1.0.0",
251-
"com.unity.modules.hierarchycore": "1.0.0"
247+
"com.unity.modules.jsonserialize": "1.0.0"
252248
}
253249
},
254250
"com.unity.modules.umbra": {

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 6000.0.14f1
2-
m_EditorVersionWithRevision: 6000.0.14f1 (e12ab2d6a089)
1+
m_EditorVersion: 2022.3.17f1
2+
m_EditorVersionWithRevision: 2022.3.17f1 (4fc78088f837)

0 commit comments

Comments
 (0)