diff --git a/CMWTAT_DIGITAL/MainWindow.xaml.cs b/CMWTAT_DIGITAL/MainWindow.xaml.cs index db4e4da..15f8f09 100644 --- a/CMWTAT_DIGITAL/MainWindow.xaml.cs +++ b/CMWTAT_DIGITAL/MainWindow.xaml.cs @@ -1208,9 +1208,15 @@ private void RunAct() } runend = RunCScript(slmgr_self, "-ato").Trim(); - + ConsoleLog(runend); - if (runend.EndsWith("successfully.") || runend.Contains("0xC004F074") || runend.Contains("0xC004C003")) //0xC004F074 是 KMS38 长期激活会出的提示,Error 0xC004C003: The activation server determined that the specified product key is blocked. 是因为未连接激活服务器,下次连接时会自动激活。 + + var xprrunend = RunCScript(slmgr_self, "-xpr").Trim(); + var activated = (xprrunend.Contains("activated") || xprrunend.Contains("activation will expire")); + + ConsoleLog(xprrunend); + + if (runend.EndsWith("successfully.") || activated || runend.Contains("0xC004C003")) // Error 0xC004C003: The activation server determined that the specified product key is blocked. 是因为未连接激活服务器,下次连接时会自动激活。 { if (runend.Contains("0xC004C003")) { diff --git a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs index 458e88f..fea8ad0 100644 --- a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs +++ b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.0.0")] -[assembly: AssemblyFileVersion("2.7.0.0")] +[assembly: AssemblyVersion("2.7.1.0")] +[assembly: AssemblyFileVersion("2.7.1.0")] diff --git a/CMWTAT_Digital_Release_2_7_0_0.zip b/CMWTAT_Digital_Release_2_7_0_0.zip deleted file mode 100644 index c783739..0000000 Binary files a/CMWTAT_Digital_Release_2_7_0_0.zip and /dev/null differ diff --git a/CMWTAT_Digital_Release_2_7_0_0.exe b/CMWTAT_Digital_Release_2_7_1_0.exe similarity index 99% rename from CMWTAT_Digital_Release_2_7_0_0.exe rename to CMWTAT_Digital_Release_2_7_1_0.exe index 0a8c9c5..4ce673a 100644 Binary files a/CMWTAT_Digital_Release_2_7_0_0.exe and b/CMWTAT_Digital_Release_2_7_1_0.exe differ diff --git a/CMWTAT_Digital_Release_2_7_1_0.zip b/CMWTAT_Digital_Release_2_7_1_0.zip new file mode 100644 index 0000000..e2300dc Binary files /dev/null and b/CMWTAT_Digital_Release_2_7_1_0.zip differ