From 12979b34f98a6c812179d603cb54824ad7a4180b Mon Sep 17 00:00:00 2001 From: ryanhy Date: Fri, 1 Nov 2019 15:48:02 -0700 Subject: [PATCH] Force projects to use asset db v2. If this isn't done a dialog box asking to do so blocks automation. --- FunctionalTests/AR/ARCore/ProjectSettings/EditorSettings.asset | 1 + .../AR/ARFoundation/ProjectSettings/EditorSettings.asset | 1 + FunctionalTests/AR/ARMock/ProjectSettings/EditorSettings.asset | 1 + .../VR/CrossPlatform/ProjectSettings/EditorSettings.asset | 1 + .../CrossPlatformSmokeTest/ProjectSettings/EditorSettings.asset | 1 + GraphicsTests/LWRPSmokeTest/ProjectSettings/EditorSettings.asset | 1 + .../LegacyRenderer/ProjectSettings/EditorSettings.asset | 1 + .../LegacySmokeTest/ProjectSettings/EditorSettings.asset | 1 + .../LightweightRenderer/ProjectSettings/EditorSettings.asset | 1 + .../ProjectSettings/EditorSettings.asset | 1 + .../ProjectSettings/EditorSettings.asset | 1 + 11 files changed, 11 insertions(+) diff --git a/FunctionalTests/AR/ARCore/ProjectSettings/EditorSettings.asset b/FunctionalTests/AR/ARCore/ProjectSettings/EditorSettings.asset index fb66ccf6..e74edb8f 100644 --- a/FunctionalTests/AR/ARCore/ProjectSettings/EditorSettings.asset +++ b/FunctionalTests/AR/ARCore/ProjectSettings/EditorSettings.asset @@ -21,3 +21,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1 diff --git a/FunctionalTests/AR/ARFoundation/ProjectSettings/EditorSettings.asset b/FunctionalTests/AR/ARFoundation/ProjectSettings/EditorSettings.asset index 29dea529..be6bc592 100644 --- a/FunctionalTests/AR/ARFoundation/ProjectSettings/EditorSettings.asset +++ b/FunctionalTests/AR/ARFoundation/ProjectSettings/EditorSettings.asset @@ -19,3 +19,4 @@ EditorSettings: m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_AssetPipelineMode: 1 diff --git a/FunctionalTests/AR/ARMock/ProjectSettings/EditorSettings.asset b/FunctionalTests/AR/ARMock/ProjectSettings/EditorSettings.asset index fb66ccf6..e74edb8f 100644 --- a/FunctionalTests/AR/ARMock/ProjectSettings/EditorSettings.asset +++ b/FunctionalTests/AR/ARMock/ProjectSettings/EditorSettings.asset @@ -21,3 +21,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1 diff --git a/FunctionalTests/VR/CrossPlatform/ProjectSettings/EditorSettings.asset b/FunctionalTests/VR/CrossPlatform/ProjectSettings/EditorSettings.asset index 1666f77c..d78f25d7 100644 --- a/FunctionalTests/VR/CrossPlatform/ProjectSettings/EditorSettings.asset +++ b/FunctionalTests/VR/CrossPlatform/ProjectSettings/EditorSettings.asset @@ -20,3 +20,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1 diff --git a/FunctionalTests/VR/CrossPlatformSmokeTest/ProjectSettings/EditorSettings.asset b/FunctionalTests/VR/CrossPlatformSmokeTest/ProjectSettings/EditorSettings.asset index 1666f77c..d78f25d7 100644 --- a/FunctionalTests/VR/CrossPlatformSmokeTest/ProjectSettings/EditorSettings.asset +++ b/FunctionalTests/VR/CrossPlatformSmokeTest/ProjectSettings/EditorSettings.asset @@ -20,3 +20,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1 diff --git a/GraphicsTests/LWRPSmokeTest/ProjectSettings/EditorSettings.asset b/GraphicsTests/LWRPSmokeTest/ProjectSettings/EditorSettings.asset index 26911235..2fa1ccbb 100644 --- a/GraphicsTests/LWRPSmokeTest/ProjectSettings/EditorSettings.asset +++ b/GraphicsTests/LWRPSmokeTest/ProjectSettings/EditorSettings.asset @@ -24,3 +24,4 @@ EditorSettings: m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 m_ShowLightmapResolutionOverlay: 1 + m_AssetPipelineMode: 1 diff --git a/GraphicsTests/LegacyRenderer/ProjectSettings/EditorSettings.asset b/GraphicsTests/LegacyRenderer/ProjectSettings/EditorSettings.asset index 29dea529..be6bc592 100644 --- a/GraphicsTests/LegacyRenderer/ProjectSettings/EditorSettings.asset +++ b/GraphicsTests/LegacyRenderer/ProjectSettings/EditorSettings.asset @@ -19,3 +19,4 @@ EditorSettings: m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_AssetPipelineMode: 1 diff --git a/GraphicsTests/LegacySmokeTest/ProjectSettings/EditorSettings.asset b/GraphicsTests/LegacySmokeTest/ProjectSettings/EditorSettings.asset index 26911235..2fa1ccbb 100644 --- a/GraphicsTests/LegacySmokeTest/ProjectSettings/EditorSettings.asset +++ b/GraphicsTests/LegacySmokeTest/ProjectSettings/EditorSettings.asset @@ -24,3 +24,4 @@ EditorSettings: m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 m_ShowLightmapResolutionOverlay: 1 + m_AssetPipelineMode: 1 diff --git a/GraphicsTests/LightweightRenderer/ProjectSettings/EditorSettings.asset b/GraphicsTests/LightweightRenderer/ProjectSettings/EditorSettings.asset index 841a085a..c0a81bbc 100644 --- a/GraphicsTests/LightweightRenderer/ProjectSettings/EditorSettings.asset +++ b/GraphicsTests/LightweightRenderer/ProjectSettings/EditorSettings.asset @@ -24,3 +24,4 @@ EditorSettings: m_EnableTextureStreamingInPlayMode: 1 m_AsyncShaderCompilation: 1 m_ShowLightmapResolutionOverlay: 1 + m_AssetPipelineMode: 1 diff --git a/PerformanceTests/UnityPerformanceBenchmark-LWRP/ProjectSettings/EditorSettings.asset b/PerformanceTests/UnityPerformanceBenchmark-LWRP/ProjectSettings/EditorSettings.asset index 1666f77c..d78f25d7 100644 --- a/PerformanceTests/UnityPerformanceBenchmark-LWRP/ProjectSettings/EditorSettings.asset +++ b/PerformanceTests/UnityPerformanceBenchmark-LWRP/ProjectSettings/EditorSettings.asset @@ -20,3 +20,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1 diff --git a/PerformanceTests/UnityPerformanceBenchmark/ProjectSettings/EditorSettings.asset b/PerformanceTests/UnityPerformanceBenchmark/ProjectSettings/EditorSettings.asset index 1666f77c..d78f25d7 100644 --- a/PerformanceTests/UnityPerformanceBenchmark/ProjectSettings/EditorSettings.asset +++ b/PerformanceTests/UnityPerformanceBenchmark/ProjectSettings/EditorSettings.asset @@ -20,3 +20,4 @@ EditorSettings: m_CollabEditorSettings: inProgressEnabled: 1 m_EnableTextureStreamingInPlayMode: 1 + m_AssetPipelineMode: 1