robojerk/Libation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor SetReleaseIdentifier()

Browse source
This commit is contained in:
Michael Bucari-Tovo 2023-02-19 10:20:01 -07:00
parent 1e6e28cd57
commit 6ebbfb8e59
5 changed files with 66 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Source/LibationAvalonia/Program.cs
View file

@ -6,6 +6,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using ApplicationServices;
using AppScaffolding;
using Avalonia;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.ReactiveUI;
@ -42,7 +43,7 @@ namespace LibationAvalonia
// //
//***********************************************//
// Migrations which must occur before configuration is loaded for the first time. Usually ones which alter the Configuration
var config = AppScaffolding.LibationScaffolding.RunPreConfigMigrations();
var config = LibationScaffolding.RunPreConfigMigrations();
App.SetupRequired = !config.LibationSettingsAreValid;
@ -50,29 +51,10 @@ namespace LibationAvalonia
var classicLifetimeTask = Task.Run(() => new ClassicDesktopStyleApplicationLifetime());
var appBuilderTask = Task.Run(BuildAvaloniaApp);
if (Configuration.IsWindows)
AppScaffolding.LibationScaffolding.SetReleaseIdentifier(AppScaffolding.ReleaseIdentifier.WindowsAvalonia);
else if (Configuration.IsLinux)
{
var releaseID = RuntimeInformation.OSArchitecture switch
{
Architecture.X64 => AppScaffolding.ReleaseIdentifier.LinuxAvalonia,
Architecture.Arm64 => AppScaffolding.ReleaseIdentifier.LinuxAvalonia_Arm64,
_ => throw new PlatformNotSupportedException()
};
AppScaffolding.LibationScaffolding.SetReleaseIdentifier(releaseID);
}
else if (Configuration.IsMacOs)
{
var releaseID = RuntimeInformation.OSArchitecture switch
{
Architecture.X64 => AppScaffolding.ReleaseIdentifier.MacOSAvalonia,
Architecture.Arm64 => AppScaffolding.ReleaseIdentifier.MacOSAvalonia_Arm64,
_ => throw new PlatformNotSupportedException()
};
AppScaffolding.LibationScaffolding.SetReleaseIdentifier(releaseID);
}
else return;
LibationScaffolding.SetReleaseIdentifier(Variety.Chardonnay);
if (LibationScaffolding.ReleaseIdentifier is ReleaseIdentifier.None)
return;
if (!App.SetupRequired)
@ -99,8 +81,8 @@ namespace LibationAvalonia
try
{
// most migrations go in here
AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(config);
return true;
}