diff --git a/TestProjects/HDRP_DXR_Tests/Packages/manifest.json b/TestProjects/HDRP_DXR_Tests/Packages/manifest.json index aa0e3d6f924..01720118583 100644 --- a/TestProjects/HDRP_DXR_Tests/Packages/manifest.json +++ b/TestProjects/HDRP_DXR_Tests/Packages/manifest.json @@ -13,8 +13,10 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "com.unity.render-pipelines.high-definition-config": "file:../LocalPackages/com.unity.render-pipelines.high-definition-config", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.9", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.textmeshpro": "3.0.0-preview.1", "com.unity.timeline": "1.2.6", diff --git a/TestProjects/HDRP_RuntimeTests/Assets/XR.meta b/TestProjects/HDRP_RuntimeTests/Assets/XR.meta new file mode 100644 index 00000000000..d5061c76c36 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 793138a96c66c4096be07e2bde257fdb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset b/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset new file mode 100644 index 00000000000..cc9825ebe5d --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettings + m_EditorClassIdentifier: + Keys: + Values: [] diff --git a/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset.meta b/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset.meta new file mode 100644 index 00000000000..728146a6ec3 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/Assets/XR/XRGeneralSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f7b5904414c546f2a4e777b4a01d7eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/HDRP_RuntimeTests/Packages/manifest.json b/TestProjects/HDRP_RuntimeTests/Packages/manifest.json index b3fe4f73c2c..aa71c0e317c 100644 --- a/TestProjects/HDRP_RuntimeTests/Packages/manifest.json +++ b/TestProjects/HDRP_RuntimeTests/Packages/manifest.json @@ -7,10 +7,10 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "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.5", - "com.unity.test-framework.build": "0.0.1-preview.3", - "com.unity.test-framework.utp-reporter": "0.1.3-preview.17", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph", diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/PackageManagerSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 00000000000..59b1561c00b --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreviewPackages: 1 + oneTimeWarningShown: 1 diff --git a/TestProjects/HDRP_RuntimeTests/ProjectSettings/XRPackageSettings.asset b/TestProjects/HDRP_RuntimeTests/ProjectSettings/XRPackageSettings.asset new file mode 100644 index 00000000000..7e791e170d5 --- /dev/null +++ b/TestProjects/HDRP_RuntimeTests/ProjectSettings/XRPackageSettings.asset @@ -0,0 +1,5 @@ +{ + "m_Settings": [ + "RemoveLegacyInputHelpersForReload" + ] +} \ No newline at end of file diff --git a/TestProjects/HDRP_Tests/Packages/manifest.json b/TestProjects/HDRP_Tests/Packages/manifest.json index 5e4a9572559..6cf8b3eeda6 100644 --- a/TestProjects/HDRP_Tests/Packages/manifest.json +++ b/TestProjects/HDRP_Tests/Packages/manifest.json @@ -7,8 +7,8 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "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.5", - "com.unity.testframework.graphics": "7.1.12-preview", + "com.unity.test-framework": "1.1.14", + "com.unity.testframework.graphics": "7.2.1-preview", "com.unity.testing.hdrp": "file:../../../com.unity.testing.hdrp", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph", diff --git a/TestProjects/SRP_SmokeTest/Packages/manifest.json b/TestProjects/SRP_SmokeTest/Packages/manifest.json index af440e6a42f..ceb9684d15f 100644 --- a/TestProjects/SRP_SmokeTest/Packages/manifest.json +++ b/TestProjects/SRP_SmokeTest/Packages/manifest.json @@ -5,8 +5,10 @@ "com.unity.render-pipelines.high-definition-config": "file:../../../com.unity.render-pipelines.high-definition-config", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.5", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph", "com.unity.xr.legacyinputhelpers": "2.1.2", @@ -40,9 +42,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.test-framework.utp-reporter": "0.1.3-preview.17", - "com.unity.test-framework.build": "0.0.1-preview.3" + "com.unity.modules.xr": "1.0.0" }, "testables": [ "com.unity.render-pipelines.core", diff --git a/TestProjects/ShaderGraph/Packages/manifest.json b/TestProjects/ShaderGraph/Packages/manifest.json index c8f6bf07691..1afbbb6adff 100644 --- a/TestProjects/ShaderGraph/Packages/manifest.json +++ b/TestProjects/ShaderGraph/Packages/manifest.json @@ -5,10 +5,10 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.11", - "com.unity.test-framework.build": "0.0.1-preview.12", - "com.unity.test-framework.utp-reporter": "0.1.3-preview.18", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.testtools.codecoverage": "0.2.2-preview", "com.unity.ugui": "1.0.0", "com.unity.xr.interactionsubsystems": "1.0.1", diff --git a/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json b/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json index dee3183f25e..6921ede180f 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json +++ b/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json @@ -7,8 +7,10 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.11", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.2", "com.unity.modules.ai": "1.0.0", @@ -41,9 +43,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.test-framework.utp-reporter": "0.1.3-preview.17", - "com.unity.test-framework.build": "0.0.1-preview.3" + "com.unity.modules.xr": "1.0.0" }, "disableProjectUpdate": true, "testables": [ diff --git a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json index 7497a905af2..6921ede180f 100644 --- a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json +++ b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json @@ -7,8 +7,10 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.5", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.2", "com.unity.modules.ai": "1.0.0", @@ -41,9 +43,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.test-framework.utp-reporter": "0.1.3-preview.17", - "com.unity.test-framework.build": "0.0.1-preview.3" + "com.unity.modules.xr": "1.0.0" }, "disableProjectUpdate": true, "testables": [ diff --git a/TestProjects/UniversalGraphicsTest/Packages/manifest.json b/TestProjects/UniversalGraphicsTest/Packages/manifest.json index af3fa3bd339..5641eb656bc 100644 --- a/TestProjects/UniversalGraphicsTest/Packages/manifest.json +++ b/TestProjects/UniversalGraphicsTest/Packages/manifest.json @@ -13,7 +13,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.2.0-preview", + "com.unity.testframework.graphics": "7.2.1-preview", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/TestProjects/VisualEffectGraph/Packages/manifest.json b/TestProjects/VisualEffectGraph/Packages/manifest.json index 1d13d9bdb6c..ba3f3813668 100644 --- a/TestProjects/VisualEffectGraph/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph/Packages/manifest.json @@ -7,10 +7,10 @@ "com.unity.render-pipelines.high-definition": "file:../../../com.unity.render-pipelines.high-definition", "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.9", - "com.unity.test-framework.build": "0.0.1-preview.7", - "com.unity.test-framework.utp-reporter": "0.1.3-preview.18", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph", "com.unity.timeline": "1.2.9", "com.unity.ugui": "1.0.0", diff --git a/TestProjects/VisualEffectGraph_LWRP/Packages/manifest.json b/TestProjects/VisualEffectGraph_LWRP/Packages/manifest.json index 9339a07f567..44ba76d295d 100644 --- a/TestProjects/VisualEffectGraph_LWRP/Packages/manifest.json +++ b/TestProjects/VisualEffectGraph_LWRP/Packages/manifest.json @@ -5,10 +5,10 @@ "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.9", - "com.unity.test-framework.build": "0.0.1-preview.7", - "com.unity.test-framework.utp-reporter": "0.1.3-preview.18", - "com.unity.testframework.graphics": "7.1.12-preview", + "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.2.1-preview", "com.unity.testing.visualeffectgraph": "file:../../../com.unity.testing.visualeffectgraph", "com.unity.ugui": "1.0.0", "com.unity.visualeffectgraph": "file:../../../com.unity.visualeffectgraph", @@ -51,4 +51,4 @@ "com.unity.render-pipelines.visualeffectgraph", "com.unity.testframework.graphics" ] -} +} \ No newline at end of file diff --git a/com.unity.testing.hdrp/package.json b/com.unity.testing.hdrp/package.json index b775bfc7456..551d84597d2 100644 --- a/com.unity.testing.hdrp/package.json +++ b/com.unity.testing.hdrp/package.json @@ -7,7 +7,7 @@ "description": "Common assets library for HDRP test projects.", "keywords": ["qa", "test", "testing", "tests", "graphics", "HDRP"], "dependencies": { - "com.unity.testframework.graphics": "7.1.12-preview", + "com.unity.testframework.graphics": "7.2.1-preview", "com.unity.render-pipelines.high-definition": "file:./com.unity.render-pipelines.high-definition" } } diff --git a/com.unity.testing.visualeffectgraph/package.json b/com.unity.testing.visualeffectgraph/package.json index 73b42e909fd..3965fc98be6 100644 --- a/com.unity.testing.visualeffectgraph/package.json +++ b/com.unity.testing.visualeffectgraph/package.json @@ -7,6 +7,6 @@ "description": "This package contains common graphics tests from several scriptable renderpipeline", "dependencies": { "com.unity.visualeffectgraph": "8.2.0", - "com.unity.testframework.graphics": "7.1.12-preview" + "com.unity.testframework.graphics": "7.2.1-preview" } }