Merge pull request #31 from YJammak/develop

修复发布后置顶和开机启动失效的问题

Author: YJammak

src/WeatherCalendar/FodyWeavers.xml

@@ -1,3 +1,4 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ReactiveUI />
-</Weavers>
+    <ReactiveUI />
+    <Anotar.NLog />
+</Weavers>

src/WeatherCalendar/FodyWeavers.xsd

@@ -5,6 +5,7 @@
     <xs:complexType>
       <xs:all>
         <xs:element name="ReactiveUI" minOccurs="0" maxOccurs="1" type="xs:anyType" />
+        <xs:element name="Anotar.NLog" minOccurs="0" maxOccurs="1" type="xs:anyType" />
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">
         <xs:annotation>

src/WeatherCalendar/Utils/AppHelper.cs

@@ -1,4 +1,5 @@
-using Microsoft.Win32;
+using Anotar.NLog;
+using Microsoft.Win32;
 using System;
 using System.Diagnostics;
 using System.Linq;
@@ -11,7 +12,7 @@ public static class AppHelper
 {
     private static string AppName => "WeatherCalendar";
 
-    private static string AppFullName => Application.Current.GetType().Assembly.Location.Replace(".dll", ".exe");
+    private static string AppFullName => Process.GetCurrentProcess()!.MainModule!.FileName;
 
     public static bool IsAutoStart()
     {
@@ -43,9 +44,9 @@ public static void Restart()
             Process.Start(process);
             Application.Current.Shutdown();
         }
-        catch
+        catch (Exception ex)
         {
-            //
+            LogTo.ErrorException("重启失败", ex);
         }
     }
 
@@ -66,9 +67,9 @@ public static void RequiredAdministrator()
             Process.Start(process);
             Application.Current.Shutdown();
         }
-        catch
+        catch (Exception ex)
         {
-            //
+            LogTo.ErrorException("请求管理员权限失败", ex);
         }
     }
 
@@ -139,8 +140,9 @@ private static bool SetAutoStart(bool isAutoStart, string appName, string appFul
                 }
             }
         }
-        catch
+        catch (Exception ex)
         {
+            LogTo.ErrorException("修改开启自启注册表失败", ex);
             return false;
         }
 

src/WeatherCalendar/WeatherCalendar.csproj

@@ -21,11 +21,19 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="Anotar.NLog.Fody" Version="6.0.0">
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
         <PackageReference Include="DynamicData" Version="7.12.1" />
         <PackageReference Include="Enums.NET" Version="4.0.0" />
+        <PackageReference Include="Fody" Version="6.6.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.73" />
         <PackageReference Include="MaterialDesignThemes" Version="4.6.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="NLog" Version="5.0.4" />
         <PackageReference Include="NPinyin.Core" Version="3.0.0" />
         <PackageReference Include="ReactiveUI.Events.WPF" Version="15.1.1" />
         <PackageReference Include="ReactiveUI.Fody" Version="18.3.1" />