Skip to content

Commit 9cd3075

Browse files
Merge pull request #138 from Mathijs-Bakker/fix-135-AssemblyDefinitionsOptionalExtras
Change assembly definitions json files
2 parents 1fb299b + 695cf80 commit 9cd3075

File tree

4 files changed

+16
-5
lines changed

4 files changed

+16
-5
lines changed

UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Tests/Zenject-IntegrationTests-Editor.asmdef

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
"UnityEngine.TestRunner",
88
"UnityEditor.TestRunner"
99
],
10+
"optionalUnityReferences": [
11+
"TestAssemblies"
12+
],
1013
"includePlatforms": [],
1114
"excludePlatforms": [],
1215
"allowUnsafeCode": false,
1316
"overrideReferences": true,
1417
"precompiledReferences": [
15-
"nunit.framework.dll",
1618
"Zenject-usage.dll"
1719
],
1820
"autoReferenced": false,

UnityProject/Assets/Plugins/Zenject/OptionalExtras/IntegrationTests/Zenject-IntegrationTests.asmdef

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,15 @@
44
"Zenject-TestFramework",
55
"Zenject"
66
],
7-
"optionalUnityReferences": [],
7+
"optionalUnityReferences": [
8+
"TestAssemblies"
9+
],
810
"includePlatforms": [],
911
"excludePlatforms": [],
10-
"allowUnsafeCode": false
12+
"allowUnsafeCode": false,
13+
"overrideReferences": false,
14+
"precompiledReferences": [],
15+
"autoReferenced": true,
16+
"defineConstraints": [],
17+
"versionDefines": []
1118
}

UnityProject/Assets/Plugins/Zenject/OptionalExtras/UnitTests/Editor/Zenject-UnitTests-Editor.asmdef

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
"UnityEngine.TestRunner",
77
"UnityEditor.TestRunner"
88
],
9+
"optionalUnityReferences": [
10+
"TestAssemblies"
11+
],
912
"includePlatforms": [
1013
"Editor"
1114
],
1215
"excludePlatforms": [],
1316
"allowUnsafeCode": false,
1417
"overrideReferences": true,
1518
"precompiledReferences": [
16-
"nunit.framework.dll",
1719
"Zenject-usage.dll"
1820
],
1921
"autoReferenced": false,

UnityProject/ProjectSettings/GraphicsSettings.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ GraphicsSettings:
3838
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
3939
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
4040
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
41-
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
41+
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
4242
m_PreloadedShaders: []
4343
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4444
type: 0}

0 commit comments

Comments
 (0)