diff --git a/minimalproject/Packages/packages-lock.json b/minimalproject/Packages/packages-lock.json index f0d0011699..de84d1b222 100644 --- a/minimalproject/Packages/packages-lock.json +++ b/minimalproject/Packages/packages-lock.json @@ -1,11 +1,12 @@ { "dependencies": { "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.18", "depth": 2, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -61,12 +62,12 @@ "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.4.0", + "version": "1.5.0", "depth": 1, "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://packages.unity.com" @@ -79,7 +80,7 @@ }, "com.unity.modules.jsonserialize": { "version": "1.0.0", - "depth": 4, + "depth": 3, "source": "builtin", "dependencies": {} } diff --git a/minimalproject/ProjectSettings/ProjectVersion.txt b/minimalproject/ProjectSettings/ProjectVersion.txt index 9cd738f3af..dfc6bc9958 100644 --- a/minimalproject/ProjectSettings/ProjectVersion.txt +++ b/minimalproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.28f1 -m_EditorVersionWithRevision: 2021.3.28f1 (232e59c3f087) +m_EditorVersion: 2021.3.48f1 +m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012) diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index d1845d58f5..8d09d0ccac 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -1,44 +1,44 @@ { - "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates", - "dependencies": { - "com.unity.ide.rider": "3.0.7", - "com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.0", - "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "1.1.31", - "com.unity.test-framework.performance": "2.8.0-preview", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, - "testables": [ - "com.unity.netcode.gameobjects" - ] + "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.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.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "testables": [ + "com.unity.netcode.gameobjects" + ] } diff --git a/testproject-tools-integration/Packages/packages-lock.json b/testproject-tools-integration/Packages/packages-lock.json index 5e567caefa..b2b980f007 100644 --- a/testproject-tools-integration/Packages/packages-lock.json +++ b/testproject-tools-integration/Packages/packages-lock.json @@ -1,20 +1,21 @@ { "dependencies": { "com.unity.burst": { - "version": "1.6.4", + "version": "1.8.18", "depth": 2, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "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" }, "com.unity.collections": { - "version": "1.2.3", + "version": "1.2.4", "depth": 2, "source": "registry", "dependencies": { - "com.unity.burst": "1.6.4", + "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" @@ -27,7 +28,7 @@ "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.ide.rider": { - "version": "3.0.7", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -36,7 +37,7 @@ "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.mathematics": { - "version": "1.2.5", + "version": "1.2.6", "depth": 2, "source": "registry", "dependencies": {}, @@ -61,7 +62,7 @@ "source": "local", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.1" + "com.unity.transport": "1.4.0" } }, "com.unity.nuget.mono-cecil": { @@ -71,22 +72,8 @@ "dependencies": {}, "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, - "com.unity.nuget.newtonsoft-json": { - "version": "2.0.0", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" - }, - "com.unity.profiling.core": { - "version": "1.0.0-pre.1", - "depth": 1, - "source": "registry", - "dependencies": {}, - "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" - }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -107,13 +94,13 @@ "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, "com.unity.transport": { - "version": "1.3.1", + "version": "1.5.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.collections": "1.2.3", - "com.unity.burst": "1.6.4", - "com.unity.mathematics": "1.2.5" + "com.unity.collections": "1.2.4", + "com.unity.burst": "1.6.6", + "com.unity.mathematics": "1.2.6" }, "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates" }, diff --git a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt index dd7e0b04f1..dfc6bc9958 100644 --- a/testproject-tools-integration/ProjectSettings/ProjectVersion.txt +++ b/testproject-tools-integration/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.40f1 -m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1) +m_EditorVersion: 2021.3.48f1 +m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012) diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 427d544b3e..015b106e47 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -2,14 +2,14 @@ "dependencies": { "com.unity.addressables": "1.21.9", "com.unity.ai.navigation": "1.1.1", - "com.unity.collab-proxy": "1.17.7", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", + "com.unity.collab-proxy": "2.6.0", + "com.unity.ide.rider": "3.0.34", + "com.unity.ide.visualstudio": "2.0.22", "com.unity.mathematics": "1.2.6", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.package-validation-suite": "0.49.0-preview", - "com.unity.services.authentication": "2.4.0", - "com.unity.services.core": "1.8.1", + "com.unity.services.authentication": "2.7.4", + "com.unity.services.core": "1.14.0", "com.unity.services.relay": "1.0.5", "com.unity.test-framework": "1.3.3", "com.unity.test-framework.performance": "2.8.1-preview", diff --git a/testproject/Packages/packages-lock.json b/testproject/Packages/packages-lock.json index 5c50733307..b6da7ab69b 100644 --- a/testproject/Packages/packages-lock.json +++ b/testproject/Packages/packages-lock.json @@ -5,11 +5,11 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.scriptablebuildpipeline": "1.21.3", "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.scriptablebuildpipeline": "1.21.3", "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" @@ -24,21 +24,20 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.6.6", + "version": "1.8.18", "depth": 2, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "1.17.7", + "version": "2.6.0", "depth": 0, "source": "registry", - "dependencies": { - "com.unity.services.core": "1.0.1" - }, + "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.collections": { @@ -59,7 +58,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -68,7 +67,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -89,7 +88,7 @@ "source": "local", "dependencies": { "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.3.4" + "com.unity.transport": "1.4.0" } }, "com.unity.nuget.mono-cecil": { @@ -100,7 +99,7 @@ "url": "https://packages.unity.com" }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", + "version": "3.2.1", "depth": 1, "source": "registry", "dependencies": {}, @@ -123,38 +122,38 @@ "url": "https://packages.unity.com" }, "com.unity.services.authentication": { - "version": "2.4.0", + "version": "2.7.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.core": "1.7.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.5", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.8.1", + "version": "1.14.0", "depth": 0, "source": "registry", "dependencies": { - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.services.qos": { - "version": "1.1.0", + "version": "1.3.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.services.core": "1.4.0", - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.collections": "1.2.4", + "com.unity.services.core": "1.12.4", "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.services.authentication": "2.0.0", - "com.unity.collections": "1.2.4" + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.authentication": "2.0.0" }, "url": "https://packages.unity.com" }, @@ -163,16 +162,16 @@ "depth": 0, "source": "registry", "dependencies": { - "com.unity.services.core": "1.4.0", - "com.unity.services.authentication": "2.0.0", + "com.unity.transport": "1.3.0", "com.unity.services.qos": "1.1.0", + "com.unity.services.core": "1.4.0", + "com.unity.nuget.newtonsoft-json": "3.0.2", "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.services.authentication": "2.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.nuget.newtonsoft-json": "3.0.2", - "com.unity.transport": "1.3.0" + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -211,20 +210,20 @@ "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.transport": { - "version": "1.3.4", + "version": "1.5.0", "depth": 1, "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://packages.unity.com" diff --git a/testproject/ProjectSettings/ProjectVersion.txt b/testproject/ProjectSettings/ProjectVersion.txt index dd7e0b04f1..dfc6bc9958 100644 --- a/testproject/ProjectSettings/ProjectVersion.txt +++ b/testproject/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.40f1 -m_EditorVersionWithRevision: 2020.3.40f1 (ba48d4efcef1) +m_EditorVersion: 2021.3.48f1 +m_EditorVersionWithRevision: 2021.3.48f1 (563f33a39012)