Use system included encodings.

This commit is contained in:
2020-07-09 01:31:53 +01:00
parent 5f9e50082a
commit 43115b4bcd
5 changed files with 23 additions and 1 deletions

View File

@@ -2051,6 +2051,7 @@
<e p="LS120.cs" t="Include" /> <e p="LS120.cs" t="Include" />
<e p="PocketZip.cs" t="Include" /> <e p="PocketZip.cs" t="Include" />
</e> </e>
<e p="Encoding.cs" t="Include" />
<e p="Filesystems" t="Include"> <e p="Filesystems" t="Include">
<e p="ADFS.cs" t="Include" /> <e p="ADFS.cs" t="Include" />
<e p="AFFS.cs" t="Include" /> <e p="AFFS.cs" t="Include" />

View File

@@ -23,6 +23,7 @@
<PackageReference Include="Claunia.Encoding" Version="1.7.0" /> <PackageReference Include="Claunia.Encoding" Version="1.7.0" />
<PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" /> <PackageReference Include="MessageBox.Avalonia" Version="0.9.6.1" />
<PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" /> <PackageReference Include="OxyPlot.Avalonia-alpha-2020-04-15" Version="1.0.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
<PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" /> <PackageReference Include="Unclassified.NetRevisionTask" Version="0.3.0" />
<PackageReference Include="Avalonia" Version="0.9.10" /> <PackageReference Include="Avalonia" Version="0.9.10" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.10" /> <PackageReference Include="Avalonia.Desktop" Version="0.9.10" />

View File

@@ -1,3 +1,4 @@
using System.Text;
using Avalonia; using Avalonia;
using Avalonia.Dialogs; using Avalonia.Dialogs;
using Avalonia.Logging.Serilog; using Avalonia.Logging.Serilog;
@@ -7,7 +8,12 @@ namespace Aaru.Gui
{ {
public static class Main public static class Main
{ {
public static int Start(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); public static int Start(string[] args)
{
Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
}
// Avalonia configuration, don't remove; also used by visual designer. // Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() => AppBuilder. public static AppBuilder BuildAvaloniaApp() => AppBuilder.

View File

@@ -7,9 +7,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Claunia.Encoding" Version="1.7.0" />
<PackageReference Include="nunit" Version="3.12.0" /> <PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.15.1" /> <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
Aaru.Tests/Encoding.cs Normal file
View File

@@ -0,0 +1,12 @@
using System.Text;
using NUnit.Framework;
namespace Aaru.Tests
{
[SetUpFixture]
public class Encoding
{
[OneTimeSetUp]
public void EnableEncodings() => System.Text.Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
}
}