Browse Source

Fixed Unity Test Tools compatibility issue with Unity 5.5.0f

master
Christopher 8 years ago
parent
commit
7dfcdd32d9
  1. 9
      Assets/UnityTestTools/IntegrationTestsFramework/Libs.meta
  2. BIN
      Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll
  3. 24
      Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta
  4. BIN
      Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll
  5. 24
      Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta
  6. 4
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs
  7. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab
  8. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab
  9. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab
  10. 20
      Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab
  11. 24
      ProjectSettings/GraphicsSettings.asset
  12. 3
      ProjectSettings/ProjectVersion.txt
  13. 11
      ProjectSettings/UnityAdsSettings.asset
  14. 15
      ProjectSettings/UnityConnectSettings.asset

9
Assets/UnityTestTools/IntegrationTestsFramework/Libs.meta

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e22ba039de7077c4aa95758ef723b803
folderAsset: yes
timeCreated: 1445282049
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll

Binary file not shown.

24
Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.Mdb.dll.meta

@ -1,24 +0,0 @@
fileFormatVersion: 2
guid: 713231d47408a06408a45470c967bae8
timeCreated: 1441797177
licenseType: Store
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll

Binary file not shown.

24
Assets/UnityTestTools/IntegrationTestsFramework/Libs/Mono.Cecil.dll.meta

@ -1,24 +0,0 @@
fileFormatVersion: 2
guid: 28fc22990733f8f4ea1137f15e363609
timeCreated: 1441797177
licenseType: Store
PluginImporter:
serializedVersion: 1
iconMap: {}
executionOrder: {}
isPreloaded: 0
platformData:
Any:
enabled: 0
settings: {}
Editor:
enabled: 1
settings:
DefaultValueInitialized: true
WindowsStoreApps:
enabled: 0
settings:
CPU: AnyCPU
userData:
assetBundleName:
assetBundleVariant:

4
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/GuiHelper.cs

@ -3,10 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text.RegularExpressions;
using Mono.Cecil;
using Mono.Cecil.Cil;
using Mono.Cecil.Mdb;
using Mono.Collections.Generic;
using UnityEditor;
using UnityEditorInternal;
using UnityEngine;

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionFailure.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeCollisionFailure
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeCollisionSuccess.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeCollisionSuccess
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.1736994, y: 3.9978147, z: -16.24892}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerFailure.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeTriggerFailure
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

20
Assets/UnityTestTools/IntegrationTestsFramework/TestingAssets/CubeTriggerSuccess.prefab

@ -5,13 +5,13 @@ GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 4
serializedVersion: 5
m_Component:
- 4: {fileID: 400000}
- 33: {fileID: 3300000}
- 65: {fileID: 6500000}
- 23: {fileID: 2300000}
- 114: {fileID: 11400000}
- component: {fileID: 400000}
- component: {fileID: 3300000}
- component: {fileID: 6500000}
- component: {fileID: 2300000}
- component: {fileID: 11400000}
m_Layer: 0
m_Name: CubeTriggerSuccess
m_TagString: Untagged
@ -28,10 +28,10 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &2300000
MeshRenderer:
m_ObjectHideFlags: 1
@ -46,7 +46,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: 43da3275cd08d41429f56675d70c58df, type: 2}
m_SubsetIndices:
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
@ -54,7 +56,7 @@ MeshRenderer:
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89

24
ProjectSettings/GraphicsSettings.asset

@ -3,7 +3,7 @@
--- !u!30 &1
GraphicsSettings:
m_ObjectHideFlags: 0
serializedVersion: 7
serializedVersion: 9
m_Deferred:
m_Mode: 1
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@ -38,22 +38,18 @@ GraphicsSettings:
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
m_ShaderSettings_Tier1:
m_TierSettings_Tier1:
renderingPath: 1
useCascadedShadowMaps: 1
standardShaderQuality: 2
useReflectionProbeBoxProjection: 1
useReflectionProbeBlending: 1
m_ShaderSettings_Tier2:
m_TierSettings_Tier2:
renderingPath: 1
useCascadedShadowMaps: 1
standardShaderQuality: 2
useReflectionProbeBoxProjection: 1
useReflectionProbeBlending: 1
m_ShaderSettings_Tier3:
m_TierSettings_Tier3:
renderingPath: 1
useCascadedShadowMaps: 1
standardShaderQuality: 2
useReflectionProbeBoxProjection: 1
useReflectionProbeBlending: 1
m_BuildTargetShaderSettings: []
m_DefaultRenderingPath: 1
m_DefaultMobileRenderingPath: 1
m_TierSettings: []
m_LightmapStripping: 0
m_FogStripping: 0
m_LightmapKeepPlain: 1

3
ProjectSettings/ProjectVersion.txt

@ -1,2 +1 @@
m_EditorVersion: 5.4.2f2
m_StandardAssetsVersion: 0
m_EditorVersion: 5.5.0f3

11
ProjectSettings/UnityAdsSettings.asset

@ -1,11 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!292 &1
UnityAdsSettings:
m_ObjectHideFlags: 0
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:

15
ProjectSettings/UnityConnectSettings.asset

@ -3,6 +3,14 @@
--- !u!310 &1
UnityConnectSettings:
m_ObjectHideFlags: 0
m_Enabled: 0
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:
CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes
m_Enabled: 0
m_CaptureEditorExceptions: 1
UnityPurchasingSettings:
m_Enabled: 0
m_TestMode: 0
@ -12,3 +20,10 @@ UnityConnectSettings:
m_TestMode: 0
m_TestEventUrl:
m_TestConfigUrl:
UnityAdsSettings:
m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0
m_EnabledPlatforms: 4294967295
m_IosGameId:
m_AndroidGameId:

Loading…
Cancel
Save