Changed ZenjectIntegrationTestFixture file to be optional since it do…

…esn't compile anymore with 2018 except when playmode tests are enabled
ssannandeji · Mar 6, 2018 · efc7cef · efc7cef
1 parent c688df8
commit efc7cef
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 3 deletions.
diff --git a/Build/python/mtm/zen/CreateRelease.py b/Build/python/mtm/zen/CreateRelease.py
@@ -119,6 +119,10 @@ def _createCSharpPackage(self, includeSample, outputPath):
             self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/UnitTests')
             self._sys.removeFile('[ZenTempDir]/OptionalExtras/UnitTests.meta')
 
+            self._zipHelper.createZipFile('[ZenTempDir]/OptionalExtras/ZenjectIntegrationTest', '[ZenTempDir]/OptionalExtras/ZenjectIntegrationTest.zip')
+            self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/ZenjectIntegrationTest')
+            self._sys.removeFile('[ZenTempDir]/OptionalExtras/ZenjectIntegrationTest.meta')
+
             self._zipHelper.createZipFile('[ZenTempDir]/OptionalExtras/IntegrationTests', '[ZenTempDir]/OptionalExtras/IntegrationTests.zip')
             self._sys.deleteDirectory('[ZenTempDir]/OptionalExtras/IntegrationTests')
             self._sys.removeFile('[ZenTempDir]/OptionalExtras/IntegrationTests.meta')
@@ -145,7 +149,7 @@ def installBindings():
 
     config = {
         'PathVars': {
-            'UnityExePath': 'C:/Utils/Unity/Unity2017.1.1f1/Editor/Unity.exe',
+            'UnityExePath': 'D:/Utils/Unity/Unity2017.2.0f3/Editor/Unity.exe',
             'LogPath': os.path.join(BuildDir, 'Log.txt'),
             'MsBuildExePath': 'C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe'
         },

diff --git a/Documentation/ReleaseNotes.md b/Documentation/ReleaseNotes.md
@@ -3,6 +3,8 @@
 
 ###5.5.0 (March 7, 2017)
 
+Minor release, mostly bug fixes
+
 Bug fixes
 - Fixed some bugs with NonLazy bind method
 - Changed validation to output only the errors relevant to the user

diff --git a/...ssets/Plugins/Zenject/Source/Testing.meta → ...ptionalExtras/ZenjectIntegrationTest.meta b/...ssets/Plugins/Zenject/Source/Testing.meta → ...ptionalExtras/ZenjectIntegrationTest.meta
diff --git a/...t/Source/Testing/ValidateOnlyAttribute.cs → ...tIntegrationTest/ValidateOnlyAttribute.cs b/...t/Source/Testing/ValidateOnlyAttribute.cs → ...tIntegrationTest/ValidateOnlyAttribute.cs
diff --git a/...rce/Testing/ValidateOnlyAttribute.cs.meta → ...grationTest/ValidateOnlyAttribute.cs.meta b/...rce/Testing/ValidateOnlyAttribute.cs.meta → ...grationTest/ValidateOnlyAttribute.cs.meta
diff --git a/.../Testing/ZenjectIntegrationTestFixture.cs → ...tionTest/ZenjectIntegrationTestFixture.cs b/.../Testing/ZenjectIntegrationTestFixture.cs → ...tionTest/ZenjectIntegrationTestFixture.cs
diff --git a/...ing/ZenjectIntegrationTestFixture.cs.meta → ...est/ZenjectIntegrationTestFixture.cs.meta b/...ing/ZenjectIntegrationTestFixture.cs.meta → ...est/ZenjectIntegrationTestFixture.cs.meta