From cc5a59309c7131a724f7183b28fdbd27280c65b1 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Sat, 5 Oct 2019 11:51:15 -0700
Subject: [PATCH] Fixes builds in windows.

---
 Projects/Scripts/Scripts.csproj                            | 1 +
 .../Properties/PublishProfiles/Linux-SelfContained.pubxml  | 2 +-
 Projects/Server/Properties/PublishProfiles/Linux.pubxml    | 2 +-
 .../Properties/PublishProfiles/OSX-SelfContained.pubxml    | 2 +-
 Projects/Server/Properties/PublishProfiles/OSX.pubxml      | 2 +-
 .../PublishProfiles/Windows-SelfContained.pubxml           | 2 +-
 Projects/Server/Properties/PublishProfiles/Windows.pubxml  | 2 +-
 Projects/Server/Server.csproj                              | 7 ++++---
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Projects/Scripts/Scripts.csproj b/Projects/Scripts/Scripts.csproj
index be8669f4d..f3b49987e 100644
--- a/Projects/Scripts/Scripts.csproj
+++ b/Projects/Scripts/Scripts.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>Server</RootNamespace>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AssemblyName>Scripts.CS</AssemblyName>
+    <UseNETCoreGenerator>true</UseNETCoreGenerator>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
index d9042b76c..c43c47567 100644
--- a/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Linux-SelfContained.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
diff --git a/Projects/Server/Properties/PublishProfiles/Linux.pubxml b/Projects/Server/Properties/PublishProfiles/Linux.pubxml
index e1a61d7a4..fb76af4c2 100644
--- a/Projects/Server/Properties/PublishProfiles/Linux.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Linux.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
diff --git a/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
index 370cda77d..2f9813651 100644
--- a/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/OSX-SelfContained.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
diff --git a/Projects/Server/Properties/PublishProfiles/OSX.pubxml b/Projects/Server/Properties/PublishProfiles/OSX.pubxml
index d0705df7c..7c45904d8 100644
--- a/Projects/Server/Properties/PublishProfiles/OSX.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/OSX.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>osx-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
diff --git a/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml b/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml
index f778e026a..a43797ef8 100644
--- a/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Windows-SelfContained.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
     <PublishTrimmed>true</PublishTrimmed>
diff --git a/Projects/Server/Properties/PublishProfiles/Windows.pubxml b/Projects/Server/Properties/PublishProfiles/Windows.pubxml
index 02f5e9052..c6a68c538 100644
--- a/Projects/Server/Properties/PublishProfiles/Windows.pubxml
+++ b/Projects/Server/Properties/PublishProfiles/Windows.pubxml
@@ -2,7 +2,7 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <PublishProtocol>FileSystem</PublishProtocol>
-    <!-- <Configuration>Release</Configuration> -->
+    <Configuration>Release</Configuration>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
   </PropertyGroup>
diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj
index c564d5e6b..e7ce12400 100644
--- a/Projects/Server/Server.csproj
+++ b/Projects/Server/Server.csproj
@@ -14,6 +14,7 @@
     <Copyright>2019</Copyright>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <UseNETCoreGenerator>true</UseNETCoreGenerator>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -38,15 +39,15 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="Assemblies\zlib.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+    <Content Include="Assemblies\zlib.dll" Condition="'$(RuntimeIdentifier)'=='win-x64' OR !Exists('$(RuntimeIdentifier)')">
       <Link>zlib.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Assemblies\rdrand.dll" Condition="'$(RuntimeIdentifier)'=='win-x64'">
+    <Content Include="Assemblies\rdrand.dll" Condition="'$(RuntimeIdentifier)'=='win-x64' OR !Exists('$(RuntimeIdentifier)')">
       <Link>rdrand.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Assemblies\rdrand.so" Condition="'$(RuntimeIdentifier)'=='osx-x64' OR '$(RuntimeIdentifier)'=='linux-x64'">
+    <Content Include="Assemblies\rdrand.so" Condition="'$(RuntimeIdentifier)'=='osx-x64' OR '$(RuntimeIdentifier)'=='linux-x64' OR !Exists('$(RuntimeIdentifier)')">
       <Link>rdrand.so</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>