Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Commit 18b838d

Browse files
committed
Add some things from XLCommon to XL2Common
1 parent b3a1699 commit 18b838d

File tree

3 files changed

+43
-6
lines changed

3 files changed

+43
-6
lines changed

src/XIVLauncher2.Common/Class1.cs

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

src/XIVLauncher2.Common/XIVLauncher2.Common.csproj

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,44 @@
33
<TargetFramework>net7.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
6+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
67
</PropertyGroup>
8+
9+
<PropertyGroup>
10+
<IsWindows Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' == 'true'">true</IsWindows>
11+
<IsOSX Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">true</IsOSX>
12+
<IsLinux Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">true</IsLinux>
13+
</PropertyGroup>
14+
15+
<PropertyGroup>
16+
<DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(IsWindows)'=='true'">
20+
<DefineConstants>$(DefineConstants);WIN32</DefineConstants>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="'$(IsOSX)'=='true'">
23+
<DefineConstants>$(DefineConstants);OSX</DefineConstants>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(IsLinux)'=='true'">
26+
<DefineConstants>$(DefineConstants);LINUX</DefineConstants>
27+
</PropertyGroup>
28+
29+
<ItemGroup>
30+
<!--
31+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
32+
<PackageReference Include="Downloader" Version="2.2.8" />
33+
<PackageReference Include="MonoTorrent" Version="2.0.0" />
34+
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
35+
<PackageReference Include="Serilog" Version="2.12.0" />
36+
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
37+
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
38+
<PackageReference Include="Serilog.Sinks.Debug" Version="1.0.1" />
39+
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
40+
<PackageReference Include="SharedMemory" Version="2.3.2" />
41+
<PackageReference Include="System.Memory" Version="4.5.4" />
42+
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
43+
<PackageReference Include="System.Text.Json" Version="6.0.6" />
44+
-->
45+
</ItemGroup>
746
</Project>

src/XIVLauncher2/XIVLauncher2.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,8 @@
2828
<SubType>Code</SubType>
2929
</Compile>
3030
</ItemGroup>
31+
32+
<ItemGroup>
33+
<ProjectReference Include="..\XIVLauncher2.Common\XIVLauncher2.Common.csproj" />
34+
</ItemGroup>
3135
</Project>

0 commit comments

Comments
 (0)