From d6bba58b59078a866e47a248fde980ce6a9ee774 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Thu, 9 Jan 2020 01:20:58 -0800
Subject: [PATCH] Fixes deps and copying (#72)

---
 .gitignore                      |  7 ++++---
 Projects/Scripts/Scripts.csproj |  4 ++--
 Projects/Server/Server.csproj   | 24 ++++++++++++------------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6d4d9c510..19f99345f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,13 +5,14 @@
 /Distribution/Backups
 /Distribution/Saves
 /Distribution/System.IO.Pipelines.dll
-/Distribution/rdrand.so
-/Distribution/rdrand.dll
+/Distribution/libdrng.dll
 /Distribution/zlib.dll
+/Distribution/Microsoft.Bcl.AsyncInterfaces.dll
+/Distribution/System.ComponentModel.Annotations.dll
+/Distribution/System.Runtime.CompilerServices.Unsafe.dll
 
 # LibUv Dependencies
 /Distribution/libuv.dll
-/Distribution/libuv.so
 /Distribution/Microsoft.AspNetCore.Connections.Abstractions.dll
 /Distribution/Microsoft.AspNetCore.Http.Features.dll
 /Distribution/Microsoft.Extensions.Configuration.Abstractions.dll
diff --git a/Projects/Scripts/Scripts.csproj b/Projects/Scripts/Scripts.csproj
index e7fa412b8..0c40038f0 100644
--- a/Projects/Scripts/Scripts.csproj
+++ b/Projects/Scripts/Scripts.csproj
@@ -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">
   <PropertyGroup>
     <RootNamespace>Server</RootNamespace>
@@ -36,6 +36,6 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
   </ItemGroup>
 </Project>
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index 7ce476529..7f7227843 100644
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -39,25 +39,25 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <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>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Assemblies\zlib.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+    <Content Include="Assemblies\zlib.dll" Condition="'$(OS)' == 'Windows_NT'">
       <Link>zlib.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Assemblies\libdrng.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'">
-      <Link>rdrand.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.1" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.6.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="4.7.0" />
   </ItemGroup>
 </Project>