Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions minimalproject/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"dependencies": {
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects"
},
"dependencies": {
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.transport": "1.5.0"
},
"testables": [
"com.unity.netcode.gameobjects"
]
Expand Down
4 changes: 2 additions & 2 deletions minimalproject/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.48f1
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
m_EditorVersion: 2021.3.45f1
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)
4 changes: 2 additions & 2 deletions testproject-tools-integration/Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
"dependencies": {
"com.unity.ide.rider": "3.0.34",
"com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.1",
"com.unity.multiplayer.tools": "1.1.1",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.test-framework": "1.1.33",
"com.unity.test-framework.performance": "2.8.0-preview",
"com.unity.transport": "1.5.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
Expand Down
54 changes: 34 additions & 20 deletions testproject-tools-integration/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,30 @@
"dependencies": {
"com.unity.burst": {
"version": "1.8.18",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.mathematics": "1.2.1",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.collections": {
"version": "1.2.4",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.burst": "1.6.6",
"com.unity.test-framework": "1.1.31"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.ide.rider": {
"version": "3.0.34",
Expand All @@ -34,27 +34,27 @@
"dependencies": {
"com.unity.ext.nunit": "1.0.6"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.6",
"depth": 2,
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.multiplayer.tools": {
"version": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#f935904741c349dc41ba24fda6639041128e8f19",
"version": "1.1.1",
"depth": 0,
"source": "git",
"source": "registry",
"dependencies": {
"com.unity.collections": "1.1.0",
"com.unity.profiling.core": "1.0.0-pre.1",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.nuget.mono-cecil": "1.10.1",
"com.unity.collections": "1.1.0",
"com.unity.modules.uielements": "1.0.0"
"com.unity.modules.uielements": "1.0.0",
"com.unity.nuget.newtonsoft-json": "2.0.0"
},
"hash": "f935904741c349dc41ba24fda6639041128e8f19"
"url": "https://packages.unity.com"
},
"com.unity.netcode.gameobjects": {
"version": "file:../../com.unity.netcode.gameobjects",
Expand All @@ -70,7 +70,21 @@
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.2.1",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.profiling.core": {
"version": "1.0.2",
"depth": 1,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.33",
Expand All @@ -81,7 +95,7 @@
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.test-framework.performance": {
"version": "2.8.0-preview",
Expand All @@ -91,18 +105,18 @@
"com.unity.test-framework": "1.1.0",
"com.unity.modules.jsonserialize": "1.0.0"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.transport": {
"version": "1.5.0",
"depth": 1,
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.collections": "1.2.4",
"com.unity.burst": "1.6.6",
"com.unity.collections": "1.2.4",
"com.unity.mathematics": "1.2.6"
},
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
"url": "https://packages.unity.com"
},
"com.unity.modules.ai": {
"version": "1.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@ MonoBehaviour:
m_Registries:
- m_Id: main
m_Name:
m_Url: https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates
m_Url: https://packages.unity.com
m_Scopes: []
m_IsDefault: 1
m_Capabilities: 0
m_Capabilities: 7
m_ConfigSource: 0
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:
m_Modified: 0
m_ErrorMessage:
m_UserModificationsInstanceId: -880
m_OriginalInstanceId: -882
m_UserModificationsInstanceId: -822
m_OriginalInstanceId: -824
m_LoadAssets: 0
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.48f1
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
m_EditorVersion: 2021.3.45f1
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)
1 change: 1 addition & 0 deletions testproject/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.mathematics": "1.2.6",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.transport": "1.5.0",
"com.unity.package-validation-suite": "0.49.0-preview",
"com.unity.services.authentication": "2.7.4",
"com.unity.services.core": "1.14.0",
Expand Down
4 changes: 2 additions & 2 deletions testproject/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.3.48f1
m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)
m_EditorVersion: 2021.3.45f1
m_EditorVersionWithRevision: 2021.3.45f1 (0da89fac8e79)