🔖 3.0.0 240306_1204508630992

BeyondDimension · Mar 6, 2024 · 0c67cda · 0c67cda
1 parent c23823a
commit 0c67cda
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/BD.WTTS.Client.Tools.Publish/Commands/IDotNetPublishCommand.cs b/src/BD.WTTS.Client.Tools.Publish/Commands/IDotNetPublishCommand.cs
@@ -424,11 +424,14 @@ void SetConsoleColor(ConsoleColor foregroundColor, ConsoleColor backgroundColor)
                             try
                             {
                                 MSIXHelper.SignTool.Start(force_sign, fileNames, pfxFilePath, rootPublishDir);
+                                Console.WriteLine("数字签名失败，输入回车使用自签继续");
+                                Console.ReadLine();
                             }
                             catch
                             {
-                                pfxFilePath = MSIXHelper.SignTool.pfxFilePath_BeyondDimension_CodeSigning;
-                                MSIXHelper.SignTool.Start(force_sign, fileNames, pfxFilePath, rootPublishDir);
+                                if (debug)
+                                    throw;
+                                MSIXHelper.SignTool.Start(force_sign, fileNames, MSIXHelper.SignTool.pfxFilePath_BeyondDimension_CodeSigning, rootPublishDir);
                             }
                         }
                         foreach (var item in toBeSignedFiles)

diff --git a/src/BD.WTTS.Client.Tools.Publish/Commands/INSISBuildCommand.cs b/src/BD.WTTS.Client.Tools.Publish/Commands/INSISBuildCommand.cs
@@ -101,6 +101,8 @@ internal static void Handler(bool debug, string[] rids, string timestamp, bool f
                 }
                 catch
                 {
+                    if (debug)
+                        throw;
                     pfxFilePath = MSIXHelper.SignTool.pfxFilePath_BeyondDimension_CodeSigning;
                     MSIXHelper.SignTool.Start(force_sign, fileNames, pfxFilePath, rootPublishDir);
                 }

diff --git a/src/BD.WTTS.Client.Tools.Publish/Properties/launchSettings.json b/src/BD.WTTS.Client.Tools.Publish/Properties/launchSettings.json
@@ -2,9 +2,9 @@
   "profiles": {
     "BD.WTTS.Client.Tools.Publish": {
       "commandName": "Project",
-      "commandLineArgs": "nsis --rids win-x64 --hsm-sign --t 240305_1714015027783",
+      "commandLineArgs": "nsis --rids win-x64 --hsm-sign --t 240306_1204508630992",
       "commandLineArgs_release": "run --rids win-x64 --hsm-sign --stm-upload",
-      "commandLineArgs_nsis": "nsis --rids win-x64 --hsm-sign --t 240305_1714015027783",
+      "commandLineArgs_nsis": "nsis --rids win-x64 --hsm-sign --t 240306_1151276715468",
       "commandLineArgs_debug": "run --rids win-x64 --hsm-sign --stm-upload --debug",
       "commandLineArgs_GenerateBridgeContentXml": "csproj --rids win-x64"
     }