Merge branch 'master' into dev

Author: jjw24

Plugins/Wox.Plugin.Program/Logger/ProgramLogger.cs

@@ -41,7 +41,8 @@ static ProgramLogger()
         }
 
         /// <summary>
-        /// Please follow exception format: |class name|calling method name|loading program path|user friendly message that explains the error
+        /// Please follow exception format, there are four parts to an error message that need to be specified:
+        /// |class name|calling method name|loading program path|user friendly message that explains the error
         /// => Example: |Win32|LnkProgram|c:\..\chrome.exe|Permission denied on directory, but Wox should continue
         /// </summary>
         [MethodImpl(MethodImplOptions.Synchronized)]

Plugins/Wox.Plugin.Program/Programs/UWP.cs

@@ -159,15 +159,15 @@ public static Application[] All()
 #if !DEBUG
                     catch (Exception e)
                     {
-                        ProgramLogger.LogException("|UWP|All|An unexpected error occured and "
+                        ProgramLogger.LogException($"|UWP|All|{p.InstalledLocation}|An unexpected error occured and "
                                                         + $"unable to convert Package to UWP for {p.Id.FullName}", e);
                         return new Application[] { };
                     }
 #endif
 #if DEBUG //make developer aware and implement handling
-                    catch(Exception)
+                    catch(Exception e)
                     {
-                        throw;
+                        throw e;
                     }
 #endif
                     return u.Apps;
@@ -207,7 +207,7 @@ private static IEnumerable<Package> CurrentUserPackages()
                     }
                     catch (Exception e)
                     {
-                        ProgramLogger.LogException("|UWP|CurrentUserPackages|An unexpected error occured and "
+                        ProgramLogger.LogException("|UWP|CurrentUserPackages|Not available|An unexpected error occured and "
                                                    + $"unable to verify if package is valid", e);
                         return false;
                     }