Skip to content

Commit 817e4ec

Browse files
author
kstreicher
committed
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
1 parent c2e3350 commit 817e4ec

File tree

8 files changed

+380
-7
lines changed

8 files changed

+380
-7
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,4 @@ project_root_marker
1818

1919
# Added by Mathijs:
2020
.DS_Store
21+
UnityProject/UserSettings/

‎UnityProject/Assets/Plugins/Zenject/zenject.asmdef

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
11
{
2-
"name": "Zenject"
2+
"name": "Zenject",
3+
"references": [],
4+
"includePlatforms": [],
5+
"excludePlatforms": [],
6+
"allowUnsafeCode": false,
7+
"overrideReferences": true,
8+
"precompiledReferences": [
9+
"Zenject-usage.dll"
10+
],
11+
"autoReferenced": false,
12+
"defineConstraints": [],
13+
"versionDefines": [],
14+
"noEngineReferences": false
315
}

‎UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"name": "Zenject.SampleBuilder.Editor",
3+
"references": [
4+
"GUID:0d8beb7f090555447a6cf5ce9e54dbb4"
5+
],
6+
"includePlatforms": [
7+
"Editor"
8+
],
9+
"excludePlatforms": [],
10+
"allowUnsafeCode": false,
11+
"overrideReferences": true,
12+
"precompiledReferences": [],
13+
"autoReferenced": false,
14+
"defineConstraints": [],
15+
"versionDefines": [],
16+
"noEngineReferences": false
17+
}

‎UnityProject/Assets/SampleBuilder/Editor/Zenject.SampleBuilder.Editor.asmdef.meta

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎UnityProject/Packages/manifest.json

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.collab-proxy": "1.2.16",
6-
"com.unity.ide.rider": "1.1.0",
7-
"com.unity.ide.vscode": "1.1.3",
8-
"com.unity.test-framework": "1.1.3",
5+
"com.unity.collab-proxy": "1.3.8",
6+
"com.unity.ide.rider": "1.2.1",
7+
"com.unity.ide.visualstudio": "2.0.2",
8+
"com.unity.ide.vscode": "1.2.1",
9+
"com.unity.test-framework": "1.1.16",
910
"com.unity.ugui": "1.0.0",
1011
"com.unity.modules.ai": "1.0.0",
1112
"com.unity.modules.androidjni": "1.0.0",

‎UnityProject/Packages/packages-lock.json

