Skip to content

Commit a07416e

Browse files
chore: update testprojects v1 x (Unity-Technologies#3286)
* update Migrating down to the LTS version 2021.3.45f1 * update Updating some issues with our manifest and packages used by test projects.
1 parent d7bcfa9 commit a07416e

File tree

8 files changed

+52
-35
lines changed

8 files changed

+52
-35
lines changed

minimalproject/Packages/manifest.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
2-
"dependencies": {
3-
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
4-
},
2+
"dependencies": {
3+
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
4+
"com.unity.transport": "1.5.0"
5+
},
56
"testables": [
67
"com.unity.netcode.gameobjects"
78
]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.48f1
2-
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
1+
m_EditorVersion: 2021.3.45f1
2+
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)

testproject-tools-integration/Packages/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
32
"dependencies": {
43
"com.unity.ide.rider": "3.0.34",
5-
"com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.1",
4+
"com.unity.multiplayer.tools": "1.1.1",
65
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
76
"com.unity.test-framework": "1.1.33",
87
"com.unity.test-framework.performance": "2.8.0-preview",
8+
"com.unity.transport": "1.5.0",
99
"com.unity.modules.ai": "1.0.0",
1010
"com.unity.modules.androidjni": "1.0.0",
1111
"com.unity.modules.animation": "1.0.0",

testproject-tools-integration/Packages/packages-lock.json

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
"dependencies": {
33
"com.unity.burst": {
44
"version": "1.8.18",
5-
"depth": 2,
5+
"depth": 1,
66
"source": "registry",
77
"dependencies": {
88
"com.unity.mathematics": "1.2.1",
99
"com.unity.modules.jsonserialize": "1.0.0"
1010
},
11-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
11+
"url": "https://packages.unity.com"
1212
},
1313
"com.unity.collections": {
1414
"version": "1.2.4",
15-
"depth": 2,
15+
"depth": 1,
1616
"source": "registry",
1717
"dependencies": {
1818
"com.unity.burst": "1.6.6",
1919
"com.unity.test-framework": "1.1.31"
2020
},
21-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
21+
"url": "https://packages.unity.com"
2222
},
2323
"com.unity.ext.nunit": {
2424
"version": "1.0.6",
2525
"depth": 1,
2626
"source": "registry",
2727
"dependencies": {},
28-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
28+
"url": "https://packages.unity.com"
2929
},
3030
"com.unity.ide.rider": {
3131
"version": "3.0.34",
@@ -34,27 +34,27 @@
3434
"dependencies": {
3535
"com.unity.ext.nunit": "1.0.6"
3636
},
37-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
37+
"url": "https://packages.unity.com"
3838
},
3939
"com.unity.mathematics": {
4040
"version": "1.2.6",
41-
"depth": 2,
41+
"depth": 1,
4242
"source": "registry",
4343
"dependencies": {},
44-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
44+
"url": "https://packages.unity.com"
4545
},
4646
"com.unity.multiplayer.tools": {
47-
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#f935904741c349dc41ba24fda6639041128e8f19",
47+
"version": "1.1.1",
4848
"depth": 0,
49-
"source": "git",
49+
"source": "registry",
5050
"dependencies": {
51+
"com.unity.collections": "1.1.0",
5152
"com.unity.profiling.core": "1.0.0-pre.1",
52-
"com.unity.nuget.newtonsoft-json": "2.0.0",
5353
"com.unity.nuget.mono-cecil": "1.10.1",
54-
"com.unity.collections": "1.1.0",
55-
"com.unity.modules.uielements": "1.0.0"
54+
"com.unity.modules.uielements": "1.0.0",
55+
"com.unity.nuget.newtonsoft-json": "2.0.0"
5656
},
57-
"hash": "f935904741c349dc41ba24fda6639041128e8f19"
57+
"url": "https://packages.unity.com"
5858
},
5959
"com.unity.netcode.gameobjects": {
6060
"version": "file:../../com.unity.netcode.gameobjects",
@@ -70,7 +70,21 @@
7070
"depth": 1,
7171
"source": "registry",
7272
"dependencies": {},
73-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
73+
"url": "https://packages.unity.com"
74+
},
75+
"com.unity.nuget.newtonsoft-json": {
76+
"version": "3.2.1",
77+
"depth": 1,
78+
"source": "registry",
79+
"dependencies": {},
80+
"url": "https://packages.unity.com"
81+
},
82+
"com.unity.profiling.core": {
83+
"version": "1.0.2",
84+
"depth": 1,
85+
"source": "registry",
86+
"dependencies": {},
87+
"url": "https://packages.unity.com"
7488
},
7589
"com.unity.test-framework": {
7690
"version": "1.1.33",
@@ -81,7 +95,7 @@
8195
"com.unity.modules.imgui": "1.0.0",
8296
"com.unity.modules.jsonserialize": "1.0.0"
8397
},
84-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
98+
"url": "https://packages.unity.com"
8599
},
86100
"com.unity.test-framework.performance": {
87101
"version": "2.8.0-preview",
@@ -91,18 +105,18 @@
91105
"com.unity.test-framework": "1.1.0",
92106
"com.unity.modules.jsonserialize": "1.0.0"
93107
},
94-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
108+
"url": "https://packages.unity.com"
95109
},
96110
"com.unity.transport": {
97111
"version": "1.5.0",
98-
"depth": 1,
112+
"depth": 0,
99113
"source": "registry",
100114
"dependencies": {
101-
"com.unity.collections": "1.2.4",
102115
"com.unity.burst": "1.6.6",
116+
"com.unity.collections": "1.2.4",
103117
"com.unity.mathematics": "1.2.6"
104118
},
105-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
119+
"url": "https://packages.unity.com"
106120
},
107121
"com.unity.modules.ai": {
108122
"version": "1.0.0",

testproject-tools-integration/ProjectSettings/PackageManagerSettings.asset

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ MonoBehaviour:
2121
m_Registries:
2222
- m_Id: main
2323
m_Name:
24-
m_Url: https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates
24+
m_Url: https://packages.unity.com
2525
m_Scopes: []
2626
m_IsDefault: 1
27-
m_Capabilities: 0
27+
m_Capabilities: 7
28+
m_ConfigSource: 0
2829
m_UserSelectedRegistryName:
2930
m_UserAddingNewScopedRegistry: 0
3031
m_RegistryInfoDraft:
3132
m_Modified: 0
3233
m_ErrorMessage:
33-
m_UserModificationsInstanceId: -880
34-
m_OriginalInstanceId: -882
34+
m_UserModificationsInstanceId: -822
35+
m_OriginalInstanceId: -824
3536
m_LoadAssets: 0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.48f1
2-
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
1+
m_EditorVersion: 2021.3.45f1
2+
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)

testproject/Packages/manifest.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"com.unity.ide.visualstudio": "2.0.22",
88
"com.unity.mathematics": "1.2.6",
99
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
10+
"com.unity.transport": "1.5.0",
1011
"com.unity.package-validation-suite": "0.49.0-preview",
1112
"com.unity.services.authentication": "2.7.4",
1213
"com.unity.services.core": "1.14.0",
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.3.48f1
2-
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
1+
m_EditorVersion: 2021.3.45f1
2+
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)

0 commit comments

Comments
 (0)