Skip to content

Commit 504654a

Browse files
nowsprintingnowsprinting
committed
Upgrade Unity to 6000.0.50f1
1 parent bb948d0 commit 504654a

File tree

9 files changed

+455
-76
lines changed

9 files changed

+455
-76
lines changed

‎Assets/InputSystemExample/Scripts/Runtime/Input/PlayerInputActions.cs‎

Lines changed: 183 additions & 1 deletion
Large diffs are not rendered by default.

‎Packages/manifest.json‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,19 @@
77
"com.nowsprinting.test-helper.input": "1.0.0",
88
"com.nowsprinting.test-helper.monkey": "0.5.1",
99
"com.nowsprinting.test-helper.random": "0.2.0",
10-
"com.unity.collab-proxy": "1.14.18",
11-
"com.unity.ide.rider": "3.0.34",
12-
"com.unity.ide.visualstudio": "2.0.22",
13-
"com.unity.inputsystem": "1.7.0",
14-
"com.unity.test-framework": "1.4.6",
10+
"com.unity.ai.navigation": "2.0.7",
11+
"com.unity.collab-proxy": "2.8.2",
12+
"com.unity.ide.rider": "3.0.36",
13+
"com.unity.ide.visualstudio": "2.0.23",
14+
"com.unity.inputsystem": "1.14.0",
15+
"com.unity.multiplayer.center": "1.0.0",
16+
"com.unity.test-framework": "1.5.1",
1517
"com.unity.testframework.graphics": "7.17.0-exp.1",
16-
"com.unity.testtools.codecoverage": "1.2.4",
17-
"com.unity.textmeshpro": "2.1.6",
18-
"com.unity.timeline": "1.2.18",
19-
"com.unity.ugui": "1.0.0",
18+
"com.unity.testtools.codecoverage": "1.2.6",
19+
"com.unity.timeline": "1.8.7",
20+
"com.unity.ugui": "2.0.0",
2021
"net.tnrd.nsubstitute": "4.2.2",
22+
"com.unity.modules.accessibility": "1.0.0",
2123
"com.unity.modules.ai": "1.0.0",
2224
"com.unity.modules.androidjni": "1.0.0",
2325
"com.unity.modules.animation": "1.0.0",

‎Packages/packages-lock.json‎

