diff --git a/CMWTAT_DIGITAL/MainWindow.xaml.cs b/CMWTAT_DIGITAL/MainWindow.xaml.cs index e5a7f5d..19ce25f 100644 --- a/CMWTAT_DIGITAL/MainWindow.xaml.cs +++ b/CMWTAT_DIGITAL/MainWindow.xaml.cs @@ -365,8 +365,7 @@ public MainWindow() DataContext = new ViewModel(); this.DialogHostGrid.Visibility = Visibility.Visible; - - //MessageBox.Show(@"reg add ""HKLM\SYSTEM\Tokens\"" /v ""Channel"" /t REG_SZ /d ""Retail"" /f"); + DialogWait.IsOpen = true; try { @@ -1119,12 +1118,6 @@ private void RunAct() //写入Win7特征 //ChangePKAction(changepk + " /ProductKey " + key); - actbtn.Dispatcher.Invoke(new Action(() => - { - this.activatingtext.Text = (string)this.Resources["RunAct_Writing_old_OS"]; // "Writing feature of old Windows version"; - ShowBallSameDig(); - })); - if (mode == "4") { //长期KMS @@ -1133,16 +1126,8 @@ private void RunAct() //if (runend.EndsWith("successfully.")) //{ //} - RunCMD(@"reg add ""HKLM\SYSTEM\Tokens"" /v ""Channel"" /t REG_SZ /d ""Volume:GVLK"" /f"); - } - else - { - RunCMD(@"reg add ""HKLM\SYSTEM\Tokens"" /v ""Channel"" /t REG_SZ /d ""Retail"" /f"); } - RunCMD(@"reg add ""HKLM\SYSTEM\Tokens\Kernel"" /v ""Kernel-ProductInfo"" /t REG_DWORD /d " + sku + " /f"); - RunCMD(@"reg add ""HKLM\SYSTEM\Tokens\Kernel"" /v ""Security-SPP-GenuineLocalStatus"" /t REG_DWORD /d 1 /f"); - actbtn.Dispatcher.Invoke(new Action(() => { this.activatingtext.Text = (string)this.Resources["RunAct_Installing_Key"]; //提示正在安装密钥 @@ -1244,21 +1229,6 @@ private void RunAct() } //string runend = RunCScript(slmgr_self, "-upk").Trim(); EndLine:; - // 此处确保注册表清理一定进行 - try - { - actbtn.Dispatcher.Invoke(new Action(() => - { - this.activatingtext.Text = (string)this.Resources["RunAct_Cleaning_changes"]; // "Cleaning changes"; - ShowBallSameDig(); - })); - - RunCMD(@"reg delete ""HKLM\SYSTEM\Tokens"" /f"); - } - catch - { - ConsoleLog("Delete Reg Error"); - } if (code != "200") { actbtn.Dispatcher.Invoke(new Action(() => diff --git a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs index 0303d4b..4456d26 100644 --- a/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs +++ b/CMWTAT_DIGITAL/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("CloudMoe Network")] [assembly: AssemblyProduct("CMWTAT Digital Edition V2")] -[assembly: AssemblyCopyright("Copyright © CloudMoe Saltfish Studio 2018")] +[assembly: AssemblyCopyright("Copyright © CloudMoe Saltfish Studio 2022")] [assembly: AssemblyTrademark("CloudMoe Saltfish Studio")] [assembly: AssemblyCulture("")] @@ -51,5 +51,5 @@ // 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号 // 方法是按如下所示使用“*”: : // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.6.1.0")] -[assembly: AssemblyFileVersion("2.6.1.0")] +[assembly: AssemblyVersion("2.6.2.0")] +[assembly: AssemblyFileVersion("2.6.2.0")] diff --git a/CMWTAT_Digital_Release_2_6_1_0.zip b/CMWTAT_Digital_Release_2_6_1_0.zip deleted file mode 100644 index d895c50..0000000 Binary files a/CMWTAT_Digital_Release_2_6_1_0.zip and /dev/null differ diff --git a/CMWTAT_Digital_Release_2_6_1_0.exe b/CMWTAT_Digital_Release_2_6_2_0.exe similarity index 92% rename from CMWTAT_Digital_Release_2_6_1_0.exe rename to CMWTAT_Digital_Release_2_6_2_0.exe index c79ec1e..a09a0a1 100644 Binary files a/CMWTAT_Digital_Release_2_6_1_0.exe and b/CMWTAT_Digital_Release_2_6_2_0.exe differ diff --git a/CMWTAT_Digital_Release_2_6_2_0.zip b/CMWTAT_Digital_Release_2_6_2_0.zip new file mode 100644 index 0000000..2a8215e Binary files /dev/null and b/CMWTAT_Digital_Release_2_6_2_0.zip differ diff --git a/README.md b/README.md index 88c2ed3..1aaeb90 100644 --- a/README.md +++ b/README.md @@ -93,10 +93,6 @@ This toolkit can activate your Windows 10 and Windows 11 use digital license. [GPL-2.0](./LICENSE) -# Thanks 感谢 - -* Thanks for s1ave77 (Basic logic) and vyvojar (SLC.DLL) - # Contributors 贡献者 [https://github.com/TGSAN/CMWTAT_Digital_Edition/graphs/contributors]