Skip to content

Commit 13e8fa4

Browse files
committed
Upgrade to v2.6.3
修复 Windows 10 激活报错问题 (issue #45) Fix Windows 10 activation error (issue #45)
1 parent caa1484 commit 13e8fa4

4 files changed

+15
-3
lines changed

CMWTAT_DIGITAL/MainWindow.xaml.cs

+13-1
Original file line numberDiff line numberDiff line change
@@ -1185,14 +1185,26 @@ private void RunAct()
11851185
RunCMD(@"sc start clipsvc");
11861186

11871187
RunCMD(@"clipup -v -o -altto " + tempfile);
1188-
RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile); // 固定版本解决 22H2 后 ARM64 许可证接收问题
1188+
RunCMD(@"clipup -v -o -altto " + tempfile.TrimEnd('\\')); // 旧版本系统的 ClipUp 路径不能带最后的反斜杠
1189+
if (OSVersionInfo.BuildVersion >= 20348)
1190+
{
1191+
RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile); // 固定版本解决 22H2 后 ARM64 许可证接收问题
1192+
RunCLI(tempfile + "ClipUp.exe", ".", "-v -o -altto " + tempfile.TrimEnd('\\'));
1193+
}
11891194

11901195
actbtn.Dispatcher.Invoke(new Action(() =>
11911196
{
11921197
this.activatingtext.Text = (string)this.Resources["RunAct_Activating"]; // 提示激活中
11931198
ShowBallSameDig();
11941199
}));
11951200

1201+
int try_max_count = 30;
1202+
for (int i = 0; i < try_max_count + 1 && File.Exists(tempfile + "GenuineTicket.xml"); i++)
1203+
{
1204+
Thread.Sleep(1000);
1205+
ConsoleLog($"应用许可证 重试 {i}/{try_max_count}");
1206+
}
1207+
11961208
runend = RunCScript(slmgr_self, "-ato").Trim();
11971209

11981210
ConsoleLog(runend);

CMWTAT_DIGITAL/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
5252
// 方法是按如下所示使用“*”: :
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2.6.2.0")]
55-
[assembly: AssemblyFileVersion("2.6.2.0")]
54+
[assembly: AssemblyVersion("2.6.3.0")]
55+
[assembly: AssemblyFileVersion("2.6.3.0")]
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)