Merge branch 'LTS_Unity2017'

UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Bindings/TestFromComponentInHierarchy/TestFromComponentInHierarchy.cs

@@ -58,7 +58,7 @@ public IEnumerator RunMatchMultiple()
             Setup1();
             PreInstall();
             Container.Bind<Qux>().AsSingle();
-            Container.Bind<Foo>().FromComponentsInHierarchy();
+            Container.Bind<Foo>().FromComponentsInHierarchy().AsCached();
 
             PostInstall();
 
@@ -88,7 +88,7 @@ public IEnumerator RunMatchNotFoundSuccess()
             PreInstall();
 
             Container.Bind<Qux>().AsSingle().NonLazy();
-            Container.Bind<Foo>().FromComponentsInHierarchy();
+            Container.Bind<Foo>().FromComponentsInHierarchy().AsCached();
 
             PostInstall();
 
@@ -134,7 +134,7 @@ public IEnumerator RunMatchMultipleNonGeneric()
             Setup1();
             PreInstall();
             Container.Bind<Qux>().AsSingle();
-            Container.Bind(typeof(Foo)).FromComponentsInHierarchy();
+            Container.Bind(typeof(Foo)).FromComponentsInHierarchy().AsCached();
 
             PostInstall();
 
@@ -164,7 +164,7 @@ public IEnumerator RunMatchNotFoundSuccessNonGeneric()
             PreInstall();
 
             Container.Bind<Qux>().AsSingle().NonLazy();
-            Container.Bind(typeof(Foo)).FromComponentsInHierarchy();
+            Container.Bind(typeof(Foo)).FromComponentsInHierarchy().AsCached();
 
             PostInstall();
 

UnityProject/Assets/Plugins/Zenject/Source/Binding/Binders/FromBinders/FromBinder.cs

@@ -747,7 +747,7 @@ protected ScopeConcreteIdArgConditionCopyNonLazyBinder FromComponentsInHierarchy
         {
             BindingUtil.AssertIsInterfaceOrComponent(AllParentTypes);
 
-            BindInfo.RequireExplicitScope = false;
+            BindInfo.RequireExplicitScope = true;
 
             // Don't know how it's created so can't assume here that it violates AsSingle
             BindInfo.MarkAsCreationBinding = false;

UnityProject/Assets/Plugins/Zenject/Source/Binding/BindingUtil.cs

@@ -30,7 +30,7 @@ public static void AssertIsValidPrefab(UnityEngine.Object prefab)
 
 #if UNITY_EDITOR
             // Unfortunately we can't do this check because asset bundles return PrefabType.None here
-            // as discussed here: https://github.com/modesttree/Zenject/issues/269#issuecomment-323419408
+            // as discussed here: https://github.com/svermeulen/Zenject/issues/269#issuecomment-323419408
             //Assert.That(PrefabUtility.GetPrefabType(prefab) == PrefabType.Prefab,
                 //"Expected prefab but found game object with name '{0}' during bind command", prefab.name);
 #endif
@@ -45,7 +45,7 @@ public static void AssertIsValidGameObject(GameObject gameObject)
 
 #if UNITY_EDITOR
             // Unfortunately we can't do this check because asset bundles return PrefabType.None here
-            // as discussed here: https://github.com/modesttree/Zenject/issues/269#issuecomment-323419408
+            // as discussed here: https://github.com/svermeulen/Zenject/issues/269#issuecomment-323419408
             //Assert.That(PrefabUtility.GetPrefabType(gameObject) != PrefabType.Prefab,
                 //"Expected game object but found prefab instead with name '{0}' during bind command", gameObject.name);
 #endif

UnityProject/Assets/Plugins/Zenject/Source/Editor/ZenMenuItems.cs

@@ -30,7 +30,7 @@ public static void ValidateCurrentSceneThenRun()
         [MenuItem("Edit/Zenject/Help...")]
         public static void OpenDocumentation()
         {
-            Application.OpenURL("https://github.com/modesttree/zenject");
+            Application.OpenURL("https://github.com/svermeulen/zenject");
         }
 
         [MenuItem("GameObject/Zenject/Scene Context", false, 9)]

UnityProject/Assets/Plugins/Zenject/Source/Install/Contexts/StaticContext.cs

@@ -3,7 +3,7 @@
 namespace Zenject
 {
     // For some platforms, it's desirable to be able to add dependencies to Zenject before
-    // Unity even starts up (eg. WSA as described here https://github.com/modesttree/Zenject/issues/118)
+    // Unity even starts up (eg. WSA as described here https://github.com/svermeulen/Zenject/issues/118)
     // In those cases you can call StaticContext.Container.BindX to add dependencies
     // Anything you add there will then be injected everywhere, since all other contexts
     // should be children of StaticContext

UnityProject/Assets/Plugins/Zenject/Source/Providers/CachedOpenTypeProvider.cs

@@ -49,7 +49,7 @@ public int NumInstances
         }
 
         // This method can be called if you want to clear the memory for an AsSingle instance,
-        // See isssue https://github.com/modesttree/Zenject/issues/441
+        // See isssue https://github.com/svermeulen/Zenject/issues/441
         public void ClearCache()
         {
 #if ZEN_MULTITHREADING

UnityProject/Assets/Plugins/Zenject/Source/Providers/CachedProvider.cs

@@ -50,7 +50,7 @@ public int NumInstances
         }
 
         // This method can be called if you want to clear the memory for an AsSingle instance,
-        // See isssue https://github.com/modesttree/Zenject/issues/441
+        // See isssue https://github.com/svermeulen/Zenject/issues/441
         public void ClearCache()
         {
 #if ZEN_MULTITHREADING

UnityProject/Assets/Plugins/Zenject/Source/Util/ZenReflectionTypeAnalyzer.cs

@@ -228,7 +228,7 @@ static ConstructorInfo TryGetInjectConstructor(Type type)
                 // This might result in some non obvious errors like null reference exceptions
                 // but is probably the best trade-off since it allows zenject to be more compatible
                 // with libraries that don't depend on zenject at all
-                // Discussion here - https://github.com/modesttree/Zenject/issues/416
+                // Discussion here - https://github.com/svermeulen/Zenject/issues/416
                 return constructors.OrderBy(x => x.GetParameters().Count()).First();
             }