AliveDevil/InkForge
1
0
Fork 0
Code Issues Pull requests Activity

Batch Update

Browse source
This commit is contained in:
Jöran Malek 2024-03-17 22:27:01 +01:00
parent 693d12b61c
commit 4c2b5cca93
32 changed files with 483 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/InkForge.Desktop/Program.cs
View file

@ -1,18 +1,14 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Metadata;
using Avalonia.ReactiveUI;
using Avalonia.Threading;
using InkForge.Desktop;
using InkForge.Desktop.ViewModels;
using InkForge.Desktop.Views;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using ReactiveUI;
static class Program
{
[STAThread]
@ -41,6 +37,11 @@ static class Program
var serviceProvider = services.BuildServiceProvider();
app.SetValue(App.ServiceProviderProperty, serviceProvider);
_ = new ServiceProviderDisposer(serviceProvider, dispatcher);
_ = app.ApplicationLifetime switch
{
IClassicDesktopStyleApplicationLifetime desktop => desktop.MainWindow = new MainWindow(),
_ => throw new NotSupportedException(),
};
}
private static AppBuilder UseMicrosoftDependencyInjection(this AppBuilder builder, out ConfigurationManager configuration)
@ -48,7 +49,7 @@ static class Program
configuration = new();
ServiceCollection services = [];
services.AddSingleton<IConfiguration>(configuration);
App.Configure(services);
App.Configure(services, configuration);
builder.AfterSetup(services.SetupApp);
return builder;