Skip to content

Commit

Permalink
fix(163): Add Zenject.SampleGame1.asmdef and Zenject.SampleGame2.asmd…
Browse files Browse the repository at this point in the history
…ef 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.
[ca06f46] fix: Reset project version to 2019.3.0f1 and remove all related changes (+1 squashed commits)
[817e4ec] 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)
[8f9dafb] 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)
[1f431e3] fix(161): Update zenject.asmdef to specify all default values
  • Loading branch information
kstreicher committed Aug 18, 2020
1 parent c2e3350 commit bd8ef11
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ project_root_marker

# Added by Mathijs:
.DS_Store
UnityProject/UserSettings/
Original file line number Diff line number Diff line change
@@ -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
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -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
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions UnityProject/Assets/Plugins/Zenject/Zenject.asmdef
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "Zenject",
"references": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [
"Zenject-usage.dll"
],
"autoReferenced": false,
"defineConstraints": [],
"versionDefines": [],
"noEngineReferences": false
}
3 changes: 0 additions & 3 deletions UnityProject/Assets/Plugins/Zenject/zenject.asmdef

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit bd8ef11

Please sign in to comment.