Updated to WASDK 1.1

d2dyno1 · d2dyno1 · commit ede9bc4a8496 · 2022-06-05T20:56:46.000+02:00
diff --git a/SecureFolderFS.Backend/ViewModels/Dashboard/Navigation/NavigationItemViewModel.cs b/SecureFolderFS.Backend/ViewModels/Dashboard/Navigation/NavigationItemViewModel.cs
@@ -6,8 +6,8 @@ public sealed class NavigationItemViewModel
 
         public int Index { get; init; }
 
-        public Action<NavigationItemViewModel?>? NavigationAction { get; init; }
-
         public string? SectionName { get; init; }
+
+        public Action<NavigationItemViewModel?>? NavigationAction { get; init; }
     }
 }
diff --git a/SecureFolderFS.WinUI/App.xaml.cs b/SecureFolderFS.WinUI/App.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using Microsoft.UI.Xaml;
 using System;
+using System.Diagnostics;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using SecureFolderFS.Backend.Services;
@@ -51,6 +52,7 @@ private void EnsureEarlyApp()
         {
             // Configure exception handlers
             UnhandledException += App_UnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
 
             // Configure IoC
@@ -94,14 +96,21 @@ private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledEx
             LogException(e.Exception);
         }
 
-        private void LogException(Exception ex)
+        private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)
         {
-            LogExceptionToFile(ex);
+            LogException(e.ExceptionObject as Exception);
         }
 
-        private void LogExceptionToFile(Exception ex)
+        private void LogException(Exception? ex)
         {
-            LoggingHelpers.SafeLogExceptionToFile(ex);
+            var formattedException = ExceptionHelpers.FormatException(ex);
+
+            Debug.WriteLine(formattedException);
+            Debugger.Break(); // Please check "Output Window" for exception details (View -> Output Window) (Ctr + Alt + O)
+
+#if !DEBUG
+            ExceptionHelpers.LogExceptionToFile(formattedException);
+#endif
         }
     }
 }
diff --git a/SecureFolderFS.WinUI/Helpers/ExceptionHelpers.cs b/SecureFolderFS.WinUI/Helpers/ExceptionHelpers.cs
@@ -5,13 +5,13 @@
 
 namespace SecureFolderFS.WinUI.Helpers
 {
-    internal static class LoggingHelpers
+    internal static class ExceptionHelpers
     {
-        public static void SafeLogExceptionToFile(Exception ex)
+        public static string? FormatException(Exception? ex)
         {
-            if (ex == null)
+            if (ex is null)
             {
-                return;
+                return null;
             }
 
             var exceptionString = string.Empty;
@@ -24,23 +24,28 @@ public static void SafeLogExceptionToFile(Exception ex)
             exceptionString += $">>> INNER {ex.InnerException}\n";
             exceptionString += $">>> SOURCE {ex.Source}\n\n";
 
-            LogToFile(exceptionString);
+            return exceptionString;
         }
 
-        private static void LogToFile(string text)
+        public static void LogExceptionToFile(string? formattedException)
         {
+            if (formattedException is null)
+            {
+                return;
+            }
+
             try
             {
                 var filePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.Application.EXCEPTIONLOG_FILENAME);
 
                 var existing = File.ReadAllText(filePath);
-                existing += text;
+                existing += formattedException;
 
                 File.WriteAllText(filePath, existing);
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                Debug.WriteLine(e);
+                Debug.WriteLine(ex);
             }
         }
     }
diff --git a/SecureFolderFS.WinUI/SecureFolderFS.WinUI.csproj b/SecureFolderFS.WinUI/SecureFolderFS.WinUI.csproj
@@ -93,9 +93,9 @@
     <PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.5.1" />
     <PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.5.1" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0-preview3" />
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.196" />
-    <PackageReference Include="Syncfusion.Chart.WinUI" Version="20.1.0.52" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.0" />
+    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22000.197" />
+    <PackageReference Include="Syncfusion.Chart.WinUI" Version="20.1.0.58" />
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>
 
diff --git a/SecureFolderFS.WinUI/WindowViews/MainWindow.xaml.cs b/SecureFolderFS.WinUI/WindowViews/MainWindow.xaml.cs
@@ -63,7 +63,6 @@ private void EnsureEarlyWindow()
             {
                 this.ExtendsContentIntoTitleBar = true;
                 SetTitleBar(HostPage.CustomTitleBar);
-                //HostPage.CustomTitleBar.Margin = new Thickness(0, 0, 138, 0); // Don't cover up Window buttons
             }
 
             // Set mica material

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@ public sealed class NavigationItemViewModel`
`6`	`6`
`7`	`7`	`public int Index { get; init; }`
`8`	`8`
`9`		`- public Action<NavigationItemViewModel?>? NavigationAction { get; init; }`
`10`		`-`
`11`	`9`	`public string? SectionName { get; init; }`
	`10`	`+`
	`11`	`+ public Action<NavigationItemViewModel?>? NavigationAction { get; init; }`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Microsoft.UI.Xaml;`
