Skip to content

Commit b7fcdef

Browse files
michalChrobotmichalChrobot
committed
Merge branch 'NGO-CI-rewrite-for-develop' of https://github.com/Unity-Technologies/com.unity.netcode.gameobjects into NGO-CI-rewrite-for-develop
2 parents 9faa618 + 6dfaa81 commit b7fcdef

File tree

8 files changed

+106
-119
lines changed

8 files changed

+106
-119
lines changed

‎minimalproject/Packages/packages-lock.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"dependencies": {
33
"com.unity.burst": {
4-
"version": "1.6.6",
4+
"version": "1.8.18",
55
"depth": 2,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.mathematics": "1.2.1"
8+
"com.unity.mathematics": "1.2.1",
9+
"com.unity.modules.jsonserialize": "1.0.0"
910
},
1011
"url": "https://packages.unity.com"
1112
},
@@ -61,12 +62,12 @@
6162
"url": "https://packages.unity.com"
6263
},
6364
"com.unity.transport": {
64-
"version": "1.4.0",
65+
"version": "1.5.0",
6566
"depth": 1,
6667
"source": "registry",
6768
"dependencies": {
68-
"com.unity.collections": "1.2.4",
6969
"com.unity.burst": "1.6.6",
70+
"com.unity.collections": "1.2.4",
7071
"com.unity.mathematics": "1.2.6"
7172
},
7273
"url": "https://packages.unity.com"
@@ -79,7 +80,7 @@
7980
},
8081
"com.unity.modules.jsonserialize": {
8182
"version": "1.0.0",
82-
"depth": 4,
83+
"depth": 3,
8384
"source": "builtin",
8485
"dependencies": {}
8586
}

‎minimalproject/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.28f1
2-
m_EditorVersionWithRevision: 2021.3.28f1 (232e59c3f087)
1+
m_EditorVersion: 2021.3.48f1
2+
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)

