Upgrade to v2.6.3

修复 Windows 10 激活报错问题（issue #45） Fix Windows 10 activation error (issue #45)
TGSAN · Oct 22, 2022 · 13e8fa4 · 13e8fa4
1 parent caa1484
commit 13e8fa4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CMWTAT_DIGITAL/MainWindow.xaml.cs b/CMWTAT_DIGITAL/MainWindow.xaml.cs
@@ -1185,14 +1185,26 @@ private void RunAct()
                         RunCMD(@"sc start clipsvc");
 
                         RunCMD(@"clipup -v -o -altto " + tempfile);
-                        RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile); // 固定版本解决 22H2 后 ARM64 许可证接收问题
+                        RunCMD(@"clipup -v -o -altto " + tempfile.TrimEnd('\\')); // 旧版本系统的 ClipUp 路径不能带最后的反斜杠
+                        if (OSVersionInfo.BuildVersion >= 20348) 
+                        { 
+                            RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile); // 固定版本解决 22H2 后 ARM64 许可证接收问题
+                            RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile.TrimEnd('\\'));
+                        }
 
                         actbtn.Dispatcher.Invoke(new Action(() =>
                         {
                             this.activatingtext.Text = (string)this.Resources["RunAct_Activating"]; // 提示激活中
                             ShowBallSameDig();
                         }));
 
+                        int try_max_count = 30;
+                        for (int i = 0; i < try_max_count + 1 && File.Exists(tempfile + "GenuineTicket.xml"); i++)
+                        {
+                            Thread.Sleep(1000);
+                            ConsoleLog($"应用许可证 重试 {i}/{try_max_count}");
+                        }
+
                         runend = RunCScript(slmgr_self, "-ato").Trim();
 
                         ConsoleLog(runend);

diff --git a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.2.0")]
-[assembly: AssemblyFileVersion("2.6.2.0")]
+[assembly: AssemblyVersion("2.6.3.0")]
+[assembly: AssemblyFileVersion("2.6.3.0")]
diff --git a/CMWTAT_Digital_Release_2_6_2_0.exe → CMWTAT_Digital_Release_2_6_3_0.exe b/CMWTAT_Digital_Release_2_6_2_0.exe → CMWTAT_Digital_Release_2_6_3_0.exe
diff --git a/CMWTAT_Digital_Release_2_6_2_0.zip → CMWTAT_Digital_Release_2_6_3_0.zip b/CMWTAT_Digital_Release_2_6_2_0.zip → CMWTAT_Digital_Release_2_6_3_0.zip