Skip to content

Commit c9270e9

Browse files
keveleighkeveleigh
authored
Update 4.0 packages to Unity 2022.3 min version (#1003)
* Update editor version * Update Unity versions of 4.0 packages * Update AndroidXRConfig.cs.meta * Remove 2021-specific #ifs * Min version to 2022.3.6f1 * Update CHANGELOGs
1 parent b64c208 commit c9270e9

20 files changed

Lines changed: 81 additions & 86 deletions

File tree

‎UnityProjects/MRTKDevTemplate/Packages/manifest.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,26 @@
55
"com.microsoft.mrtk.graphicstools.unity": "0.8.0",
66
"com.microsoft.mrtk.tts.windows": "1.0.4",
77
"com.microsoft.spatialaudio.spatializer.unity": "2.0.55",
8+
"com.unity.ai.navigation": "1.1.5",
89
"com.unity.asset-store-validation": "0.5.1",
910
"com.unity.cloud.gltfast": "6.10.1",
1011
"com.unity.cloud.ktx": "3.4.5",
11-
"com.unity.collab-proxy": "2.0.4",
12-
"com.unity.ide.rider": "3.0.21",
13-
"com.unity.ide.visualstudio": "2.0.18",
12+
"com.unity.collab-proxy": "2.6.0",
13+
"com.unity.ide.rider": "3.0.34",
14+
"com.unity.ide.visualstudio": "2.0.22",
1415
"com.unity.ide.vscode": "1.2.5",
15-
"com.unity.inputsystem": "1.6.1",
16-
"com.unity.mobile.android-logcat": "1.3.2",
16+
"com.unity.inputsystem": "1.11.2",
17+
"com.unity.mobile.android-logcat": "1.4.3",
1718
"com.unity.performance.profile-analyzer": "1.2.2",
1819
"com.unity.test-framework": "1.1.33",
19-
"com.unity.textmeshpro": "3.0.6",
20-
"com.unity.timeline": "1.6.5",
20+
"com.unity.textmeshpro": "3.0.7",
21+
"com.unity.timeline": "1.7.6",
2122
"com.unity.ugui": "1.0.0",
22-
"com.unity.xr.arcore": "5.0.5",
23-
"com.unity.xr.arfoundation": "5.0.5",
23+
"com.unity.xr.arcore": "5.1.5",
24+
"com.unity.xr.arfoundation": "5.1.5",
2425
"com.unity.xr.interaction.toolkit": "3.0.1",
2526
"com.unity.xr.management": "4.4.0",
26-
"com.unity.xr.openxr": "1.7.0",
27+
"com.unity.xr.openxr": "1.13.2",
2728
"org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
2829
"org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",
2930
"org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core",

‎UnityProjects/MRTKDevTemplate/Packages/packages-lock.json‎

Lines changed: 39 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,15 @@
4040
"dependencies": {},
4141
"url": "https://packages.unity.com"
4242
},
43+
"com.unity.ai.navigation": {
44+
"version": "1.1.5",
45+
"depth": 0,
46+
"source": "registry",
47+
"dependencies": {
48+
"com.unity.modules.ai": "1.0.0"
49+
},
50+
"url": "https://packages.unity.com"
51+
},
4352
"com.unity.asset-store-validation": {
4453
"version": "0.5.1",
4554
"depth": 0,
@@ -50,7 +59,7 @@
5059
"url": "https://packages.unity.com"
5160
},
5261
"com.unity.burst": {
53-
"version": "1.8.4",
62+
"version": "1.8.7",
5463
"depth": 1,
5564
"source": "registry",
5665
"dependencies": {
@@ -81,7 +90,7 @@
8190
"url": "https://packages.unity.com"
8291
},
8392
"com.unity.collab-proxy": {
84-
"version": "2.0.4",
93+
"version": "2.6.0",
8594
"depth": 0,
8695
"source": "registry",
8796
"dependencies": {},
@@ -97,6 +106,13 @@
97106
},
98107
"url": "https://packages.unity.com"
99108
},
109+
"com.unity.editorcoroutines": {
110+
"version": "1.0.0",
111+
"depth": 1,
112+
"source": "registry",
113+
"dependencies": {},
114+
"url": "https://packages.unity.com"
115+
},
100116
"com.unity.ext.nunit": {
101117
"version": "1.0.6",
102118
"depth": 1,
@@ -105,7 +121,7 @@
105121
"url": "https://packages.unity.com"
106122
},
107123
"com.unity.ide.rider": {
108-
"version": "3.0.21",
124+
"version": "3.0.34",
109125
"depth": 0,
110126
"source": "registry",
111127
"dependencies": {
@@ -114,7 +130,7 @@
114130
"url": "https://packages.unity.com"
115131
},
116132
"com.unity.ide.visualstudio": {
117-
"version": "2.0.18",
133+
"version": "2.0.22",
118134
"depth": 0,
119135
"source": "registry",
120136
"dependencies": {
@@ -130,8 +146,8 @@
130146
"url": "https://packages.unity.com"
131147
},
132148
"com.unity.inputsystem": {
133-
"version": "1.8.1",
134-
"depth": 1,
149+
"version": "1.11.2",
150+
"depth": 0,
135151
"source": "registry",
136152
"dependencies": {
137153
"com.unity.modules.uielements": "1.0.0"
@@ -146,14 +162,14 @@
146162
"url": "https://packages.unity.com"
147163
},
148164
"com.unity.mobile.android-logcat": {
149-
"version": "1.3.2",
165+
"version": "1.4.3",
150166
"depth": 0,
151167
"source": "registry",
152168
"dependencies": {},
153169
"url": "https://packages.unity.com"
154170
},
155171
"com.unity.nuget.newtonsoft-json": {
156-
"version": "3.2.0",
172+
"version": "3.2.1",
157173
"depth": 1,
158174
"source": "registry",
159175
"dependencies": {},
@@ -178,7 +194,7 @@
178194
"url": "https://packages.unity.com"
179195
},
180196
"com.unity.textmeshpro": {
181-
"version": "3.0.6",
197+
"version": "3.0.7",
182198
"depth": 0,
183199
"source": "registry",
184200
"dependencies": {
@@ -187,7 +203,7 @@
187203
"url": "https://packages.unity.com"
188204
},
189205
"com.unity.timeline": {
190-
"version": "1.6.5",
206+
"version": "1.7.6",
191207
"depth": 0,
192208
"source": "registry",
193209
"dependencies": {
@@ -208,29 +224,30 @@
208224
}
209225
},
210226
"com.unity.xr.arcore": {
211-
"version": "5.0.5",
227+
"version": "5.1.5",
212228
"depth": 0,
213229
"source": "registry",
214230
"dependencies": {
215231
"com.unity.xr.core-utils": "2.1.0",
216232
"com.unity.xr.management": "4.0.1",
217-
"com.unity.xr.arfoundation": "5.0.5",
233+
"com.unity.xr.arfoundation": "5.1.5",
218234
"com.unity.modules.androidjni": "1.0.0",
219235
"com.unity.modules.unitywebrequest": "1.0.0"
220236
},
221237
"url": "https://packages.unity.com"
222238
},
223239
"com.unity.xr.arfoundation": {
224-
"version": "5.0.5",
240+
"version": "5.1.5",
225241
"depth": 0,
226242
"source": "registry",
227243
"dependencies": {
228244
"com.unity.ugui": "1.0.0",
229245
"com.unity.modules.ui": "1.0.0",
230246
"com.unity.inputsystem": "1.3.0",
231247
"com.unity.mathematics": "1.2.5",
232-
"com.unity.xr.core-utils": "2.1.0",
248+
"com.unity.xr.core-utils": "2.2.1",
233249
"com.unity.xr.management": "4.0.1",
250+
"com.unity.editorcoroutines": "1.0.0",
234251
"com.unity.modules.particlesystem": "1.0.0",
235252
"com.unity.modules.unityanalytics": "1.0.0",
236253
"com.unity.modules.unitywebrequest": "1.0.0"
@@ -263,14 +280,14 @@
263280
"depth": 1,
264281
"source": "registry",
265282
"dependencies": {
283+
"com.unity.ugui": "1.0.0",
284+
"com.unity.modules.xr": "1.0.0",
266285
"com.unity.inputsystem": "1.8.1",
267286
"com.unity.mathematics": "1.2.6",
268-
"com.unity.ugui": "1.0.0",
269-
"com.unity.xr.core-utils": "2.2.3",
270287
"com.unity.modules.audio": "1.0.0",
271288
"com.unity.modules.imgui": "1.0.0",
272-
"com.unity.modules.physics": "1.0.0",
273-
"com.unity.modules.xr": "1.0.0"
289+
"com.unity.xr.core-utils": "2.2.3",
290+
"com.unity.modules.physics": "1.0.0"
274291
},
275292
"url": "https://packages.unity.com"
276293
},
@@ -297,12 +314,13 @@
297314
"url": "https://packages.unity.com"
298315
},
299316
"com.unity.xr.openxr": {
300-
"version": "1.7.0",
317+
"version": "1.13.2",
301318
"depth": 0,
302319
"source": "registry",
303320
"dependencies": {
304-
"com.unity.inputsystem": "1.4.4",
305-
"com.unity.xr.management": "4.0.1",
321+
"com.unity.inputsystem": "1.6.3",
322+
"com.unity.xr.core-utils": "2.1.1",
323+
"com.unity.xr.management": "4.4.0",
306324
"com.unity.xr.legacyinputhelpers": "2.1.2"
307325
},
308326
"url": "https://packages.unity.com"
@@ -578,17 +596,6 @@
578596
"version": "1.0.0",
579597
"depth": 0,
580598
"source": "builtin",
581-
"dependencies": {
582-
"com.unity.modules.ui": "1.0.0",
583-
"com.unity.modules.imgui": "1.0.0",
584-
"com.unity.modules.jsonserialize": "1.0.0",
585-
"com.unity.modules.uielementsnative": "1.0.0"
586-
}
587-
},
588-
"com.unity.modules.uielementsnative": {
589-
"version": "1.0.0",
590-
"depth": 1,
591-
"source": "builtin",
592599
"dependencies": {
593600
"com.unity.modules.ui": "1.0.0",
594601
"com.unity.modules.imgui": "1.0.0",

‎UnityProjects/MRTKDevTemplate/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.26f1
2-
m_EditorVersionWithRevision: 2021.3.26f1 (a16dc32e0ff2)
1+
m_EditorVersion: 2022.3.6f1
2+
m_EditorVersionWithRevision: 2022.3.6f1 (b9e6e7e9fa2d)

‎org.mixedrealitytoolkit.core/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
77
### Changed
88

99
* Updated the MRTK Default Profile to use the Unity XR Hands subsystem by default instead of the Microsoft OpenXR Plugin subsystem. [PR #973](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/973)
10+
* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003)
1011

1112
## [4.0.0-development.pre.1] - 2024-07-09
1213

‎org.mixedrealitytoolkit.core/Editor/MRTKPreserveSettings.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,5 @@ string IUnityLinkerProcessor.GenerateAdditionalLinkXmlFile(BuildReport report, U
7474
}
7575

7676
private static string FormatForXml(string value) => value.Replace('+', '/').Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;");
77-
78-
#if !UNITY_2021_2_OR_NEWER
79-
void IUnityLinkerProcessor.OnAfterRun(BuildReport report, UnityLinkerBuildPipelineData data) { }
80-
void IUnityLinkerProcessor.OnBeforeRun(BuildReport report, UnityLinkerBuildPipelineData data) { }
81-
#endif // !UNITY_2021_2_OR_NEWER
8277
}
8378
}

‎org.mixedrealitytoolkit.core/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"bugs": {
1414
"url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues"
1515
},
16-
"unity": "2021.3",
17-
"unityRelease": "26f1",
16+
"unity": "2022.3",
17+
"unityRelease": "6f1",
1818
"documentationUrl": "https://www.mixedrealitytoolkit.org",
1919
"dependencies": {
2020
"com.unity.xr.interaction.toolkit": "3.0.4",

‎org.mixedrealitytoolkit.input/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
1313

1414
* Fixed controller model fallback visualization becoming stuck visible when hands became tracked after initialization. [PR #984](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/984)
1515

16+
### Changed
17+
18+
* Updated the minimum editor version to 2022.3.6f1 [PR #1003](https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/pull/1003)
19+
1620
## [4.0.0-development.pre.1] - 2024-07-16
1721

1822
### Added

‎org.mixedrealitytoolkit.input/Controllers/HandModel.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,7 @@ protected virtual void Awake()
109109
{
110110
modelParent = new GameObject($"[{gameObject.name}] Model Parent").transform;
111111
modelParent.SetParent(transform, false);
112-
#if HAS_SET_LOCAL_POSITION_AND_ROTATION
113112
modelParent.SetLocalPositionAndRotation(Vector3.zero, Quaternion.identity);
114-
#else
115-
modelParent.localPosition = Vector3.zero;
116-
modelParent.localRotation = Quaternion.identity;
117-
#endif
118113
}
119114
}
120115
}

‎org.mixedrealitytoolkit.input/MRTK.Input.asmdef‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,6 @@
4545
"expression": "4.2",
4646
"define": "UNITYXR_MANAGEMENT_PRESENT"
4747
},
48-
{
49-
"name": "Unity",
50-
"expression": "[2021.3.11,2022.1)",
51-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
52-
},
53-
{
54-
"name": "Unity",
55-
"expression": "[2022.1.19,2022.2)",
56-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
57-
},
58-
{
59-
"name": "Unity",
60-
"expression": "2022.2",
61-
"define": "HAS_SET_LOCAL_POSITION_AND_ROTATION"
62-
},
6348
{
6449
"name": "com.unity.xr.openxr",
6550
"expression": "",

‎org.mixedrealitytoolkit.input/Tracking/HandPoseDriver.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,11 @@ private bool TryGetPolyfillDevicePose(out Pose devicePose)
167167
/// <param name="newRotation">The new local rotation to possibly set.</param>
168168
protected virtual void ForceSetLocalTransform(Vector3 newPosition, Quaternion newRotation)
169169
{
170-
#if HAS_SET_LOCAL_POSITION_AND_ROTATION
171170
if (trackingType == TrackingType.RotationAndPosition)
172171
{
173172
transform.SetLocalPositionAndRotation(newPosition, newRotation);
174173
return;
175174
}
176-
#endif
177175

178176
if (trackingType == TrackingType.RotationAndPosition ||
179177
trackingType == TrackingType.RotationOnly)

0 commit comments

Comments
 (0)