+327
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,327 @@
1+
{
2+
"dependencies": {
3+
"com.unity.2d.sprite": {
4+
"version": "1.0.0",
5+
"depth": 0,
6+
"source": "builtin",
7+
"dependencies": {}
8+
},
9+
"com.unity.2d.tilemap": {
10+
"version": "1.0.0",
11+
"depth": 0,
12+
"source": "builtin",
13+
"dependencies": {}
14+
},
15+
"com.unity.collab-proxy": {
16+
"version": "1.3.8",
17+
"depth": 0,
18+
"source": "registry",
19+
"dependencies": {},
20+
"url": "https://packages.unity.com"
21+
},
22+
"com.unity.ext.nunit": {
23+
"version": "1.0.0",
24+
"depth": 1,
25+
"source": "registry",
26+
"dependencies": {},
27+
"url": "https://packages.unity.com"
28+
},
29+
"com.unity.ide.rider": {
30+
"version": "1.2.1",
31+
"depth": 0,
32+
"source": "registry",
33+
"dependencies": {
34+
"com.unity.test-framework": "1.1.1"
35+
},
36+
"url": "https://packages.unity.com"
37+
},
38+
"com.unity.ide.visualstudio": {
39+
"version": "2.0.2",
40+
"depth": 0,
41+
"source": "registry",
42+
"dependencies": {},
43+
"url": "https://packages.unity.com"
44+
},
45+
"com.unity.ide.vscode": {
46+
"version": "1.2.1",
47+
"depth": 0,
48+
"source": "registry",
49+
"dependencies": {},
50+
"url": "https://packages.unity.com"
51+
},
52+
"com.unity.test-framework": {
53+
"version": "1.1.16",
54+
"depth": 0,
55+
"source": "registry",
56+
"dependencies": {
57+
"com.unity.ext.nunit": "1.0.0",
58+
"com.unity.modules.imgui": "1.0.0",
59+
"com.unity.modules.jsonserialize": "1.0.0"
60+
},
61+
"url": "https://packages.unity.com"
62+
},
63+
"com.unity.ugui": {
64+
"version": "1.0.0",
65+
"depth": 0,
66+
"source": "builtin",
67+
"dependencies": {
68+
"com.unity.modules.ui": "1.0.0",
69+
"com.unity.modules.imgui": "1.0.0"
70+
}
71+
},
72+
"com.unity.modules.ai": {
73+
"version": "1.0.0",
74+
"depth": 0,
75+
"source": "builtin",
76+
"dependencies": {}
77+
},
78+
"com.unity.modules.androidjni": {
79+
"version": "1.0.0",
80+
"depth": 0,
81+
"source": "builtin",
82+
"dependencies": {}
83+
},
84+
"com.unity.modules.animation": {
85+
"version": "1.0.0",
86+
"depth": 0,
87+
"source": "builtin",
88+
"dependencies": {}
89+
},
90+
"com.unity.modules.assetbundle": {
91+
"version": "1.0.0",
92+
"depth": 0,
93+
"source": "builtin",
94+
"dependencies": {}
95+
},
96+
"com.unity.modules.audio": {
97+
"version": "1.0.0",
98+
"depth": 0,
99+
"source": "builtin",
100+
"dependencies": {}
101+
},
102+
"com.unity.modules.cloth": {
103+
"version": "1.0.0",
104+
"depth": 0,
105+
"source": "builtin",
106+
"dependencies": {
107+
"com.unity.modules.physics": "1.0.0"
108+
}
109+
},
110+
"com.unity.modules.director": {
111+
"version": "1.0.0",
112+
"depth": 0,
113+
"source": "builtin",
114+
"dependencies": {
115+
"com.unity.modules.audio": "1.0.0",
116+
"com.unity.modules.animation": "1.0.0"
117+
}
118+
},
119+
"com.unity.modules.imageconversion": {
120+
"version": "1.0.0",
121+
"depth": 0,
122+
"source": "builtin",
123+
"dependencies": {}
124+
},
125+
"com.unity.modules.imgui": {
126+
"version": "1.0.0",
127+
"depth": 0,
128+
"source": "builtin",
129+
"dependencies": {}
130+
},
131+
"com.unity.modules.jsonserialize": {
132+
"version": "1.0.0",
133+
"depth": 0,
134+
"source": "builtin",
135+
"dependencies": {}
136+
},
137+
"com.unity.modules.particlesystem": {
138+
"version": "1.0.0",
139+
"depth": 0,
140+
"source": "builtin",
141+
"dependencies": {}
142+
},
143+
"com.unity.modules.physics": {
144+
"version": "1.0.0",
145+
"depth": 0,
146+
"source": "builtin",
147+
"dependencies": {}
148+
},
149+
"com.unity.modules.physics2d": {
150+
"version": "1.0.0",
151+
"depth": 0,
152+
"source": "builtin",
153+
"dependencies": {}
154+
},
155+
"com.unity.modules.screencapture": {
156+
"version": "1.0.0",
157+
"depth": 0,
158+
"source": "builtin",
159+
"dependencies": {
160+
"com.unity.modules.imageconversion": "1.0.0"
161+
}
162+
},
163+
"com.unity.modules.subsystems": {
164+
"version": "1.0.0",
165+
"depth": 1,
166+
"source": "builtin",
167+
"dependencies": {
168+
"com.unity.modules.jsonserialize": "1.0.0"
169+
}
170+
},
171+
"com.unity.modules.terrain": {
172+
"version": "1.0.0",
173+
"depth": 0,
174+
"source": "builtin",
175+
"dependencies": {}
176+
},
177+
"com.unity.modules.terrainphysics": {
178+
"version": "1.0.0",
179+
"depth": 0,
180+
"source": "builtin",
181+
"dependencies": {
182+
"com.unity.modules.physics": "1.0.0",
183+
"com.unity.modules.terrain": "1.0.0"
184+
}
185+
},
186+
"com.unity.modules.tilemap": {
187+
"version": "1.0.0",
188+
"depth": 0,
189+
"source": "builtin",
190+
"dependencies": {
191+
"com.unity.modules.physics2d": "1.0.0"
192+
}
193+
},
194+
"com.unity.modules.ui": {
195+
"version": "1.0.0",
196+
"depth": 0,
197+
"source": "builtin",
198+
"dependencies": {}
199+
},
200+
"com.unity.modules.uielements": {
201+
"version": "1.0.0",
202+
"depth": 0,
203+
"source": "builtin",
204+
"dependencies": {
205+
"com.unity.modules.ui": "1.0.0",
206+
"com.unity.modules.imgui": "1.0.0",
207+
"com.unity.modules.jsonserialize": "1.0.0",
208+
"com.unity.modules.uielementsnative": "1.0.0"
209+
}
210+
},
211+
"com.unity.modules.uielementsnative": {
212+
"version": "1.0.0",
213+
"depth": 1,
214+
"source": "builtin",
215+
"dependencies": {
216+
"com.unity.modules.ui": "1.0.0",
217+
"com.unity.modules.imgui": "1.0.0",
218+
"com.unity.modules.jsonserialize": "1.0.0"
219+
}
220+
},
221+
"com.unity.modules.umbra": {
222+
"version": "1.0.0",
223+
"depth": 0,
224+
"source": "builtin",
225+
"dependencies": {}
226+
},
227+
"com.unity.modules.unityanalytics": {
228+
"version": "1.0.0",
229+
"depth": 0,
230+
"source": "builtin",
231+
"dependencies": {
232+
"com.unity.modules.unitywebrequest": "1.0.0",
233+
"com.unity.modules.jsonserialize": "1.0.0"
234+
}
235+
},
236+
"com.unity.modules.unitywebrequest": {
237+
"version": "1.0.0",
238+
"depth": 0,
239+
"source": "builtin",
240+
"dependencies": {}
241+
},
242+
"com.unity.modules.unitywebrequestassetbundle": {
243+
"version": "1.0.0",
244+
"depth": 0,
245+
"source": "builtin",
246+
"dependencies": {
247+
"com.unity.modules.assetbundle": "1.0.0",
248+
"com.unity.modules.unitywebrequest": "1.0.0"
249+
}
250+
},
251+
"com.unity.modules.unitywebrequestaudio": {
252+
"version": "1.0.0",
253+
"depth": 0,
254+
"source": "builtin",
255+
"dependencies": {
256+
"com.unity.modules.unitywebrequest": "1.0.0",
257+
"com.unity.modules.audio": "1.0.0"
258+
}
259+
},
260+
"com.unity.modules.unitywebrequesttexture": {
261+
"version": "1.0.0",
262+
"depth": 0,
263+
"source": "builtin",
264+
"dependencies": {
265+
"com.unity.modules.unitywebrequest": "1.0.0",
266+
"com.unity.modules.imageconversion": "1.0.0"
267+
}
268+
},
269+
"com.unity.modules.unitywebrequestwww": {
270+
"version": "1.0.0",
271+
"depth": 0,
272+
"source": "builtin",
273+
"dependencies": {
274+
"com.unity.modules.unitywebrequest": "1.0.0",
275+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
276+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
277+
"com.unity.modules.audio": "1.0.0",
278+
"com.unity.modules.assetbundle": "1.0.0",
279+
"com.unity.modules.imageconversion": "1.0.0"
280+
}
281+
},
282+
"com.unity.modules.vehicles": {
283+
"version": "1.0.0",
284+
"depth": 0,
285+
"source": "builtin",
286+
"dependencies": {
287+
"com.unity.modules.physics": "1.0.0"
288+
}
289+
},
290+
"com.unity.modules.video": {
291+
"version": "1.0.0",
292+
"depth": 0,
293+
"source": "builtin",
294+
"dependencies": {
295+
"com.unity.modules.audio": "1.0.0",
296+
"com.unity.modules.ui": "1.0.0",
297+
"com.unity.modules.unitywebrequest": "1.0.0"
298+
}
299+
},
300+
"com.unity.modules.vr": {
301+
"version": "1.0.0",
302+
"depth": 0,
303+
"source": "builtin",
304+
"dependencies": {
305+
"com.unity.modules.jsonserialize": "1.0.0",
306+
"com.unity.modules.physics": "1.0.0",
307+
"com.unity.modules.xr": "1.0.0"
308+
}
309+
},
310+
"com.unity.modules.wind": {
311+
"version": "1.0.0",
312+
"depth": 0,
313+
"source": "builtin",
314+
"dependencies": {}
315+
},
316+
"com.unity.modules.xr": {
317+
"version": "1.0.0",
318+
"depth": 0,
319+
"source": "builtin",
320+
"dependencies": {
321+
"com.unity.modules.physics": "1.0.0",
322+
"com.unity.modules.jsonserialize": "1.0.0",
323+
"com.unity.modules.subsystems": "1.0.0"
324+
}
325+
}
326+
}
327+
}

‎UnityProject/ProjectSettings/ProjectVersion.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.3.0f1
2-
m_EditorVersionWithRevision: 2019.3.0f1 (ffacea4b84e7)
1+
m_EditorVersion: 2020.1.2f1
2+
m_EditorVersionWithRevision: 2020.1.2f1 (7b32bc54ba47)

0 commit comments

Comments
 (0)