Fixes deps and copying (#72)

This commit is contained in:
Kamron Batman 2020-01-09 01:20:58 -08:00 • committed by 3HMonkey
parent 21511b1c60
commit d6bba58b59
3 changed files with 18 additions and 17 deletions

7
.gitignore vendored
View file

@ -5,13 +5,14 @@
/Distribution/Backups /Distribution/Backups
/Distribution/Saves /Distribution/Saves
/Distribution/System.IO.Pipelines.dll /Distribution/System.IO.Pipelines.dll
/Distribution/rdrand.so /Distribution/libdrng.dll
/Distribution/rdrand.dll
/Distribution/zlib.dll /Distribution/zlib.dll
/Distribution/Microsoft.Bcl.AsyncInterfaces.dll
/Distribution/System.ComponentModel.Annotations.dll
/Distribution/System.Runtime.CompilerServices.Unsafe.dll
# LibUv Dependencies # LibUv Dependencies
/Distribution/libuv.dll /Distribution/libuv.dll
/Distribution/libuv.so
/Distribution/Microsoft.AspNetCore.Connections.Abstractions.dll /Distribution/Microsoft.AspNetCore.Connections.Abstractions.dll
/Distribution/Microsoft.AspNetCore.Http.Features.dll /Distribution/Microsoft.AspNetCore.Http.Features.dll
/Distribution/Microsoft.Extensions.Configuration.Abstractions.dll /Distribution/Microsoft.Extensions.Configuration.Abstractions.dll

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current"> <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
<PropertyGroup> <PropertyGroup>
<RootNamespace>Server</RootNamespace> <RootNamespace>Server</RootNamespace>
@ -36,6 +36,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View file

@ -39,25 +39,25 @@
<LangVersion>8.0</LangVersion> <LangVersion>8.0</LangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Content Include="Assemblies\libuv.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'"> <Content Include="Assemblies\libdrng.dll" Condition="'$(OS)' == 'Windows_NT'">
<Link>libdrng.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Assemblies\libuv.dll" Condition="'$(OS)' == 'Windows_NT'">
<Link>libuv.dll</Link> <Link>libuv.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Assemblies\zlib.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'"> <Content Include="Assemblies\zlib.dll" Condition="'$(OS)' == 'Windows_NT'">
<Link>zlib.dll</Link> <Link>zlib.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<Content Include="Assemblies\libdrng.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'">
<Link>rdrand.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.1" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
<PackageReference Include="System.IO.Pipelines" Version="4.6.0" /> <PackageReference Include="System.IO.Pipelines" Version="4.7.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>