Merge branch 'master' into vfx/staging

Author: PaulDemeulenaere

.yamato/_latest_editor_versions_trunk.metafile

@@ -13,8 +13,8 @@ editor_versions:
       updated_at: '2021-02-10 00:54:33.391147'
       version: ''
     Linux:
-      revision: b4a52c80b8a05608dc828d420852877eca12aabf
-      updated_at: '2021-01-31 23:59:54.581483'
+      revision: 1b0d27aa80de4a598d9c6ee60ef5a68aa8e8871e
+      updated_at: '2021-02-05 09:39:54.581483'
       version: ''
     OSX:
       revision: 12ae7e780a96ac077b9bf64efee7ae763a09610d

LocalTestProjects/HDRP_DebugCrossFade_Tests/Packages/manifest.json

@@ -15,7 +15,7 @@
         "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition",
         "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
         "com.unity.test-framework": "1.1.14",
-        "com.unity.testframework.graphics": "7.5.0-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
         "com.unity.textmeshpro": "2.0.1",
         "com.unity.timeline": "1.1.0",

TestProjects/HDRP_DXR_Tests/Packages/manifest.json

@@ -15,7 +15,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
         "com.unity.testing.xr": "file:../../../com.unity.testing.xr",
         "com.unity.textmeshpro": "3.0.0-preview.1",
@@ -61,4 +61,4 @@
         "com.unity.testing.hdrp",
         "com.unity.testing.xr"
     ]
-}
+}

TestProjects/HDRP_HybridTests/Packages/manifest.json

@@ -19,10 +19,9 @@
         "com.unity.test-framework": "1.1.13",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "0.2.3-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testing.xr": "file:../../../com.unity.testing.xr",
         "com.unity.textmeshpro": "3.0.0-preview.1",
-        "com.unity.timeline": "1.3.0-preview.2",
         "com.unity.ugui": "1.0.0",
         "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
         "com.unity.modules.ai": "1.0.0",
@@ -64,4 +63,4 @@
     ],
     "useSatSolver": true,
     "registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
-}
+}

TestProjects/HDRP_RuntimeTests/Packages/manifest.json

@@ -9,7 +9,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
         "com.unity.testing.xr": "file:../../../com.unity.testing.xr",
         "com.unity.ugui": "1.0.0",
@@ -54,4 +54,4 @@
         "com.unity.testing.hdrp",
         "com.unity.testing.xr"
     ]
-}
+}

TestProjects/HDRP_Tests/Packages/manifest.json

@@ -8,7 +8,7 @@
         "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config",
         "com.unity.shadergraph": "file:../../../com.unity.shadergraph",
         "com.unity.test-framework": "1.1.14",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp",
         "com.unity.testing.xr": "file:../../../com.unity.testing.xr",
         "com.unity.ugui": "1.0.0",
@@ -53,4 +53,4 @@
         "com.unity.testing.hdrp",
         "com.unity.testing.xr"
     ]
-}
+}

TestProjects/SRP_SmokeTest/Packages/manifest.json

@@ -8,7 +8,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.ugui": "1.0.0",
         "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph",
         "com.unity.modules.ai": "1.0.0",
@@ -47,4 +47,4 @@
         "com.unity.render-pipelines.core",
         "com.unity.testframework.graphics"
     ]
-}
+}

TestProjects/ShaderGraph/Packages/manifest.json

@@ -8,7 +8,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.3",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.testtools.codecoverage": "0.2.2-preview",
         "com.unity.ugui": "1.0.0",
         "com.unity.xr.interactionsubsystems": "1.0.1",
@@ -50,4 +50,4 @@
         "com.unity.shadergraph",
         "com.unity.testframework.graphics"
     ]
-}
+}

TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json

@@ -9,7 +9,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.ugui": "1.0.0",
         "com.unity.xr.mock-hmd": "1.1.1-preview.1",
         "com.unity.modules.ai": "1.0.0",
@@ -50,4 +50,4 @@
         "com.unity.render-pipelines.universal",
         "com.unity.testframework.graphics"
     ]
-}
+}

TestProjects/UniversalGfxTestStereo/Packages/manifest.json

@@ -9,7 +9,7 @@
         "com.unity.test-framework": "1.1.14",
         "com.unity.test-framework.build": "0.0.1-preview.12",
         "com.unity.test-framework.utp-reporter": "1.0.2-preview",
-        "com.unity.testframework.graphics": "7.8.2-preview",
+        "com.unity.testframework.graphics": "7.8.4-preview",
         "com.unity.ugui": "1.0.0",
         "com.unity.xr.mock-hmd": "1.1.1-preview.1",
         "com.unity.modules.ai": "1.0.0",
@@ -50,4 +50,4 @@
         "com.unity.render-pipelines.universal",
         "com.unity.testframework.graphics"
     ]
-}
+}