Lines changed: 75 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -62,32 +62,42 @@
6262
"url": "https://package.openupm.com"
6363
},
6464
"com.unity.addressables": {
65-
"version": "1.17.15",
65+
"version": "2.5.0",
6666
"depth": 1,
6767
"source": "registry",
6868
"dependencies": {
69+
"com.unity.profiling.core": "1.0.2",
70+
"com.unity.test-framework": "1.4.5",
6971
"com.unity.modules.assetbundle": "1.0.0",
7072
"com.unity.modules.jsonserialize": "1.0.0",
7173
"com.unity.modules.imageconversion": "1.0.0",
7274
"com.unity.modules.unitywebrequest": "1.0.0",
73-
"com.unity.scriptablebuildpipeline": "1.17.0",
75+
"com.unity.scriptablebuildpipeline": "2.4.0",
7476
"com.unity.modules.unitywebrequestassetbundle": "1.0.0"
7577
},
7678
"url": "https://packages.unity.com"
7779
},
80+
"com.unity.ai.navigation": {
81+
"version": "2.0.7",
82+
"depth": 0,
83+
"source": "registry",
84+
"dependencies": {
85+
"com.unity.modules.ai": "1.0.0"
86+
},
87+
"url": "https://packages.unity.com"
88+
},
7889
"com.unity.collab-proxy": {
79-
"version": "1.14.18",
90+
"version": "2.8.2",
8091
"depth": 0,
8192
"source": "registry",
8293
"dependencies": {},
8394
"url": "https://packages.unity.com"
8495
},
8596
"com.unity.ext.nunit": {
86-
"version": "2.0.3",
97+
"version": "2.0.5",
8798
"depth": 1,
88-
"source": "registry",
89-
"dependencies": {},
90-
"url": "https://packages.unity.com"
99+
"source": "builtin",
100+
"dependencies": {}
91101
},
92102
"com.unity.external.test-protocol": {
93103
"version": "1.0.0-preview",
@@ -99,7 +109,7 @@
99109
"url": "https://packages.unity.com"
100110
},
101111
"com.unity.ide.rider": {
102-
"version": "3.0.34",
112+
"version": "3.0.36",
103113
"depth": 0,
104114
"source": "registry",
105115
"dependencies": {
@@ -108,7 +118,7 @@
108118
"url": "https://packages.unity.com"
109119
},
110120
"com.unity.ide.visualstudio": {
111-
"version": "2.0.22",
121+
"version": "2.0.23",
112122
"depth": 0,
113123
"source": "registry",
114124
"dependencies": {
@@ -117,52 +127,62 @@
117127
"url": "https://packages.unity.com"
118128
},
119129
"com.unity.inputsystem": {
120-
"version": "1.7.0",
130+
"version": "1.14.0",
121131
"depth": 0,
122132
"source": "registry",
123133
"dependencies": {
124134
"com.unity.modules.uielements": "1.0.0"
125135
},
126136
"url": "https://packages.unity.com"
127137
},
138+
"com.unity.multiplayer.center": {
139+
"version": "1.0.0",
140+
"depth": 0,
141+
"source": "builtin",
142+
"dependencies": {
143+
"com.unity.modules.uielements": "1.0.0"
144+
}
145+
},
128146
"com.unity.nuget.newtonsoft-json": {
129-
"version": "2.0.0",
147+
"version": "3.2.1",
130148
"depth": 1,
131149
"source": "registry",
132150
"dependencies": {},
133151
"url": "https://packages.unity.com"
134152
},
135-
"com.unity.scriptablebuildpipeline": {
136-
"version": "1.17.0",
153+
"com.unity.profiling.core": {
154+
"version": "1.0.2",
137155
"depth": 2,
138156
"source": "registry",
139157
"dependencies": {},
140158
"url": "https://packages.unity.com"
141159
},
142-
"com.unity.settings-manager": {
143-
"version": "1.0.1",
144-
"depth": 1,
160+
"com.unity.scriptablebuildpipeline": {
161+
"version": "2.4.0",
162+
"depth": 2,
145163
"source": "registry",
146-
"dependencies": {},
164+
"dependencies": {
165+
"com.unity.test-framework": "1.4.5",
166+
"com.unity.modules.assetbundle": "1.0.0"
167+
},
147168
"url": "https://packages.unity.com"
148169
},
149-
"com.unity.subsystemregistration": {
150-
"version": "1.0.6",
151-
"depth": 2,
170+
"com.unity.settings-manager": {
171+
"version": "2.1.0",
172+
"depth": 1,
152173
"source": "registry",
153174
"dependencies": {},
154175
"url": "https://packages.unity.com"
155176
},
156177
"com.unity.test-framework": {
157-
"version": "1.4.6",
178+
"version": "1.5.1",
158179
"depth": 0,
159-
"source": "registry",
180+
"source": "builtin",
160181
"dependencies": {
161182
"com.unity.ext.nunit": "2.0.3",
162183
"com.unity.modules.imgui": "1.0.0",
163184
"com.unity.modules.jsonserialize": "1.0.0"
164-
},
165-
"url": "https://packages.unity.com"
185+
}
166186
},
167187
"com.unity.testframework.graphics": {
168188
"version": "7.17.0-exp.1",
@@ -182,7 +202,7 @@
182202
"url": "https://packages.unity.com"
183203
},
184204
"com.unity.testtools.codecoverage": {
185-
"version": "1.2.4",
205+
"version": "1.2.6",
186206
"depth": 0,
187207
"source": "registry",
188208
"dependencies": {
@@ -191,17 +211,8 @@
191211
},
192212
"url": "https://packages.unity.com"
193213
},
194-
"com.unity.textmeshpro": {
195-
"version": "2.1.6",
196-
"depth": 0,
197-
"source": "registry",
198-
"dependencies": {
199-
"com.unity.ugui": "1.0.0"
200-
},
201-
"url": "https://packages.unity.com"
202-
},
203214
"com.unity.timeline": {
204-
"version": "1.2.18",
215+
"version": "1.8.7",
205216
"depth": 0,
206217
"source": "registry",
207218
"dependencies": {
@@ -213,16 +224,25 @@
213224
"url": "https://packages.unity.com"
214225
},
215226
"com.unity.ugui": {
216-
"version": "1.0.0",
227+
"version": "2.0.0",
217228
"depth": 0,
218229
"source": "builtin",
219230
"dependencies": {
220231
"com.unity.modules.ui": "1.0.0",
221232
"com.unity.modules.imgui": "1.0.0"
222233
}
223234
},
235+
"com.unity.xr.core-utils": {
236+
"version": "2.5.2",
237+
"depth": 2,
238+
"source": "registry",
239+
"dependencies": {
240+
"com.unity.modules.xr": "1.0.0"
241+
},
242+
"url": "https://packages.unity.com"
243+
},
224244
"com.unity.xr.legacyinputhelpers": {
225-
"version": "2.1.9",
245+
"version": "2.1.12",
226246
"depth": 1,
227247
"source": "registry",
228248
"dependencies": {
@@ -232,15 +252,15 @@
232252
"url": "https://packages.unity.com"
233253
},
234254
"com.unity.xr.management": {
235-
"version": "4.0.5",
255+
"version": "4.5.1",
236256
"depth": 1,
237257
"source": "registry",
238258
"dependencies": {
239259
"com.unity.modules.vr": "1.0.0",
240260
"com.unity.modules.xr": "1.0.0",
261+
"com.unity.xr.core-utils": "2.2.1",
241262
"com.unity.modules.subsystems": "1.0.0",
242-
"com.unity.subsystemregistration": "1.0.6",
243-
"com.unity.xr.legacyinputhelpers": "2.1.7"
263+
"com.unity.xr.legacyinputhelpers": "2.1.11"
244264
},
245265
"url": "https://packages.unity.com"
246266
},
@@ -251,6 +271,12 @@
251271
"dependencies": {},
252272
"url": "https://package.openupm.com"
253273
},
274+
"com.unity.modules.accessibility": {
275+
"version": "1.0.0",
276+
"depth": 0,
277+
"source": "builtin",
278+
"dependencies": {}
279+
},
254280
"com.unity.modules.ai": {
255281
"version": "1.0.0",
256282
"depth": 0,
@@ -298,6 +324,12 @@
298324
"com.unity.modules.animation": "1.0.0"
299325
}
300326
},
327+
"com.unity.modules.hierarchycore": {
328+
"version": "1.0.0",
329+
"depth": 1,
330+
"source": "builtin",
331+
"dependencies": {}
332+
},
301333
"com.unity.modules.imageconversion": {
302334
"version": "1.0.0",
303335
"depth": 0,
@@ -384,8 +416,10 @@
384416
"depth": 0,
385417
"source": "builtin",
386418
"dependencies": {
419+
"com.unity.modules.ui": "1.0.0",
387420
"com.unity.modules.imgui": "1.0.0",
388-
"com.unity.modules.jsonserialize": "1.0.0"
421+
"com.unity.modules.jsonserialize": "1.0.0",
422+
"com.unity.modules.hierarchycore": "1.0.0"
389423
}
390424
},
391425
"com.unity.modules.umbra": {

‎ProjectSettings/MemorySettings.asset‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

‎ProjectSettings/MultiplayerManager.asset‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_StrippingTypes: {}

‎ProjectSettings/PackageManagerSettings.asset‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,25 @@ MonoBehaviour:
1212
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
1313
m_Name:
1414
m_EditorClassIdentifier:
15+
m_EnablePreReleasePackages: 0
16+
m_AdvancedSettingsExpanded: 1
1517
m_ScopedRegistriesSettingsExpanded: 1
18+
m_SeeAllPackageVersions: 0
19+
m_DismissPreviewPackagesInUse: 0
1620
oneTimeWarningShown: 0
21+
oneTimeDeprecatedPopUpShown: 0
1722
m_Registries:
1823
- m_Id: main
1924
m_Name:
2025
m_Url: https://packages.unity.com
2126
m_Scopes: []
2227
m_IsDefault: 1
23-
- m_Id: scoped:package.openupm.com
28+
m_Capabilities: 7
29+
m_ConfigSource: 0
30+
m_Compliance:
31+
m_Status: 0
32+
m_Violations: []
33+
- m_Id: scoped:project:package.openupm.com
2434
m_Name: package.openupm.com
2535
m_Url: https://package.openupm.com
2636
m_Scopes:
@@ -29,26 +39,16 @@ MonoBehaviour:
2939
- com.openupm
3040
- net.tnrd.nsubstitute
3141
m_IsDefault: 0
32-
m_UserSelectedRegistryName:
42+
m_Capabilities: 0
43+
m_ConfigSource: 4
44+
m_Compliance:
45+
m_Status: 0
46+
m_Violations: []
47+
m_UserSelectedRegistryName: package.openupm.com
3348
m_UserAddingNewScopedRegistry: 0
3449
m_RegistryInfoDraft:
35-
m_ErrorMessage:
36-
m_Original:
37-
m_Id: scoped:package.openupm.com
38-
m_Name: package.openupm.com
39-
m_Url: https://package.openupm.com
40-
m_Scopes:
41-
- com.cysharp
42-
- com.nowsprinting
43-
- com.openupm
44-
- net.tnrd.nsubstitute
45-
m_IsDefault: 0
4650
m_Modified: 0
47-
m_Name: package.openupm.com
48-
m_Url: https://package.openupm.com
49-
m_Scopes:
50-
- com.cysharp
51-
- com.nowsprinting
52-
- com.openupm
53-
- net.tnrd.nsubstitute
54-
m_SelectedScopeIndex: 0
51+
m_ErrorMessage:
52+
m_UserModificationsInstanceId: -870
53+
m_OriginalInstanceId: -874
54+
m_LoadAssets: 0

0 commit comments

Comments
 (0)