Fixing intaller creation

melance · Aug 5, 2021 · a289fc4 · a289fc4
1 parent b46295c
commit a289fc4
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 26 deletions.
diff --git a/Installer/Randomizer.Generator.nsi b/Installer/Randomizer.Generator.nsi
@@ -73,6 +73,7 @@ Section "Program Files (Required)" secRequired
 	File "..\bin\Debug\net5.0\KeraLua.dll"
 	File "..\bin\Debug\net5.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll"
 	File "..\bin\Debug\net5.0\JetBrains.Annotations.dll"
+	File "..\bin\Debug\net5.0\JsonSubtypes.dll"
 	File "..\bin\Debug\net5.0\NCalc.dll"
 	File "..\bin\Debug\net5.0\Newtonsoft.Json.dll"
 	File "..\bin\Debug\net5.0\NLua.dll"

diff --git a/Randomizer.Generator.UITerminal/Program.cs b/Randomizer.Generator.UITerminal/Program.cs
@@ -6,6 +6,8 @@
 using Randomizer.Generator.UI.Terminal.Utility;
 using Randomizer.Generator.UI.Terminal.Models;
 using Randomizer.Generator.UI.Terminal;
+using Microsoft.Extensions.Logging.EventLog;
+using System.Diagnostics;
 
 namespace Randomizer.Generator.UI.Terminal
 {
@@ -42,34 +44,43 @@ public static String CurrentDirectory
 
 		static void Main(String settingsPath)
         {
-			Application.Init();
-			Directory.CreateDirectory(DefaultDirectory);
-			Directory.SetCurrentDirectory(DefaultDirectory);
+			try
+			{
+				Application.Init();
+				Directory.CreateDirectory(DefaultDirectory);
+				Directory.SetCurrentDirectory(DefaultDirectory);
 
-			Randomizer.Generator.DataAccess.DataAccess.Instance = new TUIDataAccess();
+				Randomizer.Generator.DataAccess.DataAccess.Instance = new TUIDataAccess();
 
-			TopLevelObject = Application.Top;
-			MainWindow = new()
-			{
-				Title = AssemblyInfo.ProductName
-			};
+				TopLevelObject = Application.Top;
+				MainWindow = new()
+				{
+					Title = AssemblyInfo.ProductName
+				};
 
-			if (!String.IsNullOrEmpty(settingsPath))
-			{
-				UserSettings.Instance.SettingPath = settingsPath;
-			}
-			UserSettings.Instance.Load();
+				if (!String.IsNullOrEmpty(settingsPath))
+				{
+					UserSettings.Instance.SettingPath = settingsPath;
+				}
+				UserSettings.Instance.Load();
 
-			stsCurrentDirectory = new(Key.Null, ustring.Empty, null);
-			CurrentDirectory = UserSettings.Instance.WorkingDirectory;
+				stsCurrentDirectory = new(Key.Null, ustring.Empty, null);
+				CurrentDirectory = UserSettings.Instance.WorkingDirectory;
 
-			TopLevelObject.Add(new StatusBar(new[] { stsCurrentDirectory }));
-			TopLevelObject.Add(MainWindow);	
-			Application.Run();
-			if (UserSettings.Instance.RememberLastDirectory)
+				TopLevelObject.Add(new StatusBar(new[] { stsCurrentDirectory }));
+				TopLevelObject.Add(MainWindow);	
+				Application.Run();
+				if (UserSettings.Instance.RememberLastDirectory)
+				{
+					UserSettings.Instance.WorkingDirectory = CurrentDirectory;
+					UserSettings.Instance.Save();
+				}
+			}
+			catch (Exception ex)
 			{
-				UserSettings.Instance.WorkingDirectory = CurrentDirectory;
-				UserSettings.Instance.Save();
+				var eventLog = new EventLog();
+				eventLog.Source = "Application";
+				eventLog.WriteEntry(ex.ToString(), EventLogEntryType.Error);
 			}
 		}
 

diff --git a/Randomizer.Generator.UITerminal/Randomizer.Generator.UI.Terminal.csproj b/Randomizer.Generator.UITerminal/Randomizer.Generator.UI.Terminal.csproj
@@ -37,6 +37,7 @@
   <ItemGroup>
     <PackageReference Include="FIGlet.Net" Version="1.1.2" />
     <PackageReference Include="Hjson" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="5.0.0" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.3.0-alpha.21216.1" />
     <PackageReference Include="Terminal.Gui" Version="1.1.1" />
     <PackageReference Include="TextCopy" Version="4.3.1" />

diff --git a/postbuild.ps1 b/postbuild.ps1
@@ -1,9 +1,9 @@
 Write-Host("Randomizer.Generator Post Build");
 Write-Host("Copying Randomizer.Generator.CmdLine");
-If (!(Test-Path .\bin\Debug\net5.0))
+If (!(Test-Path C:\Users\me_la\source\repos\Randomizer.Generator\bin\Debug\net5.0))
 {
-    New-Item -Path .\bin\Debug\net5.0
+    New-Item -Path C:\Users\me_la\source\repos\Randomizer.Generator\bin\Debug\net5.0
 }
-Copy-Item -Path ..\Randomizer.Generator.CmdLine\bin\Release\net5.0\* -Destination .\bin\Debug\net5.0 -Recurse -Force
+Copy-Item -Path C:\Users\me_la\source\repos\Randomizer.Generator\Randomizer.Generator.CmdLine\bin\Release\net5.0\* -Destination C:\Users\me_la\source\repos\Randomizer.Generator\bin\Release\net5.0 -Recurse -Force
 Write-Host("Copying Randomizer.Generator.UI.Terminal");
-Copy-Item -Path .\bin\Release\net5.0\* -Destination ..\bin\Debug\net5.0 -Recurse -Force
+Copy-Item -Path C:\Users\me_la\source\repos\Randomizer.Generator\Randomizer.Generator.UITerminal\bin\Release\net5.0\* -Destination C:\Users\me_la\source\repos\Randomizer.Generator\bin\Release\net5.0 -Recurse -Force