timamsk/vscodium
1
0
Fork 0
mirror of https://github.com/VSCodium/vscodium.git synced 2026-04-29 01:07:49 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix: disable wip appx (#2807)

Browse Source
This commit is contained in:
Baptiste Augrain
2026-04-27 11:52:11 +02:00
committed by GitHub
parent 8b760ef6a7
commit 3ab1aeedbf
5 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/windows/package.sh
+1 -1
View File
@@ -31,7 +31,7 @@ find .build/extensions -type f -name '*.node' -print -delete
npm run copy-policy-dto --prefix build npm run copy-policy-dto --prefix build
node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc win32 node build/lib/policies/policyGenerator.ts build/lib/policies/policyData.jsonc win32
node build/win32/explorer-dll-fetcher.ts .build/win32/appx # node build/win32/explorer-dll-fetcher.ts .build/win32/appx
npm run gulp "vscode-win32-${VSCODE_ARCH}-min-packing" npm run gulp "vscode-win32-${VSCODE_ARCH}-min-packing"
build/windows/prepare_assets.sh
+1 -1
View File
@@ -4,7 +4,7 @@ cd vscode || { echo "'vscode' dir not found"; exit 1; }
npm run gulp "vscode-win32-${VSCODE_ARCH}-inno-updater" npm run gulp "vscode-win32-${VSCODE_ARCH}-inno-updater"
. ../build/windows/appx/build.sh # . ../build/windows/appx/build.sh
if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
7z.exe a -tzip "../assets/${APP_NAME}-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" -x!CodeSignSummary*.md -x!tools "../VSCode-win32-${VSCODE_ARCH}/*" -r 7z.exe a -tzip "../assets/${APP_NAME}-win32-${VSCODE_ARCH}-${RELEASE_VERSION}.zip" -x!CodeSignSummary*.md -x!tools "../VSCode-win32-${VSCODE_ARCH}/*" -r
patches/windows/00-build-disable-appx.patch.no
-37
View File
@@ -1,37 +0,0 @@
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index 080d97f3..6b1b4032 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -620,19 +620,2 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
.pipe(rename(f => f.dirname = `policies/${f.dirname}`)));
-
- if (quality === 'stable' || quality === 'insider') {
- result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
- const rawVersion = version.replace(/-\w+$/, '').split('.');
- const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2]}`;
- result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
- .pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
- .pipe(replace('@@AppxPackageVersion@@', appxVersion))
- .pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
- .pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
- .pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
- .pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
- .pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
- .pipe(replace('@@FileExplorerContextMenuCLSID@@', (product as { win32ContextMenu?: Record<string, { clsid: string }> }).win32ContextMenu![arch].clsid))
- .pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
- .pipe(rename(f => f.dirname = `appx/manifest`)));
- }
} else if (platform === 'linux') {
diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
index 7a711276..e6a838e2 100644
--- a/build/gulpfile.vscode.win32.ts
+++ b/build/gulpfile.vscode.win32.ts
@@ -133,8 +133,2 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
- if (quality === 'stable' || quality === 'insider') {
- definitions['AppxPackage'] = `${quality === 'stable' ? 'code' : 'code_insider'}_${arch}.appx`;
- definitions['AppxPackageDll'] = `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`;
- definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
- }
-
fs.writeFileSync(productJsonPath, JSON.stringify(productJson, undefined, '\t'));
patches/windows/00-build-contextmenu-appx.patch → patches/windows/70-build-contextmenu-appx.patch
View File
patches/windows/71-build-disable-appx.patch
+56
View File
@@ -0,0 +1,56 @@
diff --git a/build/gulpfile.vscode.ts b/build/gulpfile.vscode.ts
index b01d710a..303d2f68 100644
--- a/build/gulpfile.vscode.ts
+++ b/build/gulpfile.vscode.ts
@@ -621,18 +621,18 @@ function packageTask(platform: string, arch: string, sourceFolderName: string, d
- if (quality === 'stable' || quality === 'insider') {
- result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
- const rawVersion = version.replace(/-\w+$/, '').split('.');
- const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2].slice(1)}`;
- result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
- .pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
- .pipe(replace('@@AppxPackageVersion@@', appxVersion))
- .pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
- .pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
- .pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
- .pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
- .pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
- .pipe(replace('@@FileExplorerContextMenuCLSID@@', (product as { win32ContextMenu?: Record<string, { clsid: string }> }).win32ContextMenu![arch].clsid))
- .pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
- .pipe(rename(f => f.dirname = `appx/manifest`)));
- }
+ // if (quality === 'stable' || quality === 'insider') {
+ // result = es.merge(result, gulp.src('.build/win32/appx/**', { base: '.build/win32' }));
+ // const rawVersion = version.replace(/-\w+$/, '').split('.');
+ // const appxVersion = `${rawVersion[0]}.0.${rawVersion[1]}.${rawVersion[2].slice(1)}`;
+ // result = es.merge(result, gulp.src('resources/win32/appx/AppxManifest.xml', { base: '.' })
+ // .pipe(replace('@@AppxPackageName@@', product.win32AppUserModelId))
+ // .pipe(replace('@@AppxPackageVersion@@', appxVersion))
+ // .pipe(replace('@@AppxPackageDisplayName@@', product.nameLong))
+ // .pipe(replace('@@AppxPackageDescription@@', product.win32NameVersion))
+ // .pipe(replace('@@ApplicationIdShort@@', product.win32RegValueName))
+ // .pipe(replace('@@ApplicationExe@@', product.nameShort + '.exe'))
+ // .pipe(replace('@@FileExplorerContextMenuID@@', quality === 'stable' ? 'OpenWithCode' : 'OpenWithCodeInsiders'))
+ // .pipe(replace('@@FileExplorerContextMenuCLSID@@', (product as { win32ContextMenu?: Record<string, { clsid: string }> }).win32ContextMenu![arch].clsid))
+ // .pipe(replace('@@FileExplorerContextMenuDLL@@', `${quality === 'stable' ? 'code' : 'code_insider'}_explorer_command_${arch}.dll`))
+ // .pipe(rename(f => f.dirname = `appx/manifest`)));
+ // }
} else if (platform === 'linux') {
diff --git a/build/gulpfile.vscode.win32.ts b/build/gulpfile.vscode.win32.ts
index 2675bd85..51723721 100644
--- a/build/gulpfile.vscode.win32.ts
+++ b/build/gulpfile.vscode.win32.ts
@@ -133,7 +133,7 @@ function buildWin32Setup(arch: string, target: string): task.CallbackTask {
- if (quality === 'stable' || quality === 'insider') {
- definitions['AppxPackage'] = `${product.applicationName.replaceAll('-', '_')}_${arch}.appx`;
- definitions['AppxPackageDll'] = `${product.applicationName.replaceAll('-', '_')}_explorer_command_${arch}.dll`;
- definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
- }
+ // if (quality === 'stable' || quality === 'insider') {
+ // definitions['AppxPackage'] = `${product.applicationName.replaceAll('-', '_')}_${arch}.appx`;
+ // definitions['AppxPackageDll'] = `${product.applicationName.replaceAll('-', '_')}_explorer_command_${arch}.dll`;
+ // definitions['AppxPackageName'] = `${product.win32AppUserModelId}`;
+ // }