tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set Variety correctly

Browse Source
This commit is contained in:
Mbucari 2023-07-03 22:15:10 -06:00
parent 03d30ff6af
commit fbc29dfb0a
8 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build-windows.yml vendored
View File

@ -75,6 +75,7 @@ jobs:
LibationCli/LibationCli.csproj `
--configuration ${{ env.DOTNET_CONFIGURATION }} `
--output bin/Publish/${{ matrix.os }}-${{ matrix.release_name }} `
-p:DefineConstants="${{ matrix.release_name }}" `
-p:PublishProfile=LibationCli/Properties/PublishProfiles/${{ matrix.os }}Profile.pubxml
dotnet publish `
Hangover${{ matrix.ui }}/Hangover${{ matrix.ui }}.csproj `

24
Source/AppScaffolding/LibationScaffolding.cs
View File

@ -90,28 +90,18 @@ namespace AppScaffolding
}
/// <summary>Initialize logging. Wire-up events. Run after migration</summary>
public static void RunPostMigrationScaffolding(Configuration config)
public static void RunPostMigrationScaffolding(Variety variety, Configuration config)
{
Variety = Enum.IsDefined(variety) ? variety : Variety.None;
var releaseID = (ReleaseIdentifier)((int)variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
ReleaseIdentifier = Enum.IsDefined(releaseID) ? releaseID : ReleaseIdentifier.None;
ensureSerilogConfig(config);
configureLogging(config);
logStartupState(config);
#region Determine Libation Variery and Release ID
Variety = File.Exists("System.Windows.Forms.dll") ? Variety.Classic : Variety.Chardonnay;
var releaseID = (ReleaseIdentifier)((int)Variety | (int)Configuration.OS | (int)RuntimeInformation.ProcessArchitecture);
if (Enum.IsDefined(releaseID))
ReleaseIdentifier = releaseID;
else
{
ReleaseIdentifier = ReleaseIdentifier.None;
Serilog.Log.Logger.Warning("Unknown release identifier @{DebugInfo}", new { Variety, Configuration.OS, RuntimeInformation.ProcessArchitecture });
}
#endregion
// all else should occur after logging
wireUpSystemEvents(config);

2
Source/HangoverAvalonia/Views/MainWindow.axaml.cs
View File

@ -13,7 +13,7 @@ namespace HangoverAvalonia.Views
var config = LibationScaffolding.RunPreConfigMigrations();
LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(config);
LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
}
public void OnLoad()

2
Source/HangoverWinForms/Form1.cs
View File

@ -10,7 +10,7 @@ namespace HangoverWinForms
var config = LibationScaffolding.RunPreConfigMigrations();
LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(config);
LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
databaseTab.VisibleChanged += databaseTab_VisibleChanged;
cliTab.VisibleChanged += cliTab_VisibleChanged;

2
Source/LibationAvalonia/App.axaml.cs
View File

@ -141,7 +141,7 @@ namespace LibationAvalonia
await MessageBox.VerboseLoggingWarning_ShowIfTrue();
// logging is init'd here
AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(AppScaffolding.Variety.Chardonnay, config);
}
private void ShowLibationFilesDialog(IClassicDesktopStyleApplicationLifetime desktop, Configuration config, Action<IClassicDesktopStyleApplicationLifetime, LibationFilesDialog, Configuration> OnClose)

4
Source/LibationAvalonia/Program.cs
View File

@ -73,9 +73,9 @@ namespace LibationAvalonia
{
// most migrations go in here
LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(config);
LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
return LibationScaffolding.ReleaseIdentifier is not ReleaseIdentifier.None;
return true;
}
catch (Exception exDebug)
{

8
Source/LibationCli/Setup.cs
View File

@ -17,9 +17,13 @@ namespace LibationCli
//***********************************************//
var config = LibationScaffolding.RunPreConfigMigrations();
LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostMigrationScaffolding(config);
#if classic
LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
#else
LibationScaffolding.RunPostMigrationScaffolding(Variety.Chardonnay, config);
#endif
}
public static Type[] LoadVerbs() => Assembly.GetExecutingAssembly()

5
Source/LibationWinForms/Program.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Windows.Forms;
using AppScaffolding;
using Dinah.Core;
using LibationFileManager;
using LibationWinForms.Dialogs;
@ -42,7 +43,7 @@ namespace LibationWinForms
RunInstaller(config);
// most migrations go in here
AppScaffolding.LibationScaffolding.RunPostConfigMigrations(config);
LibationScaffolding.RunPostConfigMigrations(config);
// migrations which require Forms or are long-running
RunWindowsOnlyMigrations(config);
@ -50,7 +51,7 @@ namespace LibationWinForms
MessageBoxLib.VerboseLoggingWarning_ShowIfTrue();
// logging is init'd here
AppScaffolding.LibationScaffolding.RunPostMigrationScaffolding(config);
LibationScaffolding.RunPostMigrationScaffolding(Variety.Classic, config);
}
catch (Exception ex)
{