Merge branch 'LTS_Unity2017'

# Conflicts: # UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef
ssannandeji · Aug 6, 2018 · 3b4047f · 3b4047f
2 parents cdb102d + 710944b
commit 3b4047f
Show file tree

Hide file tree

Showing 104 changed files with 327 additions and 28 deletions.
diff --git a/...ct/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs b/...ct/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Misc/TestZenAutoInjecter/Bar.cs
@@ -3,6 +3,12 @@
 
 namespace Zenject.Tests.AutoInjecter
 {
+    public class Foo
+    {
+        [Inject]
+        public DiContainer Container;
+    }
+
     public class Bar : MonoBehaviour
     {
         [Inject]

diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests.meta
diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings.meta
diff --git a/...lugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta b/...lugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestDiContainerMethods.meta
diff --git a/...ontainerMethods/TestDiContainerMethods.cs → ...ontainerMethods/TestDiContainerMethods.cs b/...ontainerMethods/TestDiContainerMethods.cs → ...ontainerMethods/TestDiContainerMethods.cs
diff --git a/...nerMethods/TestDiContainerMethods.cs.meta → ...nerMethods/TestDiContainerMethods.cs.meta b/...nerMethods/TestDiContainerMethods.cs.meta → ...nerMethods/TestDiContainerMethods.cs.meta
diff --git a/...tionTests/Bindings/TestFromComponent.meta → ...sts/Tests/Bindings/TestFromComponent.meta b/...tionTests/Bindings/TestFromComponent.meta → ...sts/Tests/Bindings/TestFromComponent.meta
diff --git a/.../TestFromComponent/TestFromComponentOn.cs → .../TestFromComponent/TestFromComponentOn.cs b/.../TestFromComponent/TestFromComponentOn.cs → .../TestFromComponent/TestFromComponentOn.cs
diff --git a/...FromComponent/TestFromComponentOn.cs.meta → ...FromComponent/TestFromComponentOn.cs.meta b/...FromComponent/TestFromComponentOn.cs.meta → ...FromComponent/TestFromComponentOn.cs.meta
diff --git a/...stFromComponent/TestFromNewComponentOn.cs → ...stFromComponent/TestFromNewComponentOn.cs b/...stFromComponent/TestFromNewComponentOn.cs → ...stFromComponent/TestFromNewComponentOn.cs
diff --git a/...mComponent/TestFromNewComponentOn.cs.meta → ...mComponent/TestFromNewComponentOn.cs.meta b/...mComponent/TestFromNewComponentOn.cs.meta → ...mComponent/TestFromNewComponentOn.cs.meta
diff --git a/...Bindings/TestFromComponentInChildren.meta → ...Bindings/TestFromComponentInChildren.meta b/...Bindings/TestFromComponentInChildren.meta → ...Bindings/TestFromComponentInChildren.meta
diff --git a/...InChildren/TestFromComponentInChildren.cs → ...InChildren/TestFromComponentInChildren.cs b/...InChildren/TestFromComponentInChildren.cs → ...InChildren/TestFromComponentInChildren.cs
diff --git a/...ldren/TestFromComponentInChildren.cs.meta → ...ldren/TestFromComponentInChildren.cs.meta b/...ldren/TestFromComponentInChildren.cs.meta → ...ldren/TestFromComponentInChildren.cs.meta
diff --git a/...indings/TestFromComponentInHierarchy.meta → ...indings/TestFromComponentInHierarchy.meta b/...indings/TestFromComponentInHierarchy.meta → ...indings/TestFromComponentInHierarchy.meta
diff --git a/...Hierarchy/TestFromComponentInHierarchy.cs → ...Hierarchy/TestFromComponentInHierarchy.cs b/...Hierarchy/TestFromComponentInHierarchy.cs → ...Hierarchy/TestFromComponentInHierarchy.cs
diff --git a/...rchy/TestFromComponentInHierarchy.cs.meta → ...rchy/TestFromComponentInHierarchy.cs.meta b/...rchy/TestFromComponentInHierarchy.cs.meta → ...rchy/TestFromComponentInHierarchy.cs.meta
diff --git a/...Extras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta b/...Extras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchyGameObjectContext.meta
diff --git a/...mComponentInHierarchyGameObjectContext.cs → ...mComponentInHierarchyGameObjectContext.cs b/...mComponentInHierarchyGameObjectContext.cs → ...mComponentInHierarchyGameObjectContext.cs
diff --git a/...onentInHierarchyGameObjectContext.cs.meta → ...onentInHierarchyGameObjectContext.cs.meta b/...onentInHierarchyGameObjectContext.cs.meta → ...onentInHierarchyGameObjectContext.cs.meta
diff --git a/.../Bindings/TestFromComponentInParents.meta → .../Bindings/TestFromComponentInParents.meta b/.../Bindings/TestFromComponentInParents.meta → .../Bindings/TestFromComponentInParents.meta
diff --git a/...ntInParents/TestFromComponentInParents.cs → ...ntInParents/TestFromComponentInParents.cs b/...ntInParents/TestFromComponentInParents.cs → ...ntInParents/TestFromComponentInParents.cs
diff --git a/...arents/TestFromComponentInParents.cs.meta → ...arents/TestFromComponentInParents.cs.meta b/...arents/TestFromComponentInParents.cs.meta → ...arents/TestFromComponentInParents.cs.meta
diff --git a/...Bindings/TestFromComponentInSiblings.meta → ...Bindings/TestFromComponentInSiblings.meta b/...Bindings/TestFromComponentInSiblings.meta → ...Bindings/TestFromComponentInSiblings.meta
diff --git a/...InSiblings/TestFromComponentInSiblings.cs → ...InSiblings/TestFromComponentInSiblings.cs b/...InSiblings/TestFromComponentInSiblings.cs → ...InSiblings/TestFromComponentInSiblings.cs
diff --git a/...lings/TestFromComponentInSiblings.cs.meta → ...lings/TestFromComponentInSiblings.cs.meta b/...lings/TestFromComponentInSiblings.cs.meta → ...lings/TestFromComponentInSiblings.cs.meta
diff --git a/...ts/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta b/...ts/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromGameObject.meta
diff --git a/.../TestFromGameObject/TestFromGameObject.cs → .../TestFromGameObject/TestFromGameObject.cs b/.../TestFromGameObject/TestFromGameObject.cs → .../TestFromGameObject/TestFromGameObject.cs
diff --git a/...FromGameObject/TestFromGameObject.cs.meta → ...FromGameObject/TestFromGameObject.cs.meta b/...FromGameObject/TestFromGameObject.cs.meta → ...FromGameObject/TestFromGameObject.cs.meta
diff --git a/...t/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta b/...t/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromNewScriptableObjectResource.meta
diff --git a/...ce/TestFromNewScriptableObjectResource.cs → ...ce/TestFromNewScriptableObjectResource.cs b/...ce/TestFromNewScriptableObjectResource.cs → ...ce/TestFromNewScriptableObjectResource.cs
diff --git a/...stFromNewScriptableObjectResource.cs.meta → ...stFromNewScriptableObjectResource.cs.meta b/...stFromNewScriptableObjectResource.cs.meta → ...stFromNewScriptableObjectResource.cs.meta
diff --git a/...Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta b/...Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefab.meta
diff --git a/...Bindings/TestFromPrefab/TestFromPrefab.cs → ...Bindings/TestFromPrefab/TestFromPrefab.cs b/...Bindings/TestFromPrefab/TestFromPrefab.cs → ...Bindings/TestFromPrefab/TestFromPrefab.cs
diff --git a/...ngs/TestFromPrefab/TestFromPrefab.cs.meta → ...ngs/TestFromPrefab/TestFromPrefab.cs.meta b/...ngs/TestFromPrefab/TestFromPrefab.cs.meta → ...ngs/TestFromPrefab/TestFromPrefab.cs.meta
diff --git a/...ugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta b/...ugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabInstaller.meta
diff --git a/...refabInstaller/TestFromPrefabInstaller.cs → ...refabInstaller/TestFromPrefabInstaller.cs b/...refabInstaller/TestFromPrefabInstaller.cs → ...refabInstaller/TestFromPrefabInstaller.cs
diff --git a/...Installer/TestFromPrefabInstaller.cs.meta → ...Installer/TestFromPrefabInstaller.cs.meta b/...Installer/TestFromPrefabInstaller.cs.meta → ...Installer/TestFromPrefabInstaller.cs.meta
diff --git a/...lugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta b/...lugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromPrefabResource.meta
diff --git a/...mPrefabResource/TestFromPrefabResource.cs → ...mPrefabResource/TestFromPrefabResource.cs b/...mPrefabResource/TestFromPrefabResource.cs → ...mPrefabResource/TestFromPrefabResource.cs
diff --git a/...abResource/TestFromPrefabResource.cs.meta → ...abResource/TestFromPrefabResource.cs.meta b/...abResource/TestFromPrefabResource.cs.meta → ...abResource/TestFromPrefabResource.cs.meta
diff --git a/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta b/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromResource.meta
diff --git a/...ings/TestFromResource/TestFromResource.cs → ...ings/TestFromResource/TestFromResource.cs b/...ings/TestFromResource/TestFromResource.cs → ...ings/TestFromResource/TestFromResource.cs
diff --git a/...TestFromResource/TestFromResource.cs.meta → ...TestFromResource/TestFromResource.cs.meta b/...TestFromResource/TestFromResource.cs.meta → ...TestFromResource/TestFromResource.cs.meta
diff --git a/...ts/Bindings/TestFromSiblingComponent.meta → ...ts/Bindings/TestFromSiblingComponent.meta b/...ts/Bindings/TestFromSiblingComponent.meta → ...ts/Bindings/TestFromSiblingComponent.meta
diff --git a/...lingComponent/TestFromSiblingComponent.cs → ...lingComponent/TestFromSiblingComponent.cs b/...lingComponent/TestFromSiblingComponent.cs → ...lingComponent/TestFromSiblingComponent.cs
diff --git a/...omponent/TestFromSiblingComponent.cs.meta → ...omponent/TestFromSiblingComponent.cs.meta b/...omponent/TestFromSiblingComponent.cs.meta → ...omponent/TestFromSiblingComponent.cs.meta
diff --git a/...ns/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta b/...ns/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefab.meta
diff --git a/...ainerPrefab/TestFromSubContainerPrefab.cs → ...ainerPrefab/TestFromSubContainerPrefab.cs b/...ainerPrefab/TestFromSubContainerPrefab.cs → ...ainerPrefab/TestFromSubContainerPrefab.cs
diff --git a/...Prefab/TestFromSubContainerPrefab.cs.meta → ...Prefab/TestFromSubContainerPrefab.cs.meta b/...Prefab/TestFromSubContainerPrefab.cs.meta → ...Prefab/TestFromSubContainerPrefab.cs.meta
diff --git a/...ct/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta b/...ct/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromSubContainerPrefabResource.meta
diff --git a/...rce/TestFromSubContainerPrefabResource.cs → ...rce/TestFromSubContainerPrefabResource.cs b/...rce/TestFromSubContainerPrefabResource.cs → ...rce/TestFromSubContainerPrefabResource.cs
diff --git a/...estFromSubContainerPrefabResource.cs.meta → ...estFromSubContainerPrefabResource.cs.meta b/...estFromSubContainerPrefabResource.cs.meta → ...estFromSubContainerPrefabResource.cs.meta
diff --git a/...s/IntegrationTests/Bindings/TestLazy.meta → ...grationTests/Tests/Bindings/TestLazy.meta b/...s/IntegrationTests/Bindings/TestLazy.meta → ...grationTests/Tests/Bindings/TestLazy.meta
diff --git a/...rationTests/Bindings/TestLazy/TestLazy.cs → ...Tests/Tests/Bindings/TestLazy/TestLazy.cs b/...rationTests/Bindings/TestLazy/TestLazy.cs → ...Tests/Tests/Bindings/TestLazy/TestLazy.cs
diff --git a/...nTests/Bindings/TestLazy/TestLazy.cs.meta → .../Tests/Bindings/TestLazy/TestLazy.cs.meta b/...nTests/Bindings/TestLazy/TestLazy.cs.meta → .../Tests/Bindings/TestLazy/TestLazy.cs.meta
diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories.meta
diff --git a/...Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta b/...Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/PrefabFactory.meta
diff --git a/...tories/PrefabFactory/TestPrefabFactory.cs → ...tories/PrefabFactory/TestPrefabFactory.cs b/...tories/PrefabFactory/TestPrefabFactory.cs → ...tories/PrefabFactory/TestPrefabFactory.cs
diff --git a/...s/PrefabFactory/TestPrefabFactory.cs.meta → ...s/PrefabFactory/TestPrefabFactory.cs.meta b/...s/PrefabFactory/TestPrefabFactory.cs.meta → ...s/PrefabFactory/TestPrefabFactory.cs.meta
diff --git a/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta b/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactory.meta
diff --git a/...tories/TestBindFactory/TestBindFactory.cs → ...tories/TestBindFactory/TestBindFactory.cs b/...tories/TestBindFactory/TestBindFactory.cs → ...tories/TestBindFactory/TestBindFactory.cs
diff --git a/...s/TestBindFactory/TestBindFactory.cs.meta → ...s/TestBindFactory/TestBindFactory.cs.meta b/...s/TestBindFactory/TestBindFactory.cs.meta → ...s/TestBindFactory/TestBindFactory.cs.meta
diff --git a/.../Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta b/.../Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryFive.meta
diff --git a/...estBindFactoryFive/TestBindFactoryFive.cs → ...estBindFactoryFive/TestBindFactoryFive.cs b/...estBindFactoryFive/TestBindFactoryFive.cs → ...estBindFactoryFive/TestBindFactoryFive.cs
diff --git a/...ndFactoryFive/TestBindFactoryFive.cs.meta → ...ndFactoryFive/TestBindFactoryFive.cs.meta b/...ndFactoryFive/TestBindFactoryFive.cs.meta → ...ndFactoryFive/TestBindFactoryFive.cs.meta
diff --git a/...s/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta b/...s/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Factories/TestBindFactoryOne.meta
diff --git a/.../TestBindFactoryOne/TestBindFactoryOne.cs → .../TestBindFactoryOne/TestBindFactoryOne.cs b/.../TestBindFactoryOne/TestBindFactoryOne.cs → .../TestBindFactoryOne/TestBindFactoryOne.cs
diff --git a/...BindFactoryOne/TestBindFactoryOne.cs.meta → ...BindFactoryOne/TestBindFactoryOne.cs.meta b/...BindFactoryOne/TestBindFactoryOne.cs.meta → ...BindFactoryOne/TestBindFactoryOne.cs.meta
diff --git a/...ationTests/Factories/TestMemoryPools.meta → ...ests/Tests/Factories/TestMemoryPools.meta b/...ationTests/Factories/TestMemoryPools.meta → ...ests/Tests/Factories/TestMemoryPools.meta
diff --git a/...tories/TestMemoryPools/TestMemoryPool1.cs → ...tories/TestMemoryPools/TestMemoryPool1.cs b/...tories/TestMemoryPools/TestMemoryPool1.cs → ...tories/TestMemoryPools/TestMemoryPool1.cs
diff --git a/...s/TestMemoryPools/TestMemoryPool1.cs.meta → ...s/TestMemoryPools/TestMemoryPool1.cs.meta b/...s/TestMemoryPools/TestMemoryPool1.cs.meta → ...s/TestMemoryPools/TestMemoryPool1.cs.meta
diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers.meta
diff --git a/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta b/...sets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestInstallers.meta
diff --git a/...stallers/TestInstallers/TestInstallers.cs → ...stallers/TestInstallers/TestInstallers.cs b/...stallers/TestInstallers/TestInstallers.cs → ...stallers/TestInstallers/TestInstallers.cs
diff --git a/...ers/TestInstallers/TestInstallers.cs.meta → ...ers/TestInstallers/TestInstallers.cs.meta b/...ers/TestInstallers/TestInstallers.cs.meta → ...ers/TestInstallers/TestInstallers.cs.meta
diff --git a/.../Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta b/.../Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Installers/TestMonoInstallers.meta
diff --git a/.../TestMonoInstallers/TestMonoInstallers.cs → .../TestMonoInstallers/TestMonoInstallers.cs b/.../TestMonoInstallers/TestMonoInstallers.cs → .../TestMonoInstallers/TestMonoInstallers.cs
diff --git a/...MonoInstallers/TestMonoInstallers.cs.meta → ...MonoInstallers/TestMonoInstallers.cs.meta b/...MonoInstallers/TestMonoInstallers.cs.meta → ...MonoInstallers/TestMonoInstallers.cs.meta
diff --git a/...ject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta b/...ject/OptionalExtras/IntegrationTests/Tests/Installers/TestScriptableObjectInstallers.meta
diff --git a/...tallers/TestScriptableObjectInstallers.cs → ...tallers/TestScriptableObjectInstallers.cs b/...tallers/TestScriptableObjectInstallers.cs → ...tallers/TestScriptableObjectInstallers.cs
diff --git a/...rs/TestScriptableObjectInstallers.cs.meta → ...rs/TestScriptableObjectInstallers.cs.meta b/...rs/TestScriptableObjectInstallers.cs.meta → ...rs/TestScriptableObjectInstallers.cs.meta
diff --git a/...tegrationTests/IntegrationTestTester.meta → ...ionTests/Tests/IntegrationTestTester.meta b/...tegrationTests/IntegrationTestTester.meta → ...ionTests/Tests/IntegrationTestTester.meta
diff --git a/...egrationTestTester/TestIntegrationTest.cs → ...egrationTestTester/TestIntegrationTest.cs b/...egrationTestTester/TestIntegrationTest.cs → ...egrationTestTester/TestIntegrationTest.cs
diff --git a/...ionTestTester/TestIntegrationTest.cs.meta → ...ionTestTester/TestIntegrationTest.cs.meta b/...ionTestTester/TestIntegrationTest.cs.meta → ...ionTestTester/TestIntegrationTest.cs.meta
diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc.meta
diff --git a/...Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta b/...Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestAnimationStateBehaviourInject.meta
diff --git a/...ject/TestAnimationStateBehaviourInject.cs → ...ject/TestAnimationStateBehaviourInject.cs b/...ject/TestAnimationStateBehaviourInject.cs → ...ject/TestAnimationStateBehaviourInject.cs
diff --git a/...TestAnimationStateBehaviourInject.cs.meta → ...TestAnimationStateBehaviourInject.cs.meta b/...TestAnimationStateBehaviourInject.cs.meta → ...TestAnimationStateBehaviourInject.cs.meta
diff --git a/...ssets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta b/...ssets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Misc/TestZenAutoInjecter.meta
diff --git a/...estZenAutoInjecter/TestZenAutoInjecter.cs → ...estZenAutoInjecter/TestZenAutoInjecter.cs b/...estZenAutoInjecter/TestZenAutoInjecter.cs → ...estZenAutoInjecter/TestZenAutoInjecter.cs
@@ -9,12 +9,6 @@
 
 namespace Zenject.Tests.AutoInjecter
 {
-    public class Foo
-    {
-        [Inject]
-        public DiContainer Container;
-    }
-
 #if UNITY_EDITOR
     public class TestZenAutoInjecter : ZenjectIntegrationTestFixture
     {

diff --git a/...nAutoInjecter/TestZenAutoInjecter.cs.meta → ...nAutoInjecter/TestZenAutoInjecter.cs.meta b/...nAutoInjecter/TestZenAutoInjecter.cs.meta → ...nAutoInjecter/TestZenAutoInjecter.cs.meta