aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add codepages for .NET Core.

Browse Source
This commit is contained in:
Natalia Portillo
2019-07-19 14:25:33 +01:00
parent 6d91450b28
commit 1b5ef5a8cd
4 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DiscImageChef.Gtk/DiscImageChef.Gtk.csproj
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>
@@ -23,22 +23,23 @@
<NrtShowRevision>true</NrtShowRevision> <NrtShowRevision>true</NrtShowRevision>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj"/> <ProjectReference Include="..\DiscImageChef.Core\DiscImageChef.Core.csproj" />
<ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj"/> <ProjectReference Include="..\DiscImageChef.Database\DiscImageChef.Database.csproj" />
<ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj"/> <ProjectReference Include="..\DiscImageChef.Gui\DiscImageChef.Gui.csproj" />
<ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj"/> <ProjectReference Include="..\DiscImageChef.Settings\DiscImageChef.Settings.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<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" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0"/> <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0"/> <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0"/> <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0"/> <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
@@ -105,10 +106,10 @@
</Folder> </Folder>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="..\.github\CODE_OF_CONDUCT.md"/> <None Include="..\.github\CODE_OF_CONDUCT.md" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\.github\ISSUE_TEMPLATE.md"/> <Content Include="..\.github\ISSUE_TEMPLATE.md" />
<Content Include="..\.github\PULL_REQUEST_TEMPLATE.md"/> <Content Include="..\.github\PULL_REQUEST_TEMPLATE.md" />
</ItemGroup> </ItemGroup>
</Project> </Project>

3
DiscImageChef.Gtk/Program.cs
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();

13
DiscImageChef/DiscImageChef.csproj
View File

@@ -265,13 +265,14 @@
<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" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0"/> <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0"/> <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0"/> <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Runtime.Handles" Version="4.3.0"/> <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0"/> <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

3
DiscImageChef/Main.cs
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}",