Skip to content

Commit 9f8e5e3

Browse files
killzomskillzoms
authored
Clean up warnings (SubnauticaNitrox#1179)
* damn warnings * Clean up references
1 parent 6580ffd commit 9f8e5e3

2 files changed

Lines changed: 276 additions & 18 deletions

File tree

‎Directory.Build.props‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<PropertyGroup>
55
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
66
<TestLibrary>false</TestLibrary>
7+
<NitroxLibrary>false</NitroxLibrary>
8+
<UnityModLibrary>false</UnityModLibrary>
79
</PropertyGroup>
810
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
911
<DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -29,9 +31,14 @@
2931
<Compile Condition="'$(NitroxLibrary)' == 'true'" Include="$(SolutionDir)AssemblyInfoCommon.cs">
3032
<Link>Properties\AssemblyInfoCommon.cs</Link>
3133
</Compile>
32-
33-
<ProjectReference Condition="'$(UnityModLibrary)' == 'true'" Include="$(SolutionDir)NitroxModel\NitroxModel.csproj">
34-
<Name>NitroxModel</Name>
35-
</ProjectReference>
3634
</ItemGroup>
35+
<Choose>
36+
<When Condition="'$(UnityModLibrary)' == 'true'">
37+
<ItemGroup>
38+
<ProjectReference Include="$(SolutionDir)NitroxModel\NitroxModel.csproj">
39+
<Name>NitroxModel</Name>
40+
</ProjectReference>
41+
</ItemGroup>
42+
</When>
43+
</Choose>
3744
</Project>

‎Directory.Build.targets‎

Lines changed: 265 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,270 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)SharedConfig.targets"/>
3+
<Import Project="$(SolutionDir)SharedConfig.targets"/>
44

5-
<!-- UnityEngine libraries to include -->
6-
<ItemGroup Condition="'$(UnityModLibrary)' == 'true' or '$(TestLibrary)' == 'true'">
7-
<Reference Include="$(SubnauticaManaged)\UnityEngine*.dll">
8-
<Private>$(TestLibrary)</Private>
9-
</Reference>
5+
<Choose>
6+
<When Condition="'$(UnityModLibrary)' == 'true' or '$(TestLibrary)' == 'true'">
7+
<!-- UnityEngine libraries to include -->
8+
<ItemGroup>
109

