Merge branch 'develop'

Changelog.md

@@ -1,3 +1,6 @@
+# 3.14.4 (2024/05/30)
+ - 修复上个版本中启动程序报错的问题
+
 # 3.14.3 (2024/05/16)
  - 优化插件开发
  - 允许插件使用log功能

M3u8Downloader_H.Core/M3u8Downloader_H.Core.csproj

@@ -3,9 +3,9 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-	<Version>3.14.3.0</Version>
+	<Version>3.14.4.0</Version>
     <Authors>Harlan</Authors>
-    <AssemblyVersion>3.14.3.0</AssemblyVersion>
+    <AssemblyVersion>3.14.4.0</AssemblyVersion>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">

M3u8Downloader_H.M3U8/M3u8Downloader_H.M3U8.csproj

@@ -3,8 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-    <AssemblyVersion>3.14.3.0</AssemblyVersion>
-    <Version>3.14.3.0</Version>
   </PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Release'">

M3u8Downloader_H/Bootstrapper.cs

@@ -60,7 +60,7 @@ protected override void OnUnhandledException(object sender, DispatcherUnhandledE
         {
             base.OnUnhandledException(sender, e);
 
-            MessageBox.Show(e.Exception.Message, "错误详情", MessageBoxButton.OK, MessageBoxImage.Error);
+            MessageBox.Show(e.Exception.ToString(), "错误详情", MessageBoxButton.OK, MessageBoxImage.Error);
         }
 #endif
 

M3u8Downloader_H/M3u8Downloader_H.csproj

@@ -7,8 +7,8 @@
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>M3u8Downloader_H</RootNamespace>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>3.14.3.0</AssemblyVersion>
-    <Version>3.14.3.0</Version>
+    <AssemblyVersion>3.14.4.0</AssemblyVersion>
+    <Version>3.14.4.0</Version>
     <PackageId>m3u8视频下载器</PackageId>
     <Product>m3u8视频下载器</Product>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -67,10 +67,17 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Plugins\请勿删除此目录.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Sounds\error.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Sounds\success.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Plugins\" />
   </ItemGroup></Project>

M3u8Downloader_H/Services/PluginService.cs

@@ -1,21 +1,14 @@
 using System;
 using System.Collections.Generic;
 using M3u8Downloader_H.Plugin.PluginClients;
-
-#if !DEGUG
 using System.IO;
-#endif
+
 
 namespace M3u8Downloader_H.Services
 {
     public class PluginService
     {
-        private readonly string _pluginDirPath =
-#if DEBUG
-            "e:/desktop/Plugins/";
-#else
-             Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Plugins");
-#endif
+        private readonly string _pluginDirPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Plugins");
         private readonly PluginClient pluginClient;
         public PluginService()
         {