Skip to content

Commit 9895c5c

Browse files
KuraiAndrasKuraiAndras
committed
Merge branch 'feature/fix-unity-injection-behavior' into develop
2 parents 653cca1 + 00365f4 commit 9895c5c

File tree

8 files changed

+392
-11
lines changed

8 files changed

+392
-11
lines changed

‎Injecter.Unity/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ crashlytics-build.properties
6969
/[Aa]ssets/[Ss]treamingAssets/aa.meta
7070
/[Aa]ssets/[Ss]treamingAssets/aa/*
7171

72-
!/**/manifest.json
72+
![Pp]ackages/*

‎Injecter.Unity/Assets/Injecter.Unity/InjectStarter.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ protected virtual void Awake()
1818
gameObject.AddComponent<SceneInjector>().InitializeScene(serviceProvider);
1919
break;
2020
case SceneInjectorOptions.Behavior.CompositionRoot:
21-
CompositionRoot.ServiceProvider = CreateServiceProvider();
21+
CompositionRoot.ServiceProvider = serviceProvider;
2222
break;
2323
default:
2424
throw new ArgumentOutOfRangeException(options.InjectionBehavior.ToString());

‎Injecter.Unity/Assets/Injecter.Unity/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.injecter.unity",
3-
"version": "3.0.1",
3+
"version": "3.0.2",
44
"displayName": "Injecter.Unity",
55
"author": {
66
"name": "Kurai András",

‎Injecter.Unity/Packages/manifest.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"dependencies": {
33
"com.injecter.unity.dependencies": "file:../../Injecter.Unity.Dependencies/bin/Debug/net472",
4-
"com.unity.collab-proxy": "1.2.16",
5-
"com.unity.ide.rider": "1.1.4",
6-
"com.unity.ide.vscode": "1.1.4",
7-
"com.unity.test-framework": "1.1.13",
8-
"com.unity.textmeshpro": "2.0.1",
9-
"com.unity.timeline": "1.2.13",
4+
"com.unity.ide.rider": "1.2.1",
5+
"com.unity.ide.visualstudio": "2.0.2",
6+
"com.unity.ide.vscode": "1.2.1",
7+
"com.unity.test-framework": "1.1.16",
8+
"com.unity.textmeshpro": "3.0.1",
9+
"com.unity.timeline": "1.3.5",
1010
"com.unity.ugui": "1.0.0",
1111
"com.unity.modules.ai": "1.0.0",
1212
"com.unity.modules.androidjni": "1.0.0",

‎Injecter.Unity/Packages/packages-lock.json‎

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

0 commit comments

Comments
 (0)