‎testproject-tools-integration/Packages/manifest.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
{
2-
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
3-
"dependencies": {
4-
"com.unity.ide.rider": "3.0.7",
5-
"com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.0",
6-
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
7-
"com.unity.test-framework": "1.1.31",
8-
"com.unity.test-framework.performance": "2.8.0-preview",
9-
"com.unity.modules.ai": "1.0.0",
10-
"com.unity.modules.androidjni": "1.0.0",
11-
"com.unity.modules.animation": "1.0.0",
12-
"com.unity.modules.assetbundle": "1.0.0",
13-
"com.unity.modules.audio": "1.0.0",
14-
"com.unity.modules.cloth": "1.0.0",
15-
"com.unity.modules.director": "1.0.0",
16-
"com.unity.modules.imageconversion": "1.0.0",
17-
"com.unity.modules.imgui": "1.0.0",
18-
"com.unity.modules.jsonserialize": "1.0.0",
19-
"com.unity.modules.particlesystem": "1.0.0",
20-
"com.unity.modules.physics": "1.0.0",
21-
"com.unity.modules.physics2d": "1.0.0",
22-
"com.unity.modules.screencapture": "1.0.0",
23-
"com.unity.modules.terrain": "1.0.0",
24-
"com.unity.modules.terrainphysics": "1.0.0",
25-
"com.unity.modules.tilemap": "1.0.0",
26-
"com.unity.modules.ui": "1.0.0",
27-
"com.unity.modules.uielements": "1.0.0",
28-
"com.unity.modules.umbra": "1.0.0",
29-
"com.unity.modules.unityanalytics": "1.0.0",
30-
"com.unity.modules.unitywebrequest": "1.0.0",
31-
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
32-
"com.unity.modules.unitywebrequestaudio": "1.0.0",
33-
"com.unity.modules.unitywebrequesttexture": "1.0.0",
34-
"com.unity.modules.unitywebrequestwww": "1.0.0",
35-
"com.unity.modules.vehicles": "1.0.0",
36-
"com.unity.modules.video": "1.0.0",
37-
"com.unity.modules.vr": "1.0.0",
38-
"com.unity.modules.wind": "1.0.0",
39-
"com.unity.modules.xr": "1.0.0"
40-
},
41-
"testables": [
42-
"com.unity.netcode.gameobjects"
43-
]
2+
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
3+
"dependencies": {
4+
"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",
6+
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
7+
"com.unity.test-framework": "1.1.33",
8+
"com.unity.test-framework.performance": "2.8.0-preview",
9+
"com.unity.modules.ai": "1.0.0",
10+
"com.unity.modules.androidjni": "1.0.0",
11+
"com.unity.modules.animation": "1.0.0",
12+
"com.unity.modules.assetbundle": "1.0.0",
13+
"com.unity.modules.audio": "1.0.0",
14+
"com.unity.modules.cloth": "1.0.0",
15+
"com.unity.modules.director": "1.0.0",
16+
"com.unity.modules.imageconversion": "1.0.0",
17+
"com.unity.modules.imgui": "1.0.0",
18+
"com.unity.modules.jsonserialize": "1.0.0",
19+
"com.unity.modules.particlesystem": "1.0.0",
20+
"com.unity.modules.physics": "1.0.0",
21+
"com.unity.modules.physics2d": "1.0.0",
22+
"com.unity.modules.screencapture": "1.0.0",
23+
"com.unity.modules.terrain": "1.0.0",
24+
"com.unity.modules.terrainphysics": "1.0.0",
25+
"com.unity.modules.tilemap": "1.0.0",
26+
"com.unity.modules.ui": "1.0.0",
27+
"com.unity.modules.uielements": "1.0.0",
28+
"com.unity.modules.umbra": "1.0.0",
29+
"com.unity.modules.unityanalytics": "1.0.0",
30+
"com.unity.modules.unitywebrequest": "1.0.0",
31+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
32+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
33+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
34+
"com.unity.modules.unitywebrequestwww": "1.0.0",
35+
"com.unity.modules.vehicles": "1.0.0",
36+
"com.unity.modules.video": "1.0.0",
37+
"com.unity.modules.vr": "1.0.0",
38+
"com.unity.modules.wind": "1.0.0",
39+
"com.unity.modules.xr": "1.0.0"
40+
},
41+
"testables": [
42+
"com.unity.netcode.gameobjects"
43+
]
4444
}

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

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"dependencies": {
33
"com.unity.burst": {
4-
"version": "1.6.4",
4+
"version": "1.8.18",
55
"depth": 2,
66
"source": "registry",
77
"dependencies": {
8-
"com.unity.mathematics": "1.2.1"
8+
"com.unity.mathematics": "1.2.1",
9+
"com.unity.modules.jsonserialize": "1.0.0"
910
},
1011
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
1112
},
1213
"com.unity.collections": {
13-
"version": "1.2.3",
14+
"version": "1.2.4",
1415
"depth": 2,
1516
"source": "registry",
1617
"dependencies": {
17-
"com.unity.burst": "1.6.4",
18+
"com.unity.burst": "1.6.6",
1819
"com.unity.test-framework": "1.1.31"
1920
},
2021
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
@@ -27,7 +28,7 @@
2728
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
2829
},
2930
"com.unity.ide.rider": {
30-
"version": "3.0.7",
31+
"version": "3.0.34",
3132
"depth": 0,
3233
"source": "registry",
3334
"dependencies": {
@@ -36,7 +37,7 @@
3637
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
3738
},
3839
"com.unity.mathematics": {
39-
"version": "1.2.5",
40+
"version": "1.2.6",
4041
"depth": 2,
4142
"source": "registry",
4243
"dependencies": {},
@@ -61,7 +62,7 @@
6162
"source": "local",
6263
"dependencies": {
6364
"com.unity.nuget.mono-cecil": "1.10.1",
64-
"com.unity.transport": "1.3.1"
65+
"com.unity.transport": "1.4.0"
6566
}
6667
},
6768
"com.unity.nuget.mono-cecil": {
@@ -71,22 +72,8 @@
7172
"dependencies": {},
7273
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
7374
},
74-
"com.unity.nuget.newtonsoft-json": {
75-
"version": "2.0.0",
76-
"depth": 1,
77-
"source": "registry",
78-
"dependencies": {},
79-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
80-
},
81-
"com.unity.profiling.core": {
82-
"version": "1.0.0-pre.1",
83-
"depth": 1,
84-
"source": "registry",
85-
"dependencies": {},
86-
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
87-
},
8875
"com.unity.test-framework": {
89-
"version": "1.1.31",
76+
"version": "1.1.33",
9077
"depth": 0,
9178
"source": "registry",
9279
"dependencies": {
@@ -107,13 +94,13 @@
10794
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
10895
},
10996
"com.unity.transport": {
110-
"version": "1.3.1",
97+
"version": "1.5.0",
11198
"depth": 1,
11299
"source": "registry",
113100
"dependencies": {
114-
"com.unity.collections": "1.2.3",
115-
"com.unity.burst": "1.6.4",
116-
"com.unity.mathematics": "1.2.5"
101+
"com.unity.collections": "1.2.4",
102+
"com.unity.burst": "1.6.6",
103+
"com.unity.mathematics": "1.2.6"
117104
},
118105
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
119106
},

‎testproject-tools-integration/ProjectSettings/ProjectVersion.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2020.3.40f1
2-
m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1)
1+
m_EditorVersion: 2021.3.48f1
2+
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)

‎testproject/Packages/manifest.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
"dependencies": {
33
"com.unity.addressables": "1.21.9",
44
"com.unity.ai.navigation": "1.1.1",
5-
"com.unity.collab-proxy": "1.17.7",
6-
"com.unity.ide.rider": "3.0.18",
7-
"com.unity.ide.visualstudio": "2.0.17",
5+
"com.unity.collab-proxy": "2.6.0",
6+
"com.unity.ide.rider": "3.0.34",
7+
"com.unity.ide.visualstudio": "2.0.22",
88
"com.unity.mathematics": "1.2.6",
99
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
1010
"com.unity.package-validation-suite": "0.49.0-preview",
11-
"com.unity.services.authentication": "2.4.0",
12-
"com.unity.services.core": "1.8.1",
11+
"com.unity.services.authentication": "2.7.4",
12+
"com.unity.services.core": "1.14.0",
1313
"com.unity.services.relay": "1.0.5",
1414
"com.unity.test-framework": "1.3.3",
1515
"com.unity.test-framework.performance": "2.8.1-preview",

0 commit comments

Comments
 (0)