From 31923c099fe07a03eb9c1271532ea6d85454394a Mon Sep 17 00:00:00 2001
From: Legedric <github_legedric@cs-nations.de>
Date: Mon, 28 May 2018 10:02:31 +0200
Subject: [PATCH] Seperating .NET Core target frameworks for Windows and
 everything else

---
 Core/Core.csproj       |  5 ++++-
 Core/Main/PTMagic.cs   |  3 +--
 Monitor/Monitor.csproj | 16 ++++++++++++++--
 PTMagic/PTMagic.csproj |  8 +++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/Core/Core.csproj b/Core/Core.csproj
index 26bc68b..162950e 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -1,6 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
     <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
diff --git a/Core/Main/PTMagic.cs b/Core/Main/PTMagic.cs
index dd023d3..24bd2ff 100644
--- a/Core/Main/PTMagic.cs
+++ b/Core/Main/PTMagic.cs
@@ -417,8 +417,7 @@ namespace Core.Main {
       this.Log.DoLogInfo("                         Version " + this.CurrentVersion.Major + "." + this.CurrentVersion.Minor + "." + this.CurrentVersion.Build);
       this.Log.DoLogInfo("");
       this.Log.DoLogInfo("Starting PTMagic in " + Directory.GetCurrentDirectory());
-
-      Console.WriteLine($"(Framework: {Path.GetDirectoryName(typeof(object).Assembly.Location)})");
+      this.Log.DoLogInfo("with .NET Core: " + Path.GetDirectoryName(typeof(object).Assembly.Location));
 
       if (!this.RunStartupChecks()) {
         return false;
diff --git a/Monitor/Monitor.csproj b/Monitor/Monitor.csproj
index 16f2556..4bbcddc 100644
--- a/Monitor/Monitor.csproj
+++ b/Monitor/Monitor.csproj
@@ -1,6 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
     <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <!--<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>-->
   </PropertyGroup>
   <ItemGroup>
@@ -21,7 +27,13 @@
     </Content>
     <Content Include="wwwroot\assets\js\dca.js" CopyToOutputDirectory="Always" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
diff --git a/PTMagic/PTMagic.csproj b/PTMagic/PTMagic.csproj
index 9c7e3d2..7a5531f 100644
--- a/PTMagic/PTMagic.csproj
+++ b/PTMagic/PTMagic.csproj
@@ -1,8 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <Deterministic>False</Deterministic>
     <RunWorkingDirectory>$(MSBuildStartupDirectory)/PTMagic</RunWorkingDirectory>