trading
/
PTMagic
mirror of https://github.com/PTMagicians/PTMagic.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Upgraded .NET Core to 2.1 to fix issues on Linux and Mac #450 #491 #496 #501 #531

This commit is contained in:
Legedric 2018-05-26 06:53:25 +02:00
parent ca3ede11b3
commit 33d70dddbb
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/Core.csproj
View File

@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.0.0" /> <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" Version="4.5.0-rc04" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" /> <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />

2
Core/Main/PTMagic.cs
View File

@ -418,6 +418,8 @@ namespace Core.Main {
this.Log.DoLogInfo(""); this.Log.DoLogInfo("");
this.Log.DoLogInfo("Starting PTMagic in " + Directory.GetCurrentDirectory()); this.Log.DoLogInfo("Starting PTMagic in " + Directory.GetCurrentDirectory());
Console.WriteLine($"(Framework: {Path.GetDirectoryName(typeof(object).Assembly.Location)})");
if (!this.RunStartupChecks()) { if (!this.RunStartupChecks()) {
return false; return false;
} }

12
Monitor/Monitor.csproj
View File

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<!--<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>--> <!--<PublishWithAspNetCoreTargetManifest>false</PublishWithAspNetCoreTargetManifest>-->
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -23,13 +23,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" /> <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.1.1" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.0-rc1-final" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.0-rc1-final" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.1-beta3" />
</ItemGroup>
<ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\Core\Core.csproj" />

4
PTMagic/PTMagic.csproj
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.1</TargetFramework>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<Deterministic>False</Deterministic> <Deterministic>False</Deterministic>
<RunWorkingDirectory>$(MSBuildStartupDirectory)/PTMagic</RunWorkingDirectory> <RunWorkingDirectory>$(MSBuildStartupDirectory)/PTMagic</RunWorkingDirectory>
@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" 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="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" Version="4.5.0-rc04" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" /> <PackageReference Include="NLog.Extensions.Logging" Version="1.0.0-rtm-rc6" />
</ItemGroup> </ItemGroup>

2
PTMagic/Program.cs
View File

@ -7,7 +7,7 @@ using Core.Helper;
using Core.Main.DataObjects.PTMagicData; using Core.Main.DataObjects.PTMagicData;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
[assembly: AssemblyVersion("2.0.1")] [assembly: AssemblyVersion("2.0.2")]
[assembly: AssemblyProduct("PT Magic")] [assembly: AssemblyProduct("PT Magic")]
namespace PTMagic { namespace PTMagic {