From 33d70dddbb0707f7eb0ac2bc077575e020b68a3b Mon Sep 17 00:00:00 2001
From: Legedric <github_legedric@cs-nations.de>
Date: Sat, 26 May 2018 06:53:25 +0200
Subject: [PATCH] Upgraded .NET Core to 2.1 to fix issues on Linux and Mac #450
 #491 #496 #501 #531

---
 Core/Core.csproj       |  4 ++--
 Core/Main/PTMagic.cs   |  2 ++
 Monitor/Monitor.csproj | 12 ++++--------
 PTMagic/PTMagic.csproj |  4 ++--
 PTMagic/Program.cs     |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Core/Core.csproj b/Core/Core.csproj
index 48a800b..26bc68b 100644
--- a/Core/Core.csproj
+++ b/Core/Core.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1-beta3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NLog" Version="4.5.0-rc04" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
diff --git a/Core/Main/PTMagic.cs b/Core/Main/PTMagic.cs
index 61f6495..dd023d3 100644
--- a/Core/Main/PTMagic.cs
+++ b/Core/Main/PTMagic.cs
@@ -418,6 +418,8 @@ namespace Core.Main {
       this.Log.DoLogInfo("");
       this.Log.DoLogInfo("Starting PTMagic in " + Directory.GetCurrentDirectory());
 
+      Console.WriteLine($"(Framework: {Path.GetDirectoryName(typeof(object).Assembly.Location)})");
+
       if (!this.RunStartupChecks()) {
         return false;
       }
diff --git a/Monitor/Monitor.csproj b/Monitor/Monitor.csproj
index e1e8537..16f2556 100644
--- a/Monitor/Monitor.csproj
+++ b/Monitor/Monitor.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <!--<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>-->
   </PropertyGroup>
   <ItemGroup>
@@ -23,13 +23,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" />
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1-beta3" />
-  </ItemGroup>
-  <ItemGroup>
-    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
diff --git a/PTMagic/PTMagic.csproj b/PTMagic/PTMagic.csproj
index 703ac36..9c7e3d2 100644
--- a/PTMagic/PTMagic.csproj
+++ b/PTMagic/PTMagic.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <Deterministic>False</Deterministic>
     <RunWorkingDirectory>$(MSBuildStartupDirectory)/PTMagic</RunWorkingDirectory>
@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.1-beta3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NLog" Version="4.5.0-rc04" />
     <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" />
   </ItemGroup>
diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs
index 47f624a..3493791 100644
--- a/PTMagic/Program.cs
+++ b/PTMagic/Program.cs
@@ -7,7 +7,7 @@ using Core.Helper;
 using Core.Main.DataObjects.PTMagicData;
 using Microsoft.Extensions.DependencyInjection;
 
-[assembly: AssemblyVersion("2.0.1")]
+[assembly: AssemblyVersion("2.0.2")]
 [assembly: AssemblyProduct("PT Magic")]
 
 namespace PTMagic {