From 50311cb63d02461ffb864617183d87bc78d239b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Leli=C3=A8vre?= Date: Fri, 12 Jun 2020 16:45:43 +0200 Subject: [PATCH] Updated asmdefs according to the new doc --- ...GraphicTests.Performance.HDRP.Editor.asmdef | 15 ++++++++------- ...raphicTests.Performance.HDRP.Runtime.asmdef | 13 +++++++------ .../ProjectSettings/EditorSettings.asset | 6 +++++- .../VersionControlSettings.asset | Bin 4128 -> 188 bytes .../package.json | 3 ++- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Editor/Unity.GraphicTests.Performance.HDRP.Editor.asmdef b/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Editor/Unity.GraphicTests.Performance.HDRP.Editor.asmdef index 820afce0043..0bb43e8b6b6 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Editor/Unity.GraphicTests.Performance.HDRP.Editor.asmdef +++ b/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Editor/Unity.GraphicTests.Performance.HDRP.Editor.asmdef @@ -1,13 +1,14 @@ { "name": "Unity.GraphicTests.Performance.HDRP.Editor", + "rootNamespace": "", "references": [ - "GUID:91836b14885b8a34196f4aa8303d7793", - "GUID:457756d89b35d2941b3e7b37b4ece6f1", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:295068ed467c2ce4a9cda3833065f650", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:cbbcbe5a7206638449ebcb9382eeb3a8", - "GUID:78bd2ddd6e276394a9615c203e574844" + "Unity.PerformanceTesting", + "Unity.RenderPipelines.HighDefinition.Runtime", + "Unity.RenderPipelines.Core.Runtime", + "Unity.GraphicTests.Performance.Runtime", + "UnityEngine.TestRunner", + "Unity.GraphicTests.Performance.Editor", + "Unity.RenderPipelines.HighDefinition.Editor" ], "includePlatforms": [ "Editor" diff --git a/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Runtime/Unity.GraphicTests.Performance.HDRP.Runtime.asmdef b/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Runtime/Unity.GraphicTests.Performance.HDRP.Runtime.asmdef index f7b8e309f0a..6eba98a33f9 100644 --- a/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Runtime/Unity.GraphicTests.Performance.HDRP.Runtime.asmdef +++ b/TestProjects/HDRP_PerformanceTests/Assets/PerformanceTests/Runtime/Unity.GraphicTests.Performance.HDRP.Runtime.asmdef @@ -1,13 +1,14 @@ { "name": "Unity.GraphicTests.Performance.HDRP.Runtime", + "rootNamespace": "", "references": [ - "GUID:91836b14885b8a34196f4aa8303d7793", + "Unity.PerformanceTesting", "GUID:c081bc530f560634bb5c21d4b323a7f1", - "GUID:27619889b8ba8c24980f49ee34dbb44a", - "GUID:0acc523941302664db1f4e527237feb3", - "GUID:df380645f10b7bc4b97d4f5eb6303d95", - "GUID:457756d89b35d2941b3e7b37b4ece6f1", - "GUID:295068ed467c2ce4a9cda3833065f650" + "UnityEngine.TestRunner", + "UnityEditor.TestRunner", + "Unity.RenderPipelines.Core.Runtime", + "Unity.RenderPipelines.HighDefinition.Runtime", + "Unity.GraphicTests.Performance.Runtime" ], "includePlatforms": [], "excludePlatforms": [], diff --git a/TestProjects/HDRP_PerformanceTests/ProjectSettings/EditorSettings.asset b/TestProjects/HDRP_PerformanceTests/ProjectSettings/EditorSettings.asset index e0fd18aa585..f6c454911fe 100644 --- a/TestProjects/HDRP_PerformanceTests/ProjectSettings/EditorSettings.asset +++ b/TestProjects/HDRP_PerformanceTests/ProjectSettings/EditorSettings.asset @@ -19,13 +19,17 @@ EditorSettings: m_ProjectGenerationRootNamespace: m_EnableTextureStreamingInEditMode: 1 m_EnableTextureStreamingInPlayMode: 1 + m_EnableRoslynAnalyzers: 0 m_AsyncShaderCompilation: 0 m_CachingShaderPreprocessor: 0 m_EnterPlayModeOptionsEnabled: 1 m_EnterPlayModeOptions: 3 + m_GameObjectNamingDigits: 1 + m_GameObjectNamingScheme: 0 + m_AssetNamingUsesSpace: 1 m_UseLegacyProbeSampleCount: 1 m_SerializeInlineMappingsOnOneLine: 0 - m_DisableCookiesInLightmapper: 1 + m_DisableCookiesInLightmapper: 0 m_AssetPipelineMode: 1 m_CacheServerMode: 0 m_CacheServerEndpoint: diff --git a/TestProjects/HDRP_PerformanceTests/ProjectSettings/VersionControlSettings.asset b/TestProjects/HDRP_PerformanceTests/ProjectSettings/VersionControlSettings.asset index 322ab7703382e1027239b30461246d2fcd0d295e..dca288142fc043d5a749e9058fe625505008834f 100644 GIT binary patch literal 188 zcmYj}u?~VT6ae>r#bdxp2-O&*8zG>BL=z2(lPUCtJX6}FErWkAGP&O6E`FBn1$fF? z{3uTl%@G7SirG;3>{UA0X}ilf7c5DVpFI{?ksb154jaxobe^oKtO?HQJBC1J^nw9Q zuWSFtA)HBJqvZl2TXAa@3h2mFuMt`d5*pIzS6NxDWnU`_*8SfA$lRPA9eQ6Ixs*x( FXJ1l_IxYYJ literal 4128 zcmeH~u}Z{15Qb+jdRmHwf`X*5u{m-P6|4@96A=#;;VMCLWI0x17P0|LQ&?*!K7kLQ zrC14P?F-oW0#{iYXLb`5@eyWVC$s-Qvjbn3$@u#90BkILUb+H6JiBVnufDYbVGstb zb}NX&5WdQ?6auZM)ujz6%g5WBi?^5Y=2i3VW8$rC&!TmLhgvAM016x_?WM5UCV?II z9uyA(iYZj6zn-B6@^{f+#G2+CBo>rh2xy2lDs;&AP!^raq#8VUM{gP5p!e$?bqD!J z=%3-Cz0-E4cHRCJyslSzldOW03)~O;sO;gD=4VLmP;xPlnNd3J>NL-EaxC*)r6U99 zr+pnu=;|bihP_zjI{W4QE35P{)1yop(@UdaB4fMYFE0{(>u_QMOn?b60Vco%m;e)C g0!)AjFaaj;Ltq}ufienzDE+?7BY#IF(zt)wZ(875ZU6uP diff --git a/com.unity.testing.graphics-performance/package.json b/com.unity.testing.graphics-performance/package.json index e0aeace4165..08bc947a33b 100644 --- a/com.unity.testing.graphics-performance/package.json +++ b/com.unity.testing.graphics-performance/package.json @@ -7,6 +7,7 @@ "description": "Provides performance framework helpers for writing tests for graphics code, such as test scene asset description, performance performance report and shader static analysis.", "keywords": ["qa", "test", "testing", "tests", "graphics", "performance"], "dependencies": { - "com.unity.test-framework.performance": "2.0.8-preview" + "com.unity.test-framework.performance": "2.0.8-preview", + "com.unity.shaderanalysis": "10.0.0-preview.1" } }