From f011d21291f4bdc42f7a15e2c48ccb789e87308d Mon Sep 17 00:00:00 2001
From: Jiaqi Liu <jackil@microsoft.com>
Date: Sat, 28 Sep 2019 22:07:51 -0700
Subject: [PATCH] v 0.10.3.0

v 0.10.3.0
---
 src/Notepads/App.xaml.cs          | 22 +++++++++++++++-------
 src/Notepads/Package.appxmanifest |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/Notepads/App.xaml.cs b/src/Notepads/App.xaml.cs
index 3ce7dc12a..102789117 100644
--- a/src/Notepads/App.xaml.cs
+++ b/src/Notepads/App.xaml.cs
@@ -48,6 +48,7 @@ public App()
             ApplicationSettingsStore.Write(SettingsKey.ActiveInstanceIdStr, App.Id.ToString());
 
             InitializeComponent();
+
             Suspending += OnSuspending;
         }
 
@@ -65,12 +66,6 @@ private static void OnUnhandledException(object sender, Windows.UI.Xaml.Unhandle
                 {
                     "Exception", e.Exception.ToString()
                 },
-                {
-                    "OSArchitecture", SystemInformation.OperatingSystemArchitecture.ToString()
-                },
-                {
-                    "OSVersion", SystemInformation.OperatingSystemVersion.ToString()
-                },
                 {
                     "Culture", SystemInformation.Culture.EnglishName
                 },
@@ -103,6 +98,12 @@ private static void OnUnhandledException(object sender, Windows.UI.Xaml.Unhandle
                 },
                 {
                     "AppUptime", SystemInformation.AppUptime.ToString()
+                },
+                {
+                    "OSArchitecture", SystemInformation.OperatingSystemArchitecture.ToString()
+                },
+                {
+                    "OSVersion", SystemInformation.OperatingSystemVersion.ToString()
                 }
             };
 
@@ -212,7 +213,14 @@ private async System.Threading.Tasks.Task ActivateAsync(IActivatedEventArgs e)
             LoggingService.LogInfo($"AppLaunchSettings: {string.Join(";", appLaunchSettings.Select(x => x.Key + "=" + x.Value).ToArray())}");
             Analytics.TrackEvent("AppLaunch_Settings", appLaunchSettings);
 
-            await ActivationService.ActivateAsync(rootFrame, e);
+            try
+            {
+                await ActivationService.ActivateAsync(rootFrame, e);
+            }
+            catch (Exception ex)
+            {
+                throw new Exception("AppFailedToActivate", ex);
+            }
 
             Window.Current.Activate();
             ExtendAcrylicIntoTitleBar();
diff --git a/src/Notepads/Package.appxmanifest b/src/Notepads/Package.appxmanifest
index ea5253aa9..6dd855386 100644
--- a/src/Notepads/Package.appxmanifest
+++ b/src/Notepads/Package.appxmanifest
@@ -13,7 +13,7 @@
   <Identity
     Name="Notepads-Beta"
     Publisher="CN=jackil"
-    Version="0.10.2.0" />
+    Version="0.10.3.0" />
 
   <mp:PhoneIdentity PhoneProductId="77ab4c55-cc57-4187-a21f-b8adbd22d860" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>