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

Fix Avalonia not liking to be included twice.

Browse Source
This commit is contained in:
Natalia Portillo
2020-04-18 00:19:11 +01:00
parent 94ce55b1c1
commit 6daf63b057
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/.idea.Aaru/.idea/contentModel.xml generated
View File

@@ -82,9 +82,6 @@
<e p="Debug" t="Include"> <e p="Debug" t="Include">
<e p="netcoreapp3.0" t="Include"> <e p="netcoreapp3.0" t="Include">
<e p="Aaru.AssemblyInfo.cs" t="Include" /> <e p="Aaru.AssemblyInfo.cs" t="Include" />
<e p="Avalonia" t="Include">
<e p="resources" t="Include" />
</e>
</e> </e>
</e> </e>
</e> </e>
@@ -1215,6 +1212,7 @@
<e p="Controls" t="Include"> <e p="Controls" t="Include">
<e p="BlockMap.cs" t="Include" /> <e p="BlockMap.cs" t="Include" />
</e> </e>
<e p="Main.cs" t="Include" />
<e p="Models" t="Include"> <e p="Models" t="Include">
<e p="AssemblyModel.cs" t="Include" /> <e p="AssemblyModel.cs" t="Include" />
<e p="ChecksumModel.cs" t="Include" /> <e p="ChecksumModel.cs" t="Include" />
@@ -2186,7 +2184,6 @@
<e p="Avalonia" t="Include"> <e p="Avalonia" t="Include">
<e p="resources" t="Include" /> <e p="resources" t="Include" />
</e> </e>
<e p="OxyPlot.Avalonia.AssemblyInfo.cs" t="Include" />
</e> </e>
</e> </e>
</e> </e>

17
Aaru.Gui/Main.cs Normal file
View File

@@ -0,0 +1,17 @@
using Avalonia;
using Avalonia.Dialogs;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI;
namespace Aaru.Gui
{
public static class Main
{
public static int Start(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() => AppBuilder.
Configure<App>().UsePlatformDetect().LogToDebug().
UseReactiveUI().UseManagedSystemDialogs();
}
}

3
Aaru/Aaru.csproj
View File

@@ -282,9 +282,6 @@
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" /> <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="System.Net.Primitives" Version="4.3.1" /> <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" /> <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
<PackageReference Include="Avalonia" Version="0.9.7" />
<PackageReference Include="Avalonia.Desktop" Version="0.9.7" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.9.7" />
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Debug'"> <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
<DebugPackage>-dbg</DebugPackage> <DebugPackage>-dbg</DebugPackage>

12
Aaru/Main.cs
View File

@@ -44,12 +44,7 @@ using Aaru.Commands.Media;
using Aaru.Console; using Aaru.Console;
using Aaru.Core; using Aaru.Core;
using Aaru.Database; using Aaru.Database;
using Aaru.Gui;
using Aaru.Settings; using Aaru.Settings;
using Avalonia;
using Avalonia.Dialogs;
using Avalonia.Logging.Serilog;
using Avalonia.ReactiveUI;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
namespace Aaru namespace Aaru
@@ -75,7 +70,7 @@ namespace Aaru
if(args.Length == 1 && if(args.Length == 1 &&
args[0].ToLowerInvariant() == "gui") args[0].ToLowerInvariant() == "gui")
{ {
return BuildAvaloniaApp().StartWithClassicDesktopLifetime(args); return Gui.Main.Start(args);
} }
AaruConsole.WriteLineEvent += System.Console.WriteLine; AaruConsole.WriteLineEvent += System.Console.WriteLine;
@@ -167,10 +162,5 @@ namespace Aaru
AaruConsole.WriteLine("{0}", _assemblyCopyright); AaruConsole.WriteLine("{0}", _assemblyCopyright);
AaruConsole.WriteLine(); AaruConsole.WriteLine();
} }
// Avalonia configuration, don't remove; also used by visual designer.
public static AppBuilder BuildAvaloniaApp() => AppBuilder.
Configure<App>().UsePlatformDetect().LogToDebug().
UseReactiveUI().UseManagedSystemDialogs();
} }
} }