修复启动前任务无法删除的错误

Author: SuGar0218

PreLaunchTaskr.Core/PreLaunchTaskr.Core.csproj

@@ -6,16 +6,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
+    <Compile Remove="Dao\Implementations\**" />
+    <Compile Remove="Dao\Interfaces\**" />
+    <EmbeddedResource Remove="Dao\Implementations\**" />
+    <EmbeddedResource Remove="Dao\Interfaces\**" />
+    <None Remove="Dao\Implementations\**" />
+    <None Remove="Dao\Interfaces\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PreLaunchTaskr.Common\PreLaunchTaskr.Common.csproj" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Dao\Interfaces\" />
-    <Folder Include="Dao\Implementations\" />
+    <ProjectReference Include="..\PreLaunchTaskr.Common\PreLaunchTaskr.Common.csproj" />
   </ItemGroup>
 
 </Project>

PreLaunchTaskr.Core/Services/Launcher.cs

@@ -215,8 +215,17 @@ public bool Launch(
                     }
                 }
             }
-            taskProcess.Start();
-            taskProcess.WaitForExit();
+            try
+            {
+                if (!taskProcess.Start())
+                    continue;
+
+                taskProcess.WaitForExit();
+            }
+            catch (Exception)
+            {
+                continue;
+            }
         }
 
         // 带上处理后的启动参数、专属环境变量，去启动程序

PreLaunchTaskr.GUI.WinUI3/App.xaml.cs

@@ -23,9 +23,9 @@ public partial class App : Application
 {
     public static string DisplayVersion =>
 #if DEBUG
-        "1.4.4 DEBUG";
+        "1.4.5 DEBUG";
 #else
-        "1.4.4";
+        "1.4.5";
 #endif
 
     /// <summary>

PreLaunchTaskr.GUI.WinUI3/Assets/PreLaunchTaskrBannerSmallText.png

@@ -14,6 +14,12 @@
 	  <WindowsPackageType>None</WindowsPackageType>
 	  <LangVersion>preview</LangVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Services\**" />
+    <EmbeddedResource Remove="Services\**" />
+    <None Remove="Services\**" />
+    <Page Remove="Services\**" />
+  </ItemGroup>
   <ItemGroup>
     <Content Remove="Assets\DefaultProgramIcon.png" />
     <Content Remove="Assets\PreLaunchTaskrBannerSmallText.png" />
@@ -159,10 +165,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Dao\" />
-    <Folder Include="Services\" />
-  </ItemGroup>
 
   <!--
     Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
@@ -185,4 +187,7 @@
     <AssemblyVersion>1.4.2</AssemblyVersion>
     <FileVersion>1.4.2</FileVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <PRIResource Remove="Services\**" />
+  </ItemGroup>
 </Project>

PreLaunchTaskr.GUI.WinUI3/Assets/PreLaunchTaskrTitle.jpg

@@ -71,7 +71,7 @@ public bool Remove()
         if (preLaunchTask.Id == -1)
             return false;
 
-        return App.Current.Configurator.RemoveAttachedArgument(preLaunchTask.Id);
+        return App.Current.Configurator.RemovePreLaunchTask(preLaunchTask.Id);
     }
 
     private readonly PreLaunchTask preLaunchTask;

PreLaunchTaskr.GUI.WinUI3/PreLaunchTaskr.GUI.WinUI3.csproj

@@ -35,7 +35,9 @@
             Margin="36,0"
             Spacing="16">
 
-            <StackPanel Margin="0,36,0,0">
+            <Border Height="20" />
+
+            <StackPanel>
                 <TextBlock Style="{ThemeResource TitleTextBlockStyle}" Text="关于此应用" />
                 <Image MaxHeight="360" Source="/Assets/PreLaunchTaskrBannerSmallText.png" />
             </StackPanel>
@@ -66,9 +68,7 @@
 
             <Expander Header="Segoe Fluent 图标字体" IsExpanded="False">
                 <StackPanel>
-                    <TextBlock Style="{ThemeResource BodyTextBlockStyle}" Text="随着 Windows 11 的发布，符号图标字体已从 Segoe MDL2 Assets 替换为 Segoe Fluent Icons 字体。" />
-
-                    <TextBlock Style="{ThemeResource BodyTextBlockStyle}" Text="在 Windows 10 电脑上可能部分图标不能正常显示，例如显示为一个矩形框。如有需要可以下载，然后在右键菜单中为所有用户安装。" />
+                    <TextBlock Style="{ThemeResource BodyTextBlockStyle}" Text="{x:Bind AboutFontIcon}" />
 
                     <my:IconHyperlinkButton
                         Padding="8"
@@ -138,6 +138,8 @@
                     </my:IconHyperlinkButton>
                 </StackPanel>
             </Expander>
+
+            <Border Height="20" />
         </StackPanel>
     </ScrollView>
 </Page>

PreLaunchTaskr.GUI.WinUI3/ViewModels/ItemModels/PreLaunchTaskListItem.cs

@@ -21,5 +21,15 @@ private string ReadMe
         }
     }
 
+    private string AboutFontIcon
+    {
+        get => aboutFontIcon;
+    }
+
     private static string readme = null!;
+
+    private const string aboutFontIcon =
+@"随着 Windows 11 的发布，符号图标字体已从 Segoe MDL2 Assets 替换为 Segoe Fluent Icons 字体。
+
+在 Windows 10 电脑上可能部分图标不能正常显示，例如显示为一个矩形框。如有需要可以下载，然后在右键菜单中为所有用户安装。";
 }