`2`	`2`	`using System;`
	`3`	`+using System.Diagnostics;`
`3`	`4`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`4`	`5`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`6`	`using SecureFolderFS.Backend.Services;`
`@@ -51,6 +52,7 @@ private void EnsureEarlyApp()`
`51`	`52`	`{`
`52`	`53`	`// Configure exception handlers`
`53`	`54`	`UnhandledException += App_UnhandledException;`
	`55`	`+ AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;`
`54`	`56`	`TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;`
`55`	`57`
`56`	`58`	`// Configure IoC`
`@@ -94,14 +96,21 @@ private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledEx`
`94`	`96`	`LogException(e.Exception);`
`95`	`97`	`}`
`96`	`98`
`97`		`- private void LogException(Exception ex)`
	`99`	`+ private void CurrentDomain_UnhandledException(object sender, System.UnhandledExceptionEventArgs e)`
`98`	`100`	`{`
`99`		`- LogExceptionToFile(ex);`
	`101`	`+ LogException(e.ExceptionObject as Exception);`
`100`	`102`	`}`
`101`	`103`
`102`		`- private void LogExceptionToFile(Exception ex)`
	`104`	`+ private void LogException(Exception? ex)`
`103`	`105`	`{`
`104`		`- LoggingHelpers.SafeLogExceptionToFile(ex);`
	`106`	`+ var formattedException = ExceptionHelpers.FormatException(ex);`
	`107`	`+`
	`108`	`+ Debug.WriteLine(formattedException);`
	`109`	`+ Debugger.Break(); // Please check "Output Window" for exception details (View -> Output Window) (Ctr + Alt + O)`
	`110`	`+`
	`111`	`+#if !DEBUG`
	`112`	`+ ExceptionHelpers.LogExceptionToFile(formattedException);`
	`113`	`+#endif`
`105`	`114`	`}`
`106`	`115`	`}`
`107`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,13 @@`
`5`	`5`
`6`	`6`	`namespace SecureFolderFS.WinUI.Helpers`
`7`	`7`	`{`
`8`		`- internal static class LoggingHelpers`
	`8`	`+ internal static class ExceptionHelpers`
`9`	`9`	`{`
`10`		`- public static void SafeLogExceptionToFile(Exception ex)`
	`10`	`+ public static string? FormatException(Exception? ex)`
`11`	`11`	`{`
`12`		`- if (ex == null)`
	`12`	`+ if (ex is null)`
`13`	`13`	`{`
`14`		`- return;`
	`14`	`+ return null;`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`var exceptionString = string.Empty;`
`@@ -24,23 +24,28 @@ public static void SafeLogExceptionToFile(Exception ex)`
`24`	`24`	`exceptionString += $">>> INNER {ex.InnerException}\n";`
`25`	`25`	`exceptionString += $">>> SOURCE {ex.Source}\n\n";`
`26`	`26`
`27`		`- LogToFile(exceptionString);`
	`27`	`+ return exceptionString;`
`28`	`28`	`}`
`29`	`29`
`30`		`- private static void LogToFile(string text)`
	`30`	`+ public static void LogExceptionToFile(string? formattedException)`
`31`	`31`	`{`
	`32`	`+ if (formattedException is null)`
	`33`	`+ {`
	`34`	`+ return;`
	`35`	`+ }`
	`36`	`+`
`32`	`37`	`try`
`33`	`38`	`{`
`34`	`39`	`var filePath = Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.Application.EXCEPTIONLOG_FILENAME);`
`35`	`40`
`36`	`41`	`var existing = File.ReadAllText(filePath);`
`37`		`- existing += text;`
	`42`	`+ existing += formattedException;`
`38`	`43`
`39`	`44`	`File.WriteAllText(filePath, existing);`
`40`	`45`	`}`
`41`		`- catch (Exception e)`
	`46`	`+ catch (Exception ex)`
`42`	`47`	`{`
`43`		`- Debug.WriteLine(e);`
	`48`	`+ Debug.WriteLine(ex);`
`44`	`49`	`}`
`45`	`50`	`}`
`46`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,6 @@ private void EnsureEarlyWindow()`
`63`	`63`	`{`
`64`	`64`	`this.ExtendsContentIntoTitleBar = true;`
`65`	`65`	`SetTitleBar(HostPage.CustomTitleBar);`
`66`		`- //HostPage.CustomTitleBar.Margin = new Thickness(0, 0, 138, 0); // Don't cover up Window buttons`
`67`	`66`	`}`
`68`	`67`
`69`	`68`	`// Set mica material`