Add codepages for .NET Core.

This commit is contained in:
2019-07-19 14:25:33 +01:00
parent 6d91450b28
commit 1b5ef5a8cd
4 changed files with 29 additions and 21 deletions

View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
@@ -32,6 +32,7 @@
<PackageReference Include="Eto.Platform.Gtk" Version="2.5.0-beta.1" /> <PackageReference Include="Eto.Platform.Gtk" Version="2.5.0-beta.1" />
<PackageReference Include="GtkSharp" Version="3.22.24.37" /> <PackageReference Include="GtkSharp" Version="3.22.24.37" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" />
<PackageReference Include="System.Collections" Version="4.3.0" /> <PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" /> <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />

View File

@@ -1,5 +1,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using DiscImageChef.Core; using DiscImageChef.Core;
using DiscImageChef.Database; using DiscImageChef.Database;
@@ -58,6 +59,8 @@ namespace DiscImageChef.Gtk
break; break;
} }
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
new Application(Platforms.Gtk).Run(new frmMain(Debug, Verbose)); new Application(Platforms.Gtk).Run(new frmMain(Debug, Verbose));
Statistics.SaveStats(); Statistics.SaveStats();

View File

@@ -265,6 +265,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.4" />
<PackageReference Include="Mono.Options" Version="5.3.0.1" /> <PackageReference Include="Mono.Options" Version="5.3.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.2.5" />
<PackageReference Include="System.Collections" Version="4.3.0" /> <PackageReference Include="System.Collections" Version="4.3.0" />

View File

@@ -33,6 +33,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using DiscImageChef.Commands; using DiscImageChef.Commands;
using DiscImageChef.CommonTypes.Interop; using DiscImageChef.CommonTypes.Interop;
@@ -95,6 +96,8 @@ namespace DiscImageChef
PlatformID currentPlatform = DetectOS.GetRealPlatformID(); PlatformID currentPlatform = DetectOS.GetRealPlatformID();
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
CommandSet commands = new CommandSet("DiscImageChef") CommandSet commands = new CommandSet("DiscImageChef")
{ {
$"{AssemblyTitle} {AssemblyVersion?.InformationalVersion}", $"{AssemblyTitle} {AssemblyVersion?.InformationalVersion}",