merge: Beta v0.2.0.8 (#25)

* chore: Update build scripts * style: i18n update * perf: Adjust the control color to WhiteSmoke * perf: Modify the download link for Windows App Runtime * feat: Relax TargetDeviceFamily requirement to 0.0.0.0 * feat: Add CLR_v4.0 log and Crash folder fetching * feat: Extended cleanup to CLR_v4.0, formatted error outputs
Goo-aw233 · Jan 5, 2025 · f5708de · f5708de
1 parent 1e2474e
commit f5708de
Show file tree

Hide file tree

Showing 13 changed files with 275 additions and 72 deletions.
diff --git a/assets/custom.json b/assets/custom.json
@@ -26,8 +26,14 @@
     "repair_pc_manager_to_perform": "Does it repair Microsoft PC Manager installation / launch issues? This action directly uninstalls all versions of Microsoft PC Manager, cleans up configuration files and residuals, and repairs Microsoft Edge (WebView2 Runtime) installer failed to start.",
     "repair_pc_manager_success": "Successfully repaired Microsoft PC Manager installation / launch issues.",
     "repair_pc_manager_error": "Error occurred while repairing Microsoft PC Manager installation / launch issues",
+    "retrieve_pc_manager_appdata_clr_4_0_logs_success": "Successfully retrieved user Microsoft PC Manager CLR_v4.0 logs.",
+    "retrieve_pc_manager_appdata_clr_4_0_logs_error": "Error occurred while retrieving user Microsoft PC Manager CLR_v4.0 logs",
+    "retrieve_pc_manager_systemroot_clr_4_0_logs_success": "Successfully retrieved system Microsoft PC Manager CLR_v4.0 logs.",
+    "retrieve_pc_manager_systemroot_clr_4_0_logs_error": "Error occurred while retrieving system Microsoft PC Manager CLR_v4.0 logs",
     "retrieve_pc_manager_common_logs_success": "Successfully retrieved Microsoft PC Manager application logs.",
     "retrieve_pc_manager_common_logs_error": "Error occurred while retrieving Microsoft PC Manager application logs",
+    "retrieve_pc_manager_crash_files_success": "Successfully retrieved Microsoft PC Manager crash files.",
+    "retrieve_pc_manager_crash_files_error": "Error occurred while retrieving Microsoft PC Manager crash files",
     "retrieve_pc_manager_setup_logs_success": "Successfully retrieved Microsoft PC Manager installation logs.",
     "retrieve_pc_manager_setup_logs_error": "Error occurred while retrieving Microsoft PC Manager installation logs",
     "retrieve_pc_manager_service_logs_success": "Successfully retrieved Microsoft PC Manager service logs.",
@@ -103,7 +109,7 @@
     "reinstall_pc_manager_success": "Reinstallation of Microsoft PC Manager was successful.",
     "reinstall_pc_manager_error": "Error occurred while reinstalling Microsoft PC Manager",
     "reintsall_pc_manager_error_code": "Error code",
-    "reintsall_pc_manager_error_code_1": "Access is denied. Please try rerunning as Administrator.",
+    "reintsall_pc_manager_error_code_1": "Access is denied. Please try rerunning as administrator.",
     "reintsall_pc_manager_error_code_2": "There is a problem with the application package manifest file (AppxManifest.xml), try uninstalling Microsoft PC Manager and reinstalling it.",
     "reintsall_pc_manager_error_code_0x80073D02": "The package could not be installed because resources it modifies are currently in use. Unable to install because the following apps need to be closed.",
     "update_from_application_package_no_file_selected": "No file selected.",
@@ -112,7 +118,7 @@
     "update_from_application_package_success": "Successfully updated Microsoft PC Manager from the application package.",
     "update_from_application_package_error": "Error occurred while updating Microsoft PC Manager from the application package",
     "install_from_appxmanifest_warn_title": "Warning",
-    "install_from_appxmanifest_warn": "If you have previously used this feature to install Microsoft PC Manager, please uninstall Microsoft PC Manager before using this feature. Do you want to continue?",
+    "install_from_appxmanifest_warn": "If you have previously used this feature to install Microsoft PC Manager, please uninstall Microsoft PC Manager before using this feature. Do you want to continue? This feature is still unstable, lacks debugging output, please ensure you have backed up your data and have some debugging capability.",
     "install_from_appxmanifest_no_file_selected": "No file selected.",
     "install_from_appxmanifest_no_match_architecture": "No version found that matches the current PC.",
     "install_from_appxmanifest_no_match_pc_manager_architecture": "No matching architecture was found in the application package. Please find out the architecture of the current application package, rename it to an application package containing the architecture name and retry. (e.g. x64 or arm64)",
@@ -127,7 +133,7 @@
     "wv2_runtime_install_success": "Successfully installed Microsoft Edge WebView2 Runtime.",
     "wv2_runtime_installer_download_link": "If you need to save a copy of the Microsoft Edge WebView2 Runtime installer for yourself, please visit https://developer.microsoft.com/microsoft-edge/webview2/?wt.mc_id=studentamb_265231 and select the 'Evergreen Standalone Installer' for x64 or ARM64 to download.",
     "wv2_installer_exit_code": "Microsoft Edge WebView2 Runtime installer exit code",
-    "wv2_runtime_already_installed": "Microsoft Edge WebView2 Runtime is already installed on your system. Please try rerunning as Administrator.",
+    "wv2_runtime_already_installed": "Microsoft Edge WebView2 Runtime is already installed on your system. Please try rerunning as administrator.",
     "wv2_installer_exit_code_0x8004070c": "Please try deleting the 'C:\\Program Files (x86)\\Microsoft\\EdgeWebView' folder and try again. If there is only a Temp folder under 'C:\\Program Files (x86)\\Microsoft', please delete the 'C:\\Program Files (x86)\\Microsoft' folder directly and try again.",
     "wv2_installer_exit_code_0x800700b7": "Please try deleting the 'C:\\Program Files (x86)\\Microsoft\\EdgeWebView' folder and try again. If there is only a Temp folder under 'C:\\Program Files (x86)\\Microsoft', please delete the 'C:\\Program Files (x86)\\Microsoft' folder directly and try again. If the problem persists, check if you have access rights to the 'C:\\Program Files (x86)\\Microsoft' folder.",
     "wv2_download_error": "Error downloading Microsoft Edge WebView2 Runtime.",
@@ -159,8 +165,8 @@
     "advanced_fail_to_config_and_files_info_for_all_users_in_dism": "Error information",
     "uninstall_and_cleanup_for_all_users_in_dism_success": "Uninstalls Microsoft PC Manager via DISM for all users and cleans up profiles and residual successes.",
     "uninstall_for_all_users_in_dism_error_code": "Error code",
-    "uninstall_for_all_users_in_dism_error_code_1": "Uninstallation failed, please try running as an Administrator. If the problem persists after running as an Administrator, please try using 'Uninstall Microsoft PC Manager via DISM for all users'.",
-    "uninstall_for_all_users_in_dism_error_code_740": "Uninstallation failed, please try running as an Administrator. Elevated permissions are required to run DISM. Use an elevated command prompt to complete these tasks.",
+    "uninstall_for_all_users_in_dism_error_code_1": "Uninstallation failed, please try running as an administrator again. If the problem persists after running as an administrator, please try again or contact your system administrator for assistance.",
+    "uninstall_for_all_users_in_dism_error_code_740": "Uninstallation failed, please try running as an administrator. Elevated permissions are required to run DISM. Use an elevated command prompt to complete these tasks.",
     "uninstall_for_all_users_success": "Successfully uninstalled Microsoft PC Manager for all users.",
     "uninstall_for_all_users_error": "Error occurred while uninstalling Microsoft PC Manager for all users",
     "cleanup_config_and_files_notice_for_all_users": "Clean up configuration files and residual files",
@@ -183,7 +189,7 @@
     "advanced_fail_to_config_and_files_info_for_all_users": "Error information",
     "uninstall_and_cleanup_for_all_users_success": "Uninstalls Microsoft PC Manager for all users and cleans up profiles and residual successes.",
     "uninstall_for_all_users_error_code": "Error code",
-    "uninstall_for_all_users_error_code_1": "Uninstallation failed, please try running as an Administrator. If the problem persists after running as an Administrator, please try using 'Uninstall Microsoft PC Manager via DISM for all users'.",
+    "uninstall_for_all_users_error_code_1": "Uninstallation failed, please try running as an administrator. If the problem persists after running as an administrator, please try using 'Uninstall Microsoft PC Manager via DISM for all users'.",
     "uninstall_for_current_user_success": "Successfully uninstalled Microsoft PC Manager for current user.",
     "uninstall_for_current_user_error": "Error occurred while uninstalling Microsoft PC Manager for current user",
     "cleanup_config_and_files_notice_for_current_user": "Clean up configuration files and residual files",
@@ -198,7 +204,7 @@
     "fail_to_clear_other_files_info_for_current_user": "Error information",
     "uninstall_and_cleanup_for_current_user_success": "Uninstalls Microsoft PC Manager for all users and cleans up profiles and residual successes.",
     "uninstall_for_current_user_error_code": "Error code",
-    "uninstall_for_current_user_error_code_1": "Uninstallation failed, please try running as an Administrator. If the problem persists after running as an Administrator, please try using 'Uninstall Microsoft PC Manager via DISM for all users'.",
+    "uninstall_for_current_user_error_code_1": "Uninstallation failed, please try running as an administrator. If the problem persists after running as an administrator, please try using 'Uninstall Microsoft PC Manager via DISM for all users'.",
     "pc_manager_beta_not_found": "Microsoft PC Manager Public Beta is not installed.",
     "cleanup_pc_manager_beta_config_and_files_notice": "Clean up configuration files and residual files",
     "cleanup_pc_manager_beta_config_and_files": "Would you like to clean up configuration files and residuals for Microsoft PC Manager Public Beta?",
@@ -236,7 +242,7 @@
     "start_pc_manager_service_error": "Error occurred while starting the Microsoft PC Manager service",
     "pc_manager_service_restarted_successfully": "Microsoft PC Manager service has been successfully restarted.",
     "pc_manager_service_error_code": "Error code",
-    "pc_manager_service_error_code_5": "Operation failed. Please try rerunning as Administrator.",
+    "pc_manager_service_error_code_5": "Operation failed. Please try rerunning as administrator.",
     "pc_manager_service_error_code_1056": "An instance of the service is already running. Please try rerunning the operation.",
     "pc_manager_service_error_code_1060": "Microsoft PC Manager service is not installed.",
     "ask_if_version_above_3_14_0_0": "Check Microsoft PC Manager version",
@@ -286,12 +292,12 @@
 
     "@mainWindow.py": "mainWindow.py",
     "refresh": "Refresh",
-    "notice_select_option": "Please select \n(Functions with * do not need to be run as Administrator)",
+    "notice_select_option": "Please select \n(Functions with * do not need to be run as administrator)",
     "select_option": "Please Select",
     "main_execute_button": "Execute",
     "main_cancel_button": "Cancel",
-    "run_as_administrator": "Run as Administrator",
-    "run_as_administrator_error": "Failed to run as Administrator.",
+    "run_as_administrator": "Run as administrator",
+    "run_as_administrator_error": "Failed to run as administrator.",
     "main_project": "Main Project",
     "install_project": "Install Project",
     "uninstall_project": "Uninstall Project",

diff --git a/build.bat b/build.bat
@@ -10,7 +10,7 @@ if "%arch%"=="AMD64" (
     pyinstaller.exe ^
         --onefile ^
         --windowed ^
-        --name "MSPCManagerHelper_Beta_v0.2.0.7_x64" ^
+        --name "MSPCManagerHelper_Beta_v0.2.0.8_x64" ^
         --add-data "locales;locales" ^
         --add-data "assets\\MSPCManagerHelper-256.ico;assets" ^
         --add-binary "tools\\procdump\\procdump64.exe;tools/procdump" ^
@@ -23,7 +23,7 @@ if "%arch%"=="AMD64" (
     pyinstaller.exe ^
         --onefile ^
         --windowed ^
-        --name "MSPCManagerHelper_Beta_v0.2.0.7_ARM64" ^
+        --name "MSPCManagerHelper_Beta_v0.2.0.8_ARM64" ^
         --add-data "locales;locales" ^
         --add-data "assets\\MSPCManagerHelper-256.ico;assets" ^
         --add-binary "tools\\procdump\\procdump64a.exe;tools/procdump" ^

diff --git a/build_.venv.bat b/build_.venv.bat
@@ -11,7 +11,7 @@ if "%arch%"=="AMD64" (
     "%~dp0\.venv\Scripts\pyinstaller.exe" ^
         --onefile ^
         --windowed ^
-        --name "MSPCManagerHelper_Beta_v0.2.0.7_x64" ^
+        --name "MSPCManagerHelper_Beta_v0.2.0.8_x64" ^
         --add-data "locales;locales" ^
         --add-data "assets\\MSPCManagerHelper-256.ico;assets" ^
         --add-binary "tools\\procdump\\procdump64.exe;tools/procdump" ^
@@ -24,7 +24,7 @@ if "%arch%"=="AMD64" (
     "%~dp0\.venv\Scripts\pyinstaller.exe" ^
         --onefile ^
         --windowed ^
-        --name "MSPCManagerHelper_Beta_v0.2.0.7_ARM64" ^
+        --name "MSPCManagerHelper_Beta_v0.2.0.8_ARM64" ^
         --add-data "locales;locales" ^
         --add-data "assets\\MSPCManagerHelper-256.ico;assets" ^
         --add-binary "tools\\procdump\\procdump64a.exe;tools/procdump" ^

diff --git a/installationFeature.py b/installationFeature.py
@@ -406,7 +406,7 @@ def install_from_appxmanifest(self):
                         indent = line[:len(line) - len(line.lstrip())]
                         file.write(f"{indent}<!-- {line.strip()} -->\n")
                         file.write(
-                            f"{indent}<TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"10.0.17763.0\" MaxVersionTested=\"10.0.22621.0\"/>\n")
+                            f"{indent}<TargetDeviceFamily Name=\"Windows.Universal\" MinVersion=\"0.0.0.0\" MaxVersionTested=\"0.0.0.0\"/>\n")
                     else:
                         file.write(line)