From bd8ef115c83ead5d73e54958b16bc03449c6044c Mon Sep 17 00:00:00 2001 From: kstreicher Date: Tue, 18 Aug 2020 11:53:52 +0200 Subject: [PATCH] fix(163): Add Zenject.SampleGame1.asmdef and Zenject.SampleGame2.asmdef which are required if Zenject.asmdef is not using auto reference (+2 squashed commit) [86a08a93] fix: Re-add Zenject.asmdef and rename to "Z"enject as the assembly should match the name for case sensitive systems. [ca06f460] fix: Reset project version to 2019.3.0f1 and remove all related changes (+1 squashed commits) [817e4ec0] fix(build): Replace zenject.ref.asmref with Zenject.SampledBuilder.Editor.asmdef which is only included in the editor to avoid usage of UnityEditor outside of the editor (+1 squashed commits) [8f9dafbf] fix(.gitignore): Ignore UnityProject/UserSettings/* which is a new user specific folder, which previously was stored in /Library (see https://forum.unity.com/threads/whats-the-usersettings-directory.754436/#post-5029937) fix(packages-lock.json): Should be checked in, but wasn't or did not exist in the old unity version (+1 squashed commits) [1f431e39] fix(161): Update zenject.asmdef to specify all default values --- .gitignore | 1 + .../Scripts/Zenject.SampleGame1.asmdef | 17 +++++++++++++++++ .../Scripts/Zenject.SampleGame1.asmdef.meta | 7 +++++++ .../Scripts/Zenject.SampleGame2.asmdef | 17 +++++++++++++++++ .../Scripts/Zenject.SampleGame2.asmdef.meta | 7 +++++++ .../Assets/Plugins/Zenject/Zenject.asmdef | 15 +++++++++++++++ .../Assets/Plugins/Zenject/zenject.asmdef | 3 --- .../Editor/Zenject.SampleBuilder.Editor.asmdef | 17 +++++++++++++++++ .../Zenject.SampleBuilder.Editor.asmdef.meta | 7 +++++++ 9 files changed, 88 insertions(+), 3 deletions(-) create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef create mode 100644 UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef.meta create mode 100644 UnityProject/Assets/Plugins/Zenject/Zenject.asmdef delete mode 100644 UnityProject/Assets/Plugins/Zenject/zenject.asmdef create mode 100644 UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef create mode 100644 UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef.meta diff --git a/.gitignore b/.gitignore index e022a45be..446d78e7d 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ project_root_marker # Added by Mathijs: .DS_Store +UnityProject/UserSettings/ diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef new file mode 100644 index 000000000..cc637fb8a --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Zenject.SampleGame1", + "references": [ + "GUID:0d8beb7f090555447a6cf5ce9e54dbb4" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "Zenject-usage.dll" + ], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef.meta new file mode 100644 index 000000000..ae04a233f --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame1 (Beginner)/Scripts/Zenject.SampleGame1.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 843f9d4160550b24c98d64694d4483c0 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef new file mode 100644 index 000000000..0e245c5c2 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Zenject.SampleGame2", + "references": [ + "GUID:0d8beb7f090555447a6cf5ce9e54dbb4" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "Zenject-usage.dll" + ], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef.meta b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef.meta new file mode 100644 index 000000000..4a7541cc9 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/OptionalExtras/SampleGame2 (Advanced)/Scripts/Zenject.SampleGame2.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e4bf1a26f055d494db2f484c8a8511ab +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/Plugins/Zenject/Zenject.asmdef b/UnityProject/Assets/Plugins/Zenject/Zenject.asmdef new file mode 100644 index 000000000..2b070a7e6 --- /dev/null +++ b/UnityProject/Assets/Plugins/Zenject/Zenject.asmdef @@ -0,0 +1,15 @@ +{ + "name": "Zenject", + "references": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "Zenject-usage.dll" + ], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} diff --git a/UnityProject/Assets/Plugins/Zenject/zenject.asmdef b/UnityProject/Assets/Plugins/Zenject/zenject.asmdef deleted file mode 100644 index def0954be..000000000 --- a/UnityProject/Assets/Plugins/Zenject/zenject.asmdef +++ /dev/null @@ -1,3 +0,0 @@ -{ - "name": "Zenject" -} diff --git a/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef b/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef new file mode 100644 index 000000000..1189bb46a --- /dev/null +++ b/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "Zenject.SampleBuilder.Editor", + "references": [ + "GUID:0d8beb7f090555447a6cf5ce9e54dbb4" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [], + "autoReferenced": false, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef.meta b/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef.meta new file mode 100644 index 000000000..77f19b348 --- /dev/null +++ b/UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff9514983d9d4b64cab56b5016b45fd9 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: