Skip to content

Commit fb482a2

Browse files
author
Jannify
authored
Switching from package.config to PackageReference (SubnauticaNitrox#1337)
1 parent 7c3e1cc commit fb482a2

16 files changed

Lines changed: 102 additions & 174 deletions

File tree

‎NitroxClient/NitroxClient.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@
2626
<WarningLevel>4</WarningLevel>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
30-
<HintPath>..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
31-
</Reference>
3229
<Reference Include="iTween">
3330
<HintPath>$(SubnauticaManaged)\iTween.dll</HintPath>
3431
<Private>false</Private>
@@ -368,9 +365,13 @@
368365
</EmbeddedResource>
369366
</ItemGroup>
370367
<ItemGroup>
371-
<None Include="packages.config" />
372368
<None Include="Resources\playerBackgroundImage" />
373369
</ItemGroup>
370+
<ItemGroup>
371+
<PackageReference Include="Autofac">
372+
<Version>4.9.4</Version>
373+
</PackageReference>
374+
</ItemGroup>
374375
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
375376
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
376377
Other similar extension points exist, see Microsoft.Common.targets.

‎NitroxClient/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎NitroxLauncher/NitroxLauncher.csproj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,6 @@
3737
<ApplicationIcon>icon.ico</ApplicationIcon>
3838
</PropertyGroup>
3939
<ItemGroup>
40-
<Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\Lib.Harmony.1.2.0.1\lib\net472\0Harmony.dll</HintPath>
42-
</Reference>
43-
<Reference Include="dnlib, Version=3.3.2.0, Culture=neutral, PublicKeyToken=50e96378b6e77999, processorArchitecture=MSIL">
44-
<HintPath>..\packages\dnlib.3.3.2\lib\net45\dnlib.dll</HintPath>
45-
</Reference>
46-
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\WindowsAPICodePack-Core.1.1.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
48-
</Reference>
49-
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null">
50-
<HintPath>..\packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
5340
<Reference Include="PresentationFramework.Aero2" />
5441
<Reference Include="System" />
5542
<Reference Include="System.Data" />
@@ -179,7 +166,6 @@
179166
<Resource Include="Fonts\OpenSans-Regular.ttf" />
180167
<Resource Include="Fonts\OpenSans-Semibold.ttf" />
181168
<Resource Include="Fonts\OpenSans-SemiboldItalic.ttf" />
182-
<None Include="packages.config" />
183169
<None Include="Properties\Settings.settings">
184170
<Generator>SettingsSingleFileGenerator</Generator>
185171
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -279,6 +265,20 @@
279265
<ItemGroup>
280266
<Resource Include="Images\serverIllustration.png" />
281267
</ItemGroup>
268+
<ItemGroup>
269+
<PackageReference Include="dnlib">
270+
<Version>3.3.2</Version>
271+
</PackageReference>
272+
<PackageReference Include="Lib.Harmony">
273+
<Version>1.2.0.1</Version>
274+
</PackageReference>
275+
<PackageReference Include="WindowsAPICodePack-Core">
276+
<Version>1.1.2</Version>
277+
</PackageReference>
278+
<PackageReference Include="WindowsAPICodePack-Shell">
279+
<Version>1.1.1</Version>
280+
</PackageReference>
281+
</ItemGroup>
282282
<!-- Move assets from Subnautica assets to launcher.
283283
TODO: Try fix this as a project reference to Nitrox.Subnautica.Assets that will copy the files on build automatically. -->
284284
<Target Name="MoveNitroxAssetsToLauncherOutput" AfterTargets="Build" Condition="'$(OS)' == 'Windows_NT'">
@@ -301,4 +301,4 @@
301301
<Move SourceFiles="@(AllDependencies)" DestinationFolder="$(TargetDir)lib" />
302302
</Target>
303303
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(OS)' == 'Windows_NT'" />
304-
</Project>
304+
</Project>

‎NitroxLauncher/packages.config‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎NitroxModel-Subnautica/NitroxModel-Subnautica.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@
2626
<WarningLevel>4</WarningLevel>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
30-
<HintPath>..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
31-
</Reference>
32-
<Reference Include="LitJSON, Version=0.16.0.0, Culture=neutral, PublicKeyToken=null">
33-
<HintPath>..\packages\LitJson.0.16.0\lib\net40\LitJSON.dll</HintPath>
34-
<Private>True</Private>
35-
</Reference>
3629
<Reference Include="protobuf-net">
3730
<HintPath>..\Nitrox.Subnautica.Assets\protobuf-net.dll</HintPath>
3831
</Reference>
@@ -100,7 +93,12 @@
10093
</ProjectReference>
10194
</ItemGroup>
10295
<ItemGroup>
103-
<None Include="packages.config" />
96+
<PackageReference Include="Autofac">
97+
<Version>4.9.4</Version>
98+
</PackageReference>
99+
<PackageReference Include="LitJson">
100+
<Version>0.16.0</Version>
101+
</PackageReference>
104102
</ItemGroup>
105103
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106104
</Project>

‎NitroxModel-Subnautica/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎NitroxModel/NitroxModel.csproj‎

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,46 +26,19 @@
2626
<WarningLevel>4</WarningLevel>
2727
</PropertyGroup>
2828
<ItemGroup>
29-
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
30-
<HintPath>..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
31-
</Reference>
3229
<Reference Include="LZ4">
3330
<HintPath>..\Nitrox.Subnautica.Assets\LZ4.dll</HintPath>
3431
</Reference>
3532
<Reference Include="Microsoft.CSharp" />
3633
<Reference Include="protobuf-net">
3734
<HintPath>..\Nitrox.Subnautica.Assets\protobuf-net.dll</HintPath>
3835
</Reference>
39-
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
40-
<HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="Serilog.Settings.Configuration, Version=3.1.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
44-
<HintPath>..\packages\Serilog.Settings.Configuration.3.1.0\lib\net461\Serilog.Settings.Configuration.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="Serilog.Sinks.Async, Version=1.4.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
48-
<HintPath>..\packages\Serilog.Sinks.Async.1.4.0\lib\net461\Serilog.Sinks.Async.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="Serilog.Sinks.Console, Version=3.1.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
52-
<HintPath>..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10">
56-
<HintPath>..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
5936
<Reference Include="System" />
6037
<Reference Include="System.Configuration" />
6138
<Reference Include="System.Core" />
6239
<Reference Include="System.Data" />
6340
<Reference Include="System.Data.DataSetExtensions" />
6441
<Reference Include="System.IO.Compression" />
65-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
66-
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
6942
<Reference Include="System.Runtime.Serialization" />
7043
<Reference Include="System.ServiceModel" />
7144
<Reference Include="System.Transactions" />
@@ -251,9 +224,6 @@
251224
<Compile Include="OS\FileSystem.cs" />
252225
<Compile Include="OS\Windows\WinFileSystem.cs" />
253226
</ItemGroup>
254-
<ItemGroup>
255-
<None Include="packages.config" />
256-
</ItemGroup>
257227
<ItemGroup>
258228
<ProjectReference Include="..\LiteNetLib\LiteNetLib\LiteNetLib.csproj">
259229
<Project>{b0a014e4-0392-4e35-aa42-8fb5a40417e0}</Project>
@@ -265,12 +235,30 @@
265235
<Folder Include="OS\Unix\" />
266236
</ItemGroup>
267237
<ItemGroup>
268-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
269-
<PackageReference Include="Serilog" Version="2.10.0" />
270-
<PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
271-
<PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
272-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
273-
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
238+
<PackageReference Include="Autofac">
239+
<Version>4.9.4</Version>
240+
</PackageReference>
241+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
242+
<Version>5.0.0</Version>
243+
</PackageReference>
244+
<PackageReference Include="Serilog">
245+
<Version>2.10.0</Version>
246+
</PackageReference>
247+
<PackageReference Include="Serilog.Settings.Configuration">
248+
<Version>3.1.0</Version>
249+
</PackageReference>
250+
<PackageReference Include="Serilog.Sinks.Async">
251+
<Version>1.4.0</Version>
252+
</PackageReference>
253+
<PackageReference Include="Serilog.Sinks.Console">
254+
<Version>3.1.1</Version>
255+
</PackageReference>
256+
<PackageReference Include="Serilog.Sinks.File">
257+
<Version>4.1.0</Version>
258+
</PackageReference>
259+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
260+
<Version>4.5.3</Version>
261+
</PackageReference>
274262
</ItemGroup>
275263
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
276-
</Project>
264+
</Project>

‎NitroxModel/packages.config‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎NitroxPatcher/NitroxPatcher.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,6 @@
2929
<WarningLevel>4</WarningLevel>
3030
</PropertyGroup>
3131
<ItemGroup>
32-
<Reference Include="0Harmony, Version=1.2.0.1, Culture=neutral, processorArchitecture=MSIL">
33-
<HintPath>..\packages\Lib.Harmony.1.2.0.1\lib\net35\0Harmony.dll</HintPath>
34-
</Reference>
35-
<Reference Include="Autofac, Version=4.9.4.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Autofac.4.9.4\lib\net45\Autofac.dll</HintPath>
37-
</Reference>
3832
<Reference Include="System" />
3933
<Reference Include="System.Core" />
4034
<Reference Include="System.Xml.Linq" />
@@ -208,7 +202,6 @@
208202
</ItemGroup>
209203
<ItemGroup>
210204
<None Include="App.config" />
211-
<None Include="packages.config" />
212205
</ItemGroup>
213206
<ItemGroup>
214207
<ProjectReference Include="..\NitroxClient\NitroxClient.csproj">
@@ -224,6 +217,14 @@
224217
<Name>NitroxModel</Name>
225218
</ProjectReference>
226219
</ItemGroup>
220+
<ItemGroup>
221+
<PackageReference Include="Autofac">
222+
<Version>4.9.4</Version>
223+
</PackageReference>
224+
<PackageReference Include="Lib.Harmony">
225+
<Version>1.2.0.1</Version>
226+
</PackageReference>
227+
</ItemGroup>
227228
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
228229
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
229230
Other similar extension points exist, see Microsoft.Common.targets.

‎NitroxPatcher/packages.config‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)