Merge pull request Unity-Technologies#5167 from Unity-Technologies/ML…

…A-1804-add-2021-tests

[MLA-1804] Update min version 2019.4, add 2021.1 tests

.yamato/com.unity.ml-agents-pack.yml

@@ -7,7 +7,7 @@ pack:
   commands:
     - |
       python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
-      unity-downloader-cli -u 2018.4 -c editor --wait --fast
+      unity-downloader-cli -u 2019.4 -c editor --wait --fast
       ./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -
       npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
       upm-ci project pack --project-path Project

.yamato/com.unity.ml-agents-test.yml

@@ -1,18 +1,17 @@
 test_editors:
-  - version: 2018.4
-    # 2018.4 doesn't support code-coverage
-    enableCodeCoverage: !!bool false
-    # We want some scene tests to run in the DevProject, but packages there only support 2019+
-    testProject: Project
-    enableNoDefaultPackages: !!bool false
   - version: 2019.4
     enableCodeCoverage: !!bool true
-    testProject: DevProject
+    # We want some scene tests to run in the DevProject, but packages there only support 2020+
+    testProject: Project
     enableNoDefaultPackages: !!bool true
   - version: 2020.2
     enableCodeCoverage: !!bool true
     testProject: DevProject
     enableNoDefaultPackages: !!bool true
+  - version: 2021.1
+    enableCodeCoverage: !!bool true
+    testProject: DevProject
+    enableNoDefaultPackages: !!bool true
 
 trunk_editor:
   - version: trunk

.yamato/test_versions.metafile

@@ -3,9 +3,9 @@
 # For each "other" test, we only run it against a single version of the
 # editor to reduce the number of yamato jobs
 test_editors:
-  - version: 2018.4
-    extra_test: llapi
   - version: 2019.4
     extra_test: gym
-  - version: 2020.2
+  - version: 2020.3
     extra_test: sensor
+  - version: 2021.1
+    extra_test: llapi

DevProject/Packages/manifest.json

@@ -3,23 +3,24 @@
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
     "com.unity.ads": "3.6.1",
-    "com.unity.analytics": "3.3.5",
+    "com.unity.analytics": "3.5.3",
     "com.unity.coding": "0.1.0-preview.13",
-    "com.unity.collab-proxy": "1.2.16",
-    "com.unity.ide.rider": "1.1.4",
+    "com.unity.collab-proxy": "1.3.9",
+    "com.unity.ide.rider": "2.0.7",
+    "com.unity.ide.visualstudio": "2.0.7",
     "com.unity.ide.vscode": "1.2.3",
     "com.unity.inputsystem": "1.1.0-preview.3",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
     "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
     "com.unity.multiplayer-hlapi": "1.0.8",
     "com.unity.package-manager-doctools": "1.7.0-preview",
     "com.unity.package-validation-suite": "0.19.0-preview",
-    "com.unity.purchasing": "2.2.1",
+    "com.unity.purchasing": "2.2.2",
     "com.unity.test-framework": "1.1.22",
     "com.unity.test-framework.performance": "2.2.0-preview",
     "com.unity.testtools.codecoverage": "1.0.0-pre.3",
-    "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.2.12",
+    "com.unity.textmeshpro": "3.0.1",
+    "com.unity.timeline": "1.4.6",
     "com.unity.ugui": "1.0.0",
     "com.unity.xr.legacyinputhelpers": "2.1.7",
     "com.unity.modules.ai": "1.0.0",

DevProject/Packages/packages-lock.json

@@ -22,7 +22,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.analytics": {
-      "version": "3.3.5",
+      "version": "3.5.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -31,7 +31,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.barracuda": {
-      "version": "1.3.1-preview",
+      "version": "1.3.2-preview",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -60,7 +60,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.collab-proxy": {
-      "version": "1.2.16",
+      "version": "1.3.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -74,14 +74,23 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.ide.rider": {
-      "version": "1.1.4",
+      "version": "2.0.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.1"
       },
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
+    "com.unity.ide.visualstudio": {
+      "version": "2.0.7",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.9"
+      },
+      "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
+    },
     "com.unity.ide.vscode": {
       "version": "1.2.3",
       "depth": 0,
@@ -108,20 +117,19 @@
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.barracuda": "1.3.1-preview",
+        "com.unity.barracuda": "1.3.2-preview",
         "com.unity.modules.imageconversion": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.physics2d": "1.0.0",
-        "com.unity.modules.unityanalytics": "1.0.0"
+        "com.unity.modules.physics2d": "1.0.0"
       }
     },
     "com.unity.ml-agents.extensions": {
       "version": "file:../../com.unity.ml-agents.extensions",
       "depth": 0,
       "source": "local",
       "dependencies": {
-        "com.unity.ml-agents": "1.8.0-preview"
+        "com.unity.ml-agents": "2.0.0-exp.1"
       }
     },
     "com.unity.multiplayer-hlapi": {
@@ -169,7 +177,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.purchasing": {
-      "version": "2.2.1",
+      "version": "2.2.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -216,7 +224,7 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.textmeshpro": {
-      "version": "2.0.1",
+      "version": "3.0.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -225,10 +233,15 @@
       "url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.timeline": {
-      "version": "1.2.12",
+      "version": "1.4.6",
       "depth": 0,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "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://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
     },
     "com.unity.ugui": {
@@ -406,6 +419,18 @@
       "depth": 0,
       "source": "builtin",
       "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.uielementsnative": "1.0.0"
+      }
+    },
+    "com.unity.modules.uielementsnative": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       }

DevProject/ProjectSettings/EditorBuildSettings.asset

@@ -8,4 +8,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
     guid: 9bafc50b1e55b43b2b1ae9620f1f8311
-  m_configObjects: {}
+  m_configObjects:
+    com.unity.ml-agents.settings: {fileID: 11400000, guid: 7017f4eb06bef4889a3608a54b1cc59e,
+      type: 2}

DevProject/ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2019.4.20f1
-m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa)
+m_EditorVersion: 2020.3.0f1
+m_EditorVersionWithRevision: 2020.3.0f1 (c7b5465681fb)

Project/Packages/manifest.json

@@ -1,12 +1,22 @@
 {
   "dependencies": {
-    "com.unity.ads": "2.0.8",
-    "com.unity.collab-proxy": "1.2.15",
+    "com.unity.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "3.6.1",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ide.rider": "1.1.4",
+    "com.unity.ide.vscode": "1.2.3",
     "com.unity.ml-agents": "file:../../com.unity.ml-agents",
     "com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
-    "com.unity.package-manager-ui": "2.0.13",
-    "com.unity.textmeshpro": "1.4.1",
+    "com.unity.multiplayer-hlapi": "1.0.8",
+    "com.unity.nuget.newtonsoft-json": "2.0.0",
+    "com.unity.test-framework": "1.1.22",
+    "com.unity.textmeshpro": "2.0.1",
+    "com.unity.timeline": "1.2.6",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.7",
     "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",
@@ -35,8 +45,7 @@
     "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",
-    "com.unity.nuget.newtonsoft-json": "2.0.0"
+    "com.unity.modules.xr": "1.0.0"
   },
   "testables": [
     "com.unity.ml-agents",