11-
<Reference Include="$(SubnauticaManaged)\Assembly-CSharp.dll">
12-
<Private>$(TestLibrary)</Private>
13-
</Reference>
10+
<Reference Include="Unity.Timeline">
11+
<HintPath>$(SubnauticaManaged)\Unity.Timeline.dll</HintPath>
12+
<Private>$(TestLibrary)</Private>
13+
</Reference>
14+
<Reference Include="UnityEngine">
15+
<HintPath>$(SubnauticaManaged)\UnityEngine.dll</HintPath>
16+
<Private>$(TestLibrary)</Private>
17+
</Reference>
18+
<Reference Include="UnityEngine.AccessibilityModule">
19+
<HintPath>$(SubnauticaManaged)\UnityEngine.AccessibilityModule.dll</HintPath>
20+
<Private>$(TestLibrary)</Private>
21+
</Reference>
22+
<Reference Include="UnityEngine.AIModule">
23+
<HintPath>$(SubnauticaManaged)\UnityEngine.AIModule.dll</HintPath>
24+
<Private>$(TestLibrary)</Private>
25+
</Reference>
26+
<Reference Include="UnityEngine.AndroidJNIModule">
27+
<HintPath>$(SubnauticaManaged)\UnityEngine.AndroidJNIModule.dll</HintPath>
28+
<Private>$(TestLibrary)</Private>
29+
</Reference>
30+
<Reference Include="UnityEngine.AnimationModule">
31+
<HintPath>$(SubnauticaManaged)\UnityEngine.AnimationModule.dll</HintPath>
32+
<Private>$(TestLibrary)</Private>
33+
</Reference>
34+
<Reference Include="UnityEngine.ARModule">
35+
<HintPath>$(SubnauticaManaged)\UnityEngine.ARModule.dll</HintPath>
36+
<Private>$(TestLibrary)</Private>
37+
</Reference>
38+
<Reference Include="UnityEngine.AssetBundleModule">
39+
<HintPath>$(SubnauticaManaged)\UnityEngine.AssetBundleModule.dll</HintPath>
40+
<Private>$(TestLibrary)</Private>
41+
</Reference>
42+
<Reference Include="UnityEngine.AudioModule">
43+
<HintPath>$(SubnauticaManaged)\UnityEngine.AudioModule.dll</HintPath>
44+
<Private>$(TestLibrary)</Private>
45+
</Reference>
46+
<Reference Include="UnityEngine.ClothModule">
47+
<HintPath>$(SubnauticaManaged)\UnityEngine.ClothModule.dll</HintPath>
48+
<Private>$(TestLibrary)</Private>
49+
</Reference>
50+
<Reference Include="UnityEngine.ClusterInputModule">
51+
<HintPath>$(SubnauticaManaged)\UnityEngine.ClusterInputModule.dll</HintPath>
52+
<Private>$(TestLibrary)</Private>
53+
</Reference>
54+
<Reference Include="UnityEngine.ClusterRendererModule">
55+
<HintPath>$(SubnauticaManaged)\UnityEngine.ClusterRendererModule.dll</HintPath>
56+
<Private>$(TestLibrary)</Private>
57+
</Reference>
58+
<Reference Include="UnityEngine.CoreModule">
59+
<HintPath>$(SubnauticaManaged)\UnityEngine.CoreModule.dll</HintPath>
60+
<Private>$(TestLibrary)</Private>
61+
</Reference>
62+
<Reference Include="UnityEngine.CrashReportingModule">
63+
<HintPath>$(SubnauticaManaged)\UnityEngine.CrashReportingModule.dll</HintPath>
64+
<Private>$(TestLibrary)</Private>
65+
</Reference>
66+
<Reference Include="UnityEngine.DirectorModule">
67+
<HintPath>$(SubnauticaManaged)\UnityEngine.DirectorModule.dll</HintPath>
68+
<Private>$(TestLibrary)</Private>
69+
</Reference>
70+
<Reference Include="UnityEngine.DSPGraphModule">
71+
<HintPath>$(SubnauticaManaged)\UnityEngine.DSPGraphModule.dll</HintPath>
72+
<Private>$(TestLibrary)</Private>
73+
</Reference>
74+
<Reference Include="UnityEngine.FileSystemHttpModule">
75+
<HintPath>$(SubnauticaManaged)\UnityEngine.FileSystemHttpModule.dll</HintPath>
76+
<Private>$(TestLibrary)</Private>
77+
</Reference>
78+
<Reference Include="UnityEngine.GameCenterModule">
79+
<HintPath>$(SubnauticaManaged)\UnityEngine.GameCenterModule.dll</HintPath>
80+
<Private>$(TestLibrary)</Private>
81+
</Reference>
82+
<Reference Include="UnityEngine.GridModule">
83+
<HintPath>$(SubnauticaManaged)\UnityEngine.GridModule.dll</HintPath>
84+
<Private>$(TestLibrary)</Private>
85+
</Reference>
86+
<Reference Include="UnityEngine.HotReloadModule">
87+
<HintPath>$(SubnauticaManaged)\UnityEngine.HotReloadModule.dll</HintPath>
88+
<Private>$(TestLibrary)</Private>
89+
</Reference>
90+
<Reference Include="UnityEngine.ImageConversionModule">
91+
<HintPath>$(SubnauticaManaged)\UnityEngine.ImageConversionModule.dll</HintPath>
92+
<Private>$(TestLibrary)</Private>
93+
</Reference>
94+
<Reference Include="UnityEngine.IMGUIModule">
95+
<HintPath>$(SubnauticaManaged)\UnityEngine.IMGUIModule.dll</HintPath>
96+
<Private>$(TestLibrary)</Private>
97+
</Reference>
98+
<Reference Include="UnityEngine.InputLegacyModule">
99+
<HintPath>$(SubnauticaManaged)\UnityEngine.InputLegacyModule.dll</HintPath>
100+
<Private>$(TestLibrary)</Private>
101+
</Reference>
102+
<Reference Include="UnityEngine.InputModule">
103+
<HintPath>$(SubnauticaManaged)\UnityEngine.InputModule.dll</HintPath>
104+
<Private>$(TestLibrary)</Private>
105+
</Reference>
106+
<Reference Include="UnityEngine.JSONSerializeModule">
107+
<HintPath>$(SubnauticaManaged)\UnityEngine.JSONSerializeModule.dll</HintPath>
108+
<Private>$(TestLibrary)</Private>
109+
</Reference>
110+
<Reference Include="UnityEngine.LocalizationModule">
111+
<HintPath>$(SubnauticaManaged)\UnityEngine.LocalizationModule.dll</HintPath>
112+
<Private>$(TestLibrary)</Private>
113+
</Reference>
114+
<Reference Include="UnityEngine.ParticleSystemModule">
115+
<HintPath>$(SubnauticaManaged)\UnityEngine.ParticleSystemModule.dll</HintPath>
116+
<Private>$(TestLibrary)</Private>
117+
</Reference>
118+
<Reference Include="UnityEngine.PerformanceReportingModule">
119+
<HintPath>$(SubnauticaManaged)\UnityEngine.PerformanceReportingModule.dll</HintPath>
120+
<Private>$(TestLibrary)</Private>
121+
</Reference>
122+
<Reference Include="UnityEngine.Physics2DModule">
123+
<HintPath>$(SubnauticaManaged)\UnityEngine.Physics2DModule.dll</HintPath>
124+
<Private>$(TestLibrary)</Private>
125+
</Reference>
126+
<Reference Include="UnityEngine.PhysicsModule">
127+
<HintPath>$(SubnauticaManaged)\UnityEngine.PhysicsModule.dll</HintPath>
128+
<Private>$(TestLibrary)</Private>
129+
</Reference>
130+
<Reference Include="UnityEngine.ProfilerModule">
131+
<HintPath>$(SubnauticaManaged)\UnityEngine.ProfilerModule.dll</HintPath>
132+
<Private>$(TestLibrary)</Private>
133+
</Reference>
134+
<Reference Include="UnityEngine.ScreenCaptureModule">
135+
<HintPath>$(SubnauticaManaged)\UnityEngine.ScreenCaptureModule.dll</HintPath>
136+
<Private>$(TestLibrary)</Private>
137+
</Reference>
138+
<Reference Include="UnityEngine.SharedInternalsModule">
139+
<HintPath>$(SubnauticaManaged)\UnityEngine.SharedInternalsModule.dll</HintPath>
140+
<Private>$(TestLibrary)</Private>
141+
</Reference>
142+
<Reference Include="UnityEngine.SpriteMaskModule">
143+
<HintPath>$(SubnauticaManaged)\UnityEngine.SpriteMaskModule.dll</HintPath>
144+
<Private>$(TestLibrary)</Private>
145+
</Reference>
146+
<Reference Include="UnityEngine.SpriteShapeModule">
147+
<HintPath>$(SubnauticaManaged)\UnityEngine.SpriteShapeModule.dll</HintPath>
148+
<Private>$(TestLibrary)</Private>
149+
</Reference>
150+
<Reference Include="UnityEngine.StreamingModule">
151+
<HintPath>$(SubnauticaManaged)\UnityEngine.StreamingModule.dll</HintPath>
152+
<Private>$(TestLibrary)</Private>
153+
</Reference>
154+
<Reference Include="UnityEngine.SubstanceModule">
155+
<HintPath>$(SubnauticaManaged)\UnityEngine.SubstanceModule.dll</HintPath>
156+
<Private>$(TestLibrary)</Private>
157+
</Reference>
158+
<Reference Include="UnityEngine.TerrainModule">
159+
<HintPath>$(SubnauticaManaged)\UnityEngine.TerrainModule.dll</HintPath>
160+
<Private>$(TestLibrary)</Private>
161+
</Reference>
162+
<Reference Include="UnityEngine.TerrainPhysicsModule">
163+
<HintPath>$(SubnauticaManaged)\UnityEngine.TerrainPhysicsModule.dll</HintPath>
164+
<Private>$(TestLibrary)</Private>
165+
</Reference>
166+
<Reference Include="UnityEngine.TextCoreModule">
167+
<HintPath>$(SubnauticaManaged)\UnityEngine.TextCoreModule.dll</HintPath>
168+
<Private>$(TestLibrary)</Private>
169+
</Reference>
170+
<Reference Include="UnityEngine.TextRenderingModule">
171+
<HintPath>$(SubnauticaManaged)\UnityEngine.TextRenderingModule.dll</HintPath>
172+
<Private>$(TestLibrary)</Private>
173+
</Reference>
174+
<Reference Include="UnityEngine.TilemapModule">
175+
<HintPath>$(SubnauticaManaged)\UnityEngine.TilemapModule.dll</HintPath>
176+
<Private>$(TestLibrary)</Private>
177+
</Reference>
178+
<Reference Include="UnityEngine.TLSModule">
179+
<HintPath>$(SubnauticaManaged)\UnityEngine.TLSModule.dll</HintPath>
180+
<Private>$(TestLibrary)</Private>
181+
</Reference>
182+
<Reference Include="UnityEngine.UI">
183+
<HintPath>$(SubnauticaManaged)\UnityEngine.UI.dll</HintPath>
184+
<Private>$(TestLibrary)</Private>
185+
</Reference>
186+
<Reference Include="UnityEngine.UIElementsModule">
187+
<HintPath>$(SubnauticaManaged)\UnityEngine.UIElementsModule.dll</HintPath>
188+
<Private>$(TestLibrary)</Private>
189+
</Reference>
190+
<Reference Include="UnityEngine.UIModule">
191+
<HintPath>$(SubnauticaManaged)\UnityEngine.UIModule.dll</HintPath>
192+
<Private>$(TestLibrary)</Private>
193+
</Reference>
194+
<Reference Include="UnityEngine.UmbraModule">
195+
<HintPath>$(SubnauticaManaged)\UnityEngine.UmbraModule.dll</HintPath>
196+
<Private>$(TestLibrary)</Private>
197+
</Reference>
198+
<Reference Include="UnityEngine.UNETModule">
199+
<HintPath>$(SubnauticaManaged)\UnityEngine.UNETModule.dll</HintPath>
200+
<Private>$(TestLibrary)</Private>
201+
</Reference>
202+
<Reference Include="UnityEngine.UnityAnalyticsModule">
203+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityAnalyticsModule.dll</HintPath>
204+
<Private>$(TestLibrary)</Private>
205+
</Reference>
206+
<Reference Include="UnityEngine.UnityConnectModule">
207+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityConnectModule.dll</HintPath>
208+
<Private>$(TestLibrary)</Private>
209+
</Reference>
210+
<Reference Include="UnityEngine.UnityTestProtocolModule">
211+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityTestProtocolModule.dll</HintPath>
212+
<Private>$(TestLibrary)</Private>
213+
</Reference>
214+
<Reference Include="UnityEngine.UnityWebRequestAssetBundleModule">
215+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityWebRequestAssetBundleModule.dll</HintPath>
216+
<Private>$(TestLibrary)</Private>
217+
</Reference>
218+
<Reference Include="UnityEngine.UnityWebRequestAudioModule">
219+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityWebRequestAudioModule.dll</HintPath>
220+
<Private>$(TestLibrary)</Private>
221+
</Reference>
222+
<Reference Include="UnityEngine.UnityWebRequestModule">
223+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityWebRequestModule.dll</HintPath>
224+
<Private>$(TestLibrary)</Private>
225+
</Reference>
226+
<Reference Include="UnityEngine.UnityWebRequestTextureModule">
227+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityWebRequestTextureModule.dll</HintPath>
228+
<Private>$(TestLibrary)</Private>
229+
</Reference>
230+
<Reference Include="UnityEngine.UnityWebRequestWWWModule">
231+
<HintPath>$(SubnauticaManaged)\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
232+
<Private>$(TestLibrary)</Private>
233+
</Reference>
234+
<Reference Include="UnityEngine.VehiclesModule">
235+
<HintPath>$(SubnauticaManaged)\UnityEngine.VehiclesModule.dll</HintPath>
236+
<Private>$(TestLibrary)</Private>
237+
</Reference>
238+
<Reference Include="UnityEngine.VFXModule">
239+
<HintPath>$(SubnauticaManaged)\UnityEngine.VFXModule.dll</HintPath>
240+
<Private>$(TestLibrary)</Private>
241+
</Reference>
242+
<Reference Include="UnityEngine.VideoModule">
243+
<HintPath>$(SubnauticaManaged)\UnityEngine.VideoModule.dll</HintPath>
244+
<Private>$(TestLibrary)</Private>
245+
</Reference>
246+
<Reference Include="UnityEngine.VRModule">
247+
<HintPath>$(SubnauticaManaged)\UnityEngine.VRModule.dll</HintPath>
248+
<Private>$(TestLibrary)</Private>
249+
</Reference>
250+
<Reference Include="UnityEngine.WindModule">
251+
<HintPath>$(SubnauticaManaged)\UnityEngine.WindModule.dll</HintPath>
252+
<Private>$(TestLibrary)</Private>
253+
</Reference>
254+
<Reference Include="UnityEngine.XRModule">
255+
<HintPath>$(SubnauticaManaged)\UnityEngine.XRModule.dll</HintPath>
256+
<Private>$(TestLibrary)</Private>
257+
</Reference>
258+
<Reference Include="Assembly-CSharp">
259+
<HintPath>$(SubnauticaManaged)\Assembly-CSharp.dll</HintPath>
260+
<Private>$(TestLibrary)</Private>
261+
</Reference>
14262

15-
<Reference Include="$(SubnauticaManaged)\Assembly-CSharp-firstpass.dll">
16-
<Private>$(TestLibrary)</Private>
17-
</Reference>
18-
</ItemGroup>
19-
</Project>
263+
<Reference Include="Assembly-CSharp-firstpass">
264+
<HintPath>$(SubnauticaManaged)\Assembly-CSharp-firstpass.dll</HintPath>
265+
<Private>$(TestLibrary)</Private>
266+
</Reference>
267+
</ItemGroup>
268+
</When>
269+
</Choose>
270+
</Project>

0 commit comments

Comments
 (0)