Merge pull request #5 from svermeulen/master

Update from svermeulen/Extenject
starikcetin · Jan 24, 2020 · 2272e03 · 2272e03
2 parents 9978b72 + 9ecc91d
commit 2272e03
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 12 deletions.
diff --git a/Documentation/AutoMocking.md b/Documentation/AutoMocking.md
@@ -56,7 +56,7 @@ Note that by default, Auto-mocking is not enabled in Zenject.  If you wish to us
 ## Using Moq
 
 If you wish to use Moq then you need to go to your Zenject install directory and extract the contents of ``Zenject\OptionalExtras\AutoMoq.zip`` into that same directory.
-The extracted folder should then be dropped in ``Zenject\OptionalExtras\TestFrameWork\Editor``.
+The extracted folder should then be moved to ``Zenject\OptionalExtras\TestFrameWork\Editor``.
 
 Note that there are multiple versions of Moq.dll included in the zip and that you should use the one that targets the Scripting Runtime Version that you have configured in your player settings. Also note that if you're using Scripting Runtime Version 3.5, that you might also need to change your "Api Compatibility Level" from ".NET 2.0 Subset" to ".NET 2.0"
 
@@ -79,7 +79,7 @@ For more details, see the documentation for [Moq](https://github.com/moq/moq4)
 ## Using NSubstitute
 
 If you wish to use NSubstitute then you need to go to your Zenject install directory and extract the contents of ``Zenject\OptionalExtras\AutoSubstitute.zip``.
-The extracted folder should then be dropped in ``Zenject\OptionalExtras\TestFrameWork\Editor``.
+The extracted folder should then be moved to ``Zenject\OptionalExtras\TestFrameWork\Editor``.
 
 > Mock, stub, fake, spy, test double? Strict or loose? Nah, just substitute for the type you need!
 

diff --git a/...gins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef b/...gins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef
@@ -3,12 +3,21 @@
     "references": [
         "Zenject-TestFramework",
         "Zenject",
-        "Zenject-IntegrationTests"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "Zenject-IntegrationTests",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll",
+        "Zenject-usage.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": []
 }
diff --git a/...ct/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/Zenject-UnitTests-Editor.asmdef b/...ct/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/Zenject-UnitTests-Editor.asmdef
@@ -2,14 +2,23 @@
     "name": "Zenject-UnitTests-Editor",
     "references": [
         "Zenject",
-        "Zenject-TestFramework"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
+        "Zenject-TestFramework",
+        "UnityEngine.TestRunner",
+        "UnityEditor.TestRunner"
     ],
     "includePlatforms": [
         "Editor"
     ],
     "excludePlatforms": [],
-    "allowUnsafeCode": false
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "nunit.framework.dll",
+        "Zenject-usage.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
+    ],
+    "versionDefines": []
 }