Skip to content

Commit fff3157

Browse files
Goo-aw233Goo-aw233
authored
merge: Beta v0.2.1.4 (Goo-aw233#63)
* chore: Update build scripts * chore: Update requirements.txt * fix: Fix install_for_current_user build command did not include a space
1 parent 7f348c3 commit fff3157

7 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
altgraph==0.17.5
22
certifi==2026.2.25
3-
charset-normalizer==3.4.6
4-
click==8.3.1
3+
charset-normalizer==3.4.7
4+
click==8.3.2
55
colorama==0.4.6
66
idna==3.11
77
iso3166==2.1.1

‎scripts/build/build.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if "%arch%"=="AMD64" (
5050
pyinstaller.exe ^
5151
--onefile ^
5252
--windowed ^
53-
--name "MSPCManagerHelper_Beta_v0.2.1.3_x64" ^
53+
--name "MSPCManagerHelper_Beta_v0.2.1.4_x64" ^
5454
--add-data "%~dp0..\\..\\src\\locales;locales" ^
5555
--add-data "%~dp0..\\..\\src\\assets\\MSPCManagerHelper.ico;assets" ^
5656
--add-binary "%~dp0..\\..\\src\\tools\\ProcDump\\procdump64.exe;tools\\ProcDump" ^
@@ -65,7 +65,7 @@ if "%arch%"=="AMD64" (
6565
pyinstaller.exe ^
6666
--onefile ^
6767
--windowed ^
68-
--name "MSPCManagerHelper_Beta_v0.2.1.3_ARM64" ^
68+
--name "MSPCManagerHelper_Beta_v0.2.1.4_ARM64" ^
6969
--add-data "%~dp0..\\..\\src\\locales;locales" ^
7070
--add-data "%~dp0..\\..\\src\\assets\\MSPCManagerHelper.ico;assets" ^
7171
--add-binary "%~dp0..\\..\\src\\tools\\ProcDump\\procdump64a.exe;tools\\ProcDump" ^

‎scripts/build/build_.venv.cmd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if "%arch%"=="AMD64" (
5050
"%~dp0..\..\.venv\Scripts\pyinstaller.exe" ^
5151
--onefile ^
5252
--windowed ^
53-
--name "MSPCManagerHelper_Beta_v0.2.1.3_x64" ^
53+
--name "MSPCManagerHelper_Beta_v0.2.1.4_x64" ^
5454
--add-data "%~dp0..\\..\\src\\locales;locales" ^
5555
--add-data "%~dp0..\\..\\src\\assets\\MSPCManagerHelper.ico;assets" ^
5656
--add-binary "%~dp0..\\..\\src\\tools\\ProcDump\\procdump64.exe;tools\\ProcDump" ^
@@ -65,7 +65,7 @@ if "%arch%"=="AMD64" (
6565
"%~dp0..\..\.venv\Scripts\pyinstaller.exe" ^
6666
--onefile ^
6767
--windowed ^
68-
--name "MSPCManagerHelper_Beta_v0.2.1.3_ARM64" ^
68+
--name "MSPCManagerHelper_Beta_v0.2.1.4_ARM64" ^
6969
--add-data "%~dp0..\\..\\src\\locales;locales" ^
7070
--add-data "%~dp0..\\..\\src\\assets\\MSPCManagerHelper.ico;assets" ^
7171
--add-binary "%~dp0..\\..\\src\\tools\\ProcDump\\procdump64a.exe;tools\\ProcDump" ^

‎scripts/build/version_ARM64.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ VSVersionInfo(
2323
[
2424
StringStruct(u'CompanyName', u'GuCATs'),
2525
StringStruct('FileDescription', 'MSPCManagerHelper'),
26-
StringStruct('FileVersion', 'Beta v0.2.1.3 ARM64'),
27-
StringStruct('InternalName', 'MSPCManagerHelper_Beta_v0.2.1.3_ARM64'),
26+
StringStruct('FileVersion', 'Beta v0.2.1.4 ARM64'),
27+
StringStruct('InternalName', 'MSPCManagerHelper_Beta_v0.2.1.4_ARM64'),
2828
StringStruct(u'LegalCopyright', u'© 2024 - 2026 GuCATs All rights reserved.'),
29-
StringStruct('OriginalFilename', 'MSPCManagerHelper_Beta_v0.2.1.3_ARM64.exe'),
29+
StringStruct('OriginalFilename', 'MSPCManagerHelper_Beta_v0.2.1.4_ARM64.exe'),
3030
StringStruct('ProductName', 'MSPCManagerHelper'),
31-
StringStruct('ProductVersion', 'Beta v0.2.1.3 ARM64')
31+
StringStruct('ProductVersion', 'Beta v0.2.1.4 ARM64')
3232
]
3333
)
3434
]

‎scripts/build/version_x64.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ VSVersionInfo(
2323
[
2424
StringStruct(u'CompanyName', u'GuCATs'),
2525
StringStruct('FileDescription', 'MSPCManagerHelper'),
26-
StringStruct('FileVersion', 'Beta v0.2.1.3 x64'),
27-
StringStruct('InternalName', 'MSPCManagerHelper_Beta_v0.2.1.3_x64'),
26+
StringStruct('FileVersion', 'Beta v0.2.1.4 x64'),
27+
StringStruct('InternalName', 'MSPCManagerHelper_Beta_v0.2.1.4_x64'),
2828
StringStruct(u'LegalCopyright', u'© 2024 - 2026 GuCATs All rights reserved.'),
29-
StringStruct('OriginalFilename', 'MSPCManagerHelper_Beta_v0.2.1.3_x64.exe'),
29+
StringStruct('OriginalFilename', 'MSPCManagerHelper_Beta_v0.2.1.4_x64.exe'),
3030
StringStruct('ProductName', 'MSPCManagerHelper'),
31-
StringStruct('ProductVersion', 'Beta v0.2.1.3 x64')
31+
StringStruct('ProductVersion', 'Beta v0.2.1.4 x64')
3232
]
3333
)
3434
]

‎src/installation_feature.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ def install_for_all_users(self):
122122
# 打开文件选择对话框选择文件
123123
all_users_application_package_file_path = filedialog.askopenfilename(
124124
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
125-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
125+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
126126
("*", "*")])
127127

128128
if not all_users_application_package_file_path:
@@ -191,7 +191,7 @@ def install_for_current_user(self):
191191
# 打开文件选择对话框选择文件
192192
current_user_application_package_file_path = filedialog.askopenfilename(
193193
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
194-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
194+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
195195
("*", "*")])
196196

197197
if not current_user_application_package_file_path:
@@ -207,7 +207,7 @@ def install_for_current_user(self):
207207
if response_for_current_user_dependency: # 选择依赖包
208208
current_user_dependency_package_paths = filedialog.askopenfilenames(
209209
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
210-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
210+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
211211
("*", "*")])
212212
if not current_user_dependency_package_paths:
213213
return self.translator.translate("no_files_selected")
@@ -216,7 +216,7 @@ def install_for_current_user(self):
216216

217217
try:
218218
# 构建 Add-AppxPackage 命令
219-
command = ['powershell.exe', '-NoProfile', '-Command'
219+
command = ['powershell.exe', '-NoProfile', '-Command',
220220
f'Add-AppxPackage -Path "{current_user_application_package_file_path}"']
221221
if current_user_dependency_package_paths: # 使用依赖包，若不使用则跳过
222222
dependency_paths = ",".join([f'"{additional_dependency_paths}"' for additional_dependency_paths in current_user_dependency_package_paths])
@@ -275,7 +275,7 @@ def update_from_application_package(self):
275275
# 打开文件选择对话框选择文件
276276
update_application_package_file_path = filedialog.askopenfilename(
277277
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
278-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
278+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
279279
("*", "*")])
280280

281281
if not update_application_package_file_path:
@@ -291,7 +291,7 @@ def update_from_application_package(self):
291291
if response_for_update_dependency: # 选择依赖包
292292
update_dependency_package_paths = filedialog.askopenfilenames(
293293
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
294-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
294+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
295295
("*", "*")])
296296
if not update_dependency_package_paths:
297297
return self.translator.translate("no_files_selected")
@@ -332,7 +332,7 @@ def install_from_appxmanifest(self):
332332
# 打开文件选择对话框选择文件
333333
pc_manager_package_file_path_str = filedialog.askopenfilename(
334334
filetypes=[("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
335-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
335+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
336336
("*", "*")])
337337

338338
if not pc_manager_package_file_path_str:
@@ -442,7 +442,7 @@ def install_from_appxmanifest(self):
442442
if response_for_dependency: # 选择依赖包
443443
dependency_package_paths = filedialog.askopenfilenames(filetypes=[
444444
("MSIX/MSIXBundle", "*.msix;*.msixbundle"),
445-
("Appx/AppxBundle", "*.appx;*.appxbundle"),
445+
("Appx/AppXBundle", "*.appx;*.appxbundle"),
446446
("*", "*")])
447447
if not dependency_package_paths: # 如果没有选择文件
448448
# 清理 MSPCManagerHelper 临时目录下的文件

‎src/main_window.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self):
2626
super().__init__()
2727
main_icon_path = Path(__file__).parent / 'assets' / 'MSPCManagerHelper.ico'
2828
self.iconbitmap(str(main_icon_path))
29-
self.mspcmanagerhelper_version = "Beta v0.2.1.3"
29+
self.mspcmanagerhelper_version = "Beta v0.2.1.4"
3030
title = f"MSPCManagerHelper {self.mspcmanagerhelper_version}"
3131
if AdvancedStartup.is_administrator():
3232
title += " (Administrator)"

0 commit comments

Comments
 (0)