app-builder-lib 27.0.0-alpha.4 → 27.0.0-alpha.6

package/dist/targets/win/MsixTarget.js

@@ -0,0 +1,214 @@
+import { Arch, asArray, copyOrLinkFile, ensureNotBusy, exec, InvalidConfigurationError, log } from "builder-util";
+import { getPath7za } from "../../toolsets/7zip.js";
+import _fsExtra from "fs-extra";
+const { mkdirs, readFile, remove, writeFile } = _fsExtra;
+import * as path from "path";
+import { isLegacyWinCodeSign, isOldWin6 } from "../../toolsets/winCodeSign.js";
+import { Target } from "../../core.js";
+import { getTemplatePath } from "../../util/pathManager.js";
+import { buildAppxPackage, buildCapabilitiesXml, buildExtensionsXml, buildWindowsServicesXml, defaultTileTag, lockScreenTag, resolvePackageApplicationId, resolvePackageIdentityName, resourceLanguageTag, splashScreenTag, substituteManifestMacros, } from "./winAppUtil.js";
+export default class MsixTarget extends Target {
+    constructor(packager, outDir) {
+        super("msix");
+        this.packager = packager;
+        this.outDir = outDir;
+        this.options = this.packager.getOptionsForTarget("msix");
+        this.isAsyncSupported = false;
+        this.builtPackages = new Map();
+        this.vendorPathKit = null;
+        this.vm = null;
+        if (process.platform !== "darwin" && (process.platform !== "win32" || isOldWin6())) {
+            throw new Error("MSIX is supported on Windows 10 or Windows Server 2012 R2 (version number 6.3+) and on macOS via Parallels Desktop");
+        }
+    }
+    build(appOutDir, arch) {
+        return buildAppxPackage(this, this.packager, this.options, appOutDir, arch, {
+            kind: "msix",
+            presentableName: "MSIX",
+            preflight: () => {
+                // unset / null / "latest" and any modern version pin resolve to a modern Windows Kits bundle (with
+                // the MSIX SDK); only the explicit legacy "0.0.0" (winCodeSign-2.6.0) pin lacks it. A custom { url }
+                // toolset is the user's responsibility.
+                if (isLegacyWinCodeSign(this.packager.config.toolsets?.winCodeSign)) {
+                    throw new InvalidConfigurationError('MSIX packaging requires a modern Windows Kits toolset. The legacy "0.0.0" (winCodeSign-2.6.0) bundle does not include the Windows SDK version required for MSIX. ' +
+                        'Use the default toolset or pin "toolsets.winCodeSign" to a modern version (e.g. "1.0.0", "1.1.0", or "1.3.0").');
+                }
+            },
+            writeManifest: (manifestFile, a, publisher, userAssets) => this.writeManifest(manifestFile, a, publisher, userAssets),
+            // Record per-arch context so finishBuild can assemble the .msixbundle / .msixupload.
+            onBuilt: ({ arch: builtArch, artifactPath, vendorPathKit, vm }) => {
+                this.builtPackages.set(builtArch, artifactPath);
+                this.vendorPathKit = vendorPathKit;
+                this.vm = vm;
+            },
+        });
+    }
+    async finishBuild() {
+        await super.finishBuild();
+        const packagePaths = Array.from(this.builtPackages.values());
+        if (packagePaths.length === 0) {
+            return;
+        }
+        let bundlePath;
+        if (this.options.createMsixbundle !== false && packagePaths.length > 1) {
+            bundlePath = await this.createMsixBundle(packagePaths);
+        }
+        if (this.options.createMsixupload === true) {
+            await this.createMsixUpload(bundlePath ?? packagePaths[0]);
+        }
+    }
+    async createMsixBundle(packagePaths) {
+        const packager = this.packager;
+        const vm = this.vm;
+        const kitPath = this.vendorPathKit;
+        const bundleName = packager.expandArtifactBeautyNamePattern(this.options, "msixbundle", Arch.x64);
+        const bundlePath = path.join(this.outDir, bundleName);
+        await packager.emitArtifactBuildStarted({
+            targetPresentableName: "MSIX Bundle",
+            file: bundlePath,
+            arch: null,
+        });
+        const stagingDir = path.join(this.outDir, ".msixbundle-staging");
+        await mkdirs(stagingDir);
+        try {
+            await Promise.all(packagePaths.map(p => copyOrLinkFile(p, path.join(stagingDir, path.basename(p)))));
+            const makeAppxExe = path.join(kitPath, "makeappx.exe");
+            await ensureNotBusy(makeAppxExe);
+            await vm.exec(vm.toVmFile(makeAppxExe), ["bundle", "/o", "/d", vm.toVmFile(stagingDir), "/p", vm.toVmFile(bundlePath)]);
+        }
+        finally {
+            await remove(stagingDir);
+        }
+        await packager.signIf(bundlePath);
+        await packager.emitArtifactBuildCompleted({
+            file: bundlePath,
+            packager,
+            arch: null,
+            safeArtifactName: packager.computeSafeArtifactName(bundleName, "msixbundle"),
+            target: this,
+            isWriteUpdateInfo: false,
+        });
+        return bundlePath;
+    }
+    async createMsixUpload(sourcePath) {
+        const packager = this.packager;
+        const uploadName = packager.expandArtifactBeautyNamePattern(this.options, "msixupload", Arch.x64);
+        const uploadPath = path.join(this.outDir, uploadName);
+        await packager.emitArtifactBuildStarted({
+            targetPresentableName: "MSIX Upload",
+            file: uploadPath,
+            arch: null,
+        });
+        const sevenZa = await getPath7za();
+        await exec(sevenZa, ["a", "-tzip", uploadPath, sourcePath]);
+        await packager.emitArtifactBuildCompleted({
+            file: uploadPath,
+            packager,
+            arch: null,
+            safeArtifactName: packager.computeSafeArtifactName(uploadName, "msixupload"),
+            target: this,
+            isWriteUpdateInfo: false,
+        });
+    }
+    async writeManifest(outFile, arch, publisher, userAssets) {
+        const appInfo = this.packager.appInfo;
+        const options = this.options;
+        const executable = `app\\${appInfo.productFilename}.exe`;
+        const displayName = options.displayName || appInfo.productName;
+        const capabilities = this.getCapabilities();
+        const extensions = await this.getExtensions(executable, displayName);
+        const defaultMinVersion = "10.0.17763.0";
+        const customManifestPath = await this.packager.getResource(options.customManifestPath);
+        if (customManifestPath) {
+            log.info({ manifestPath: log.filePath(customManifestPath) }, "custom msix manifest found");
+        }
+        const manifestFileContent = await readFile(customManifestPath || path.join(getTemplatePath("msix"), "appxmanifest.xml"), "utf8");
+        const manifest = substituteManifestMacros(manifestFileContent, (p1) => {
+            switch (p1) {
+                case "publisher":
+                    return publisher;
+                case "publisherDisplayName": {
+                    const name = options.publisherDisplayName || appInfo.companyName;
+                    if (name == null) {
+                        throw new InvalidConfigurationError(`Please specify "author" in the application package.json — it is required because "msix.publisherDisplayName" is not set.`);
+                    }
+                    return name;
+                }
+                case "version":
+                    return appInfo.getVersionInWeirdWindowsForm(options.setBuildNumber === true);
+                case "applicationId":
+                    return resolvePackageApplicationId(options.applicationId, options.identityName, appInfo.name, "MSIX");
+                case "identityName":
+                    return resolvePackageIdentityName(options.identityName, appInfo.name, "MSIX");
+                case "executable":
+                    return executable;
+                case "displayName":
+                    return displayName;
+                case "description":
+                    return appInfo.description || appInfo.productName;
+                case "backgroundColor":
+                    return options.backgroundColor || "#464646";
+                case "logo":
+                    return "assets\\StoreLogo.png";
+                case "square150x150Logo":
+                    return "assets\\Square150x150Logo.png";
+                case "square44x44Logo":
+                    return "assets\\Square44x44Logo.png";
+                case "lockScreen":
+                    return lockScreenTag(userAssets);
+                case "defaultTile":
+                    return defaultTileTag(userAssets, options.showNameOnTiles || false);
+                case "splashScreen":
+                    return splashScreenTag(userAssets);
+                case "arch":
+                    return arch === Arch.ia32 ? "x86" : arch === Arch.arm64 ? "arm64" : "x64";
+                case "resourceLanguages":
+                    return resourceLanguageTag(asArray(options.languages));
+                case "capabilities":
+                    return capabilities;
+                case "extensions":
+                    return extensions;
+                case "minVersion":
+                    return options.minVersion || defaultMinVersion;
+                case "maxVersionTested":
+                    return options.maxVersionTested || options.minVersion || defaultMinVersion;
+                case "packageIntegrity":
+                    // uap10:PackageIntegrity belongs inside <Properties>, not <Capabilities>. It takes no
+                    // attributes; a child <uap10:Content Enforcement="on" /> is required to actually enable
+                    // runtime integrity checks (a bare/childless element is a no-op).
+                    // https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-uap10-packageintegrity
+                    return options.enforcePackageIntegrity === true ? '<uap10:PackageIntegrity><uap10:Content Enforcement="on" /></uap10:PackageIntegrity>' : "";
+                default:
+                    throw new Error(`Macro ${p1} is not defined`);
+            }
+        });
+        await writeFile(outFile, manifest);
+    }
+    getCapabilities() {
+        const inner = buildCapabilitiesXml(this.options.capabilities);
+        return `<Capabilities>\n${inner}\n</Capabilities>`;
+    }
+    async getExtensions(executable, displayName) {
+        const packager = this.packager;
+        const options = this.options;
+        const baseExtensions = await buildExtensionsXml({
+            protocols: asArray(packager.config.protocols).concat(asArray(packager.platformOptions.protocols)),
+            fileAssociations: asArray(packager.config.fileAssociations).concat(asArray(packager.platformOptions.fileAssociations)),
+            addAutoLaunchExtension: options.addAutoLaunchExtension,
+            customExtensionsPath: options.customExtensionsPath,
+            appDir: packager.appDir,
+            executable,
+            displayName,
+            dependencyNames: packager.metadata.dependencies,
+        });
+        const servicesXml = buildWindowsServicesXml(options.windowsServices, executable);
+        if (!servicesXml) {
+            return baseExtensions;
+        }
+        if (baseExtensions === "") {
+            return `<Extensions>${servicesXml}</Extensions>`;
+        }
+        return baseExtensions.replace("</Extensions>", `${servicesXml}</Extensions>`);
+    }
+}
+//# sourceMappingURL=MsixTarget.js.map

package/dist/targets/win/MsixTarget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MsixTarget.js","sourceRoot":"","sources":["../../../src/targets/win/MsixTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,IAAI,EAAE,yBAAyB,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AACjH,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,QAAQ,MAAM,UAAU,CAAA;AAC/B,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAA;AACxD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAA;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAG3D,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,mBAAmB,EACnB,eAAe,EACf,wBAAwB,GACzB,MAAM,iBAAiB,CAAA;AAExB,MAAM,CAAC,OAAO,OAAO,UAAW,SAAQ,MAAM;IAS5C,YACmB,QAAqB,EAC7B,MAAc;QAEvB,KAAK,CAAC,MAAM,CAAC,CAAA;QAHI,aAAQ,GAAR,QAAQ,CAAa;QAC7B,WAAM,GAAN,MAAM,CAAQ;QAVhB,YAAO,GAAgB,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAc,MAAM,CAAC,CAAA;QAEtF,qBAAgB,GAAG,KAAK,CAAA;QAEP,kBAAa,GAAG,IAAI,GAAG,EAAgB,CAAA;QAChD,kBAAa,GAAkB,IAAI,CAAA;QACnC,OAAE,GAAqB,IAAI,CAAA;QAQjC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,SAAS,EAAE,CAAC,EAAE,CAAC;YACnF,MAAM,IAAI,KAAK,CAAC,oHAAoH,CAAC,CAAA;QACvI,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAiB,EAAE,IAAU;QACjC,OAAO,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE;YAC1E,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,MAAM;YACvB,SAAS,EAAE,GAAG,EAAE;gBACd,mGAAmG;gBACnG,qGAAqG;gBACrG,wCAAwC;gBACxC,IAAI,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;oBACpE,MAAM,IAAI,yBAAyB,CACjC,mKAAmK;wBACjK,gHAAgH,CACnH,CAAA;gBACH,CAAC;YACH,CAAC;YACD,aAAa,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC;YACrH,qFAAqF;YACrF,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE;gBAChE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAA;gBAC/C,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;gBAClC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;YACd,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,KAAK,CAAC,WAAW,EAAE,CAAA;QAEzB,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;QAC5D,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAM;QACR,CAAC;QAED,IAAI,UAA8B,CAAA;QAClC,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,KAAK,KAAK,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvE,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAA;QACxD,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC3C,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,YAAmC;QAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,MAAM,EAAE,GAAG,IAAI,CAAC,EAAG,CAAA;QACnB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAc,CAAA;QAEnC,MAAM,UAAU,GAAG,QAAQ,CAAC,+BAA+B,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QACjG,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAErD,MAAM,QAAQ,CAAC,wBAAwB,CAAC;YACtC,qBAAqB,EAAE,aAAa;YACpC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAA;QAChE,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;QACxB,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YACpG,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;YACtD,MAAM,aAAa,CAAC,WAAW,CAAC,CAAA;YAChC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QACzH,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;QAC1B,CAAC;QAED,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEjC,MAAM,QAAQ,CAAC,0BAA0B,CAAC;YACxC,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,IAAI,EAAE,IAAI;YACV,gBAAgB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC;YAC5E,MAAM,EAAE,IAAI;YACZ,iBAAiB,EAAE,KAAK;SACzB,CAAC,CAAA;QAEF,OAAO,UAAU,CAAA;IACnB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QAC/C,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,MAAM,UAAU,GAAG,QAAQ,CAAC,+BAA+B,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;QACjG,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;QAErD,MAAM,QAAQ,CAAC,wBAAwB,CAAC;YACtC,qBAAqB,EAAE,aAAa;YACpC,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QAEF,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;QAClC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAA;QAE3D,MAAM,QAAQ,CAAC,0BAA0B,CAAC;YACxC,IAAI,EAAE,UAAU;YAChB,QAAQ;YACR,IAAI,EAAE,IAAI;YACV,gBAAgB,EAAE,QAAQ,CAAC,uBAAuB,CAAC,UAAU,EAAE,YAAY,CAAC;YAC5E,MAAM,EAAE,IAAI;YACZ,iBAAiB,EAAE,KAAK;SACzB,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,IAAU,EAAE,SAAiB,EAAE,UAAyB;QACnG,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAA;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAC5B,MAAM,UAAU,GAAG,QAAQ,OAAO,CAAC,eAAe,MAAM,CAAA;QACxD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAA;QAC9D,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAA;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,WAAW,CAAC,CAAA;QACpE,MAAM,iBAAiB,GAAG,cAAc,CAAA;QAExC,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAA;QACtF,IAAI,kBAAkB,EAAE,CAAC;YACvB,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,GAAG,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,EAAE,4BAA4B,CAAC,CAAA;QAC5F,CAAC;QACD,MAAM,mBAAmB,GAAG,MAAM,QAAQ,CAAC,kBAAkB,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAA;QAChI,MAAM,QAAQ,GAAG,wBAAwB,CAAC,mBAAmB,EAAE,CAAC,EAAE,EAAU,EAAE;YAC5E,QAAQ,EAAE,EAAE,CAAC;gBACX,KAAK,WAAW;oBACd,OAAO,SAAS,CAAA;gBAElB,KAAK,sBAAsB,CAAC,CAAC,CAAC;oBAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,oBAAoB,IAAI,OAAO,CAAC,WAAW,CAAA;oBAChE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;wBACjB,MAAM,IAAI,yBAAyB,CAAC,0HAA0H,CAAC,CAAA;oBACjK,CAAC;oBACD,OAAO,IAAI,CAAA;gBACb,CAAC;gBAED,KAAK,SAAS;oBACZ,OAAO,OAAO,CAAC,4BAA4B,CAAC,OAAO,CAAC,cAAc,KAAK,IAAI,CAAC,CAAA;gBAE9E,KAAK,eAAe;oBAClB,OAAO,2BAA2B,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAEvG,KAAK,cAAc;oBACjB,OAAO,0BAA0B,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAE/E,KAAK,YAAY;oBACf,OAAO,UAAU,CAAA;gBAEnB,KAAK,aAAa;oBAChB,OAAO,WAAW,CAAA;gBAEpB,KAAK,aAAa;oBAChB,OAAO,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAA;gBAEnD,KAAK,iBAAiB;oBACpB,OAAO,OAAO,CAAC,eAAe,IAAI,SAAS,CAAA;gBAE7C,KAAK,MAAM;oBACT,OAAO,uBAAuB,CAAA;gBAEhC,KAAK,mBAAmB;oBACtB,OAAO,+BAA+B,CAAA;gBAExC,KAAK,iBAAiB;oBACpB,OAAO,6BAA6B,CAAA;gBAEtC,KAAK,YAAY;oBACf,OAAO,aAAa,CAAC,UAAU,CAAC,CAAA;gBAElC,KAAK,aAAa;oBAChB,OAAO,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,eAAe,IAAI,KAAK,CAAC,CAAA;gBAErE,KAAK,cAAc;oBACjB,OAAO,eAAe,CAAC,UAAU,CAAC,CAAA;gBAEpC,KAAK,MAAM;oBACT,OAAO,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;gBAE3E,KAAK,mBAAmB;oBACtB,OAAO,mBAAmB,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;gBAExD,KAAK,cAAc;oBACjB,OAAO,YAAY,CAAA;gBAErB,KAAK,YAAY;oBACf,OAAO,UAAU,CAAA;gBAEnB,KAAK,YAAY;oBACf,OAAO,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAA;gBAEhD,KAAK,kBAAkB;oBACrB,OAAO,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,UAAU,IAAI,iBAAiB,CAAA;gBAE5E,KAAK,kBAAkB;oBACrB,sFAAsF;oBACtF,wFAAwF;oBACxF,kEAAkE;oBAClE,uGAAuG;oBACvG,OAAO,OAAO,CAAC,uBAAuB,KAAK,IAAI,CAAC,CAAC,CAAC,qFAAqF,CAAC,CAAC,CAAC,EAAE,CAAA;gBAE9I;oBACE,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;YACjD,CAAC;QACH,CAAC,CAAC,CAAA;QACF,MAAM,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IACpC,CAAC;IAEO,eAAe;QACrB,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;QAC7D,OAAO,mBAAmB,KAAK,mBAAmB,CAAA;IACpD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,WAAmB;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;QAE5B,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC;YAC9C,SAAS,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;YACjG,gBAAgB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YACtH,sBAAsB,EAAE,OAAO,CAAC,sBAAsB;YACtD,oBAAoB,EAAE,OAAO,CAAC,oBAAoB;YAClD,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,UAAU;YACV,WAAW;YACX,eAAe,EAAE,QAAQ,CAAC,QAAQ,CAAC,YAAY;SAChD,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,uBAAuB,CAAC,OAAO,CAAC,eAAe,EAAE,UAAU,CAAC,CAAA;QAEhF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,cAAc,CAAA;QACvB,CAAC;QAED,IAAI,cAAc,KAAK,EAAE,EAAE,CAAC;YAC1B,OAAO,eAAe,WAAW,eAAe,CAAA;QAClD,CAAC;QAED,OAAO,cAAc,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,WAAW,eAAe,CAAC,CAAA;IAC/E,CAAC;CACF","sourcesContent":["import { Arch, asArray, copyOrLinkFile, ensureNotBusy, exec, InvalidConfigurationError, log } from \"builder-util\"\nimport { getPath7za } from \"../../toolsets/7zip.js\"\nimport _fsExtra from \"fs-extra\"\nconst { mkdirs, readFile, remove, writeFile } = _fsExtra\nimport * as path from \"path\"\nimport { MsixOptions } from \"../../options/MsixOptions.js\"\nimport { isLegacyWinCodeSign, isOldWin6 } from \"../../toolsets/winCodeSign.js\"\nimport { Target } from \"../../core.js\"\nimport { getTemplatePath } from \"../../util/pathManager.js\"\nimport type { VmManager } from \"../../vm/vm.js\"\nimport { WinPackager } from \"../../winPackager.js\"\nimport {\n  buildAppxPackage,\n  buildCapabilitiesXml,\n  buildExtensionsXml,\n  buildWindowsServicesXml,\n  defaultTileTag,\n  lockScreenTag,\n  resolvePackageApplicationId,\n  resolvePackageIdentityName,\n  resourceLanguageTag,\n  splashScreenTag,\n  substituteManifestMacros,\n} from \"./winAppUtil.js\"\n\nexport default class MsixTarget extends Target {\n  readonly options: MsixOptions = this.packager.getOptionsForTarget<MsixOptions>(\"msix\")\n\n  isAsyncSupported = false\n\n  private readonly builtPackages = new Map<Arch, string>()\n  private vendorPathKit: string | null = null\n  private vm: VmManager | null = null\n\n  constructor(\n    private readonly packager: WinPackager,\n    readonly outDir: string\n  ) {\n    super(\"msix\")\n\n    if (process.platform !== \"darwin\" && (process.platform !== \"win32\" || isOldWin6())) {\n      throw new Error(\"MSIX is supported on Windows 10 or Windows Server 2012 R2 (version number 6.3+) and on macOS via Parallels Desktop\")\n    }\n  }\n\n  build(appOutDir: string, arch: Arch): Promise<any> {\n    return buildAppxPackage(this, this.packager, this.options, appOutDir, arch, {\n      kind: \"msix\",\n      presentableName: \"MSIX\",\n      preflight: () => {\n        // unset / null / \"latest\" and any modern version pin resolve to a modern Windows Kits bundle (with\n        // the MSIX SDK); only the explicit legacy \"0.0.0\" (winCodeSign-2.6.0) pin lacks it. A custom { url }\n        // toolset is the user's responsibility.\n        if (isLegacyWinCodeSign(this.packager.config.toolsets?.winCodeSign)) {\n          throw new InvalidConfigurationError(\n            'MSIX packaging requires a modern Windows Kits toolset. The legacy \"0.0.0\" (winCodeSign-2.6.0) bundle does not include the Windows SDK version required for MSIX. ' +\n              'Use the default toolset or pin \"toolsets.winCodeSign\" to a modern version (e.g. \"1.0.0\", \"1.1.0\", or \"1.3.0\").'\n          )\n        }\n      },\n      writeManifest: (manifestFile, a, publisher, userAssets) => this.writeManifest(manifestFile, a, publisher, userAssets),\n      // Record per-arch context so finishBuild can assemble the .msixbundle / .msixupload.\n      onBuilt: ({ arch: builtArch, artifactPath, vendorPathKit, vm }) => {\n        this.builtPackages.set(builtArch, artifactPath)\n        this.vendorPathKit = vendorPathKit\n        this.vm = vm\n      },\n    })\n  }\n\n  async finishBuild(): Promise<void> {\n    await super.finishBuild()\n\n    const packagePaths = Array.from(this.builtPackages.values())\n    if (packagePaths.length === 0) {\n      return\n    }\n\n    let bundlePath: string | undefined\n    if (this.options.createMsixbundle !== false && packagePaths.length > 1) {\n      bundlePath = await this.createMsixBundle(packagePaths)\n    }\n\n    if (this.options.createMsixupload === true) {\n      await this.createMsixUpload(bundlePath ?? packagePaths[0])\n    }\n  }\n\n  private async createMsixBundle(packagePaths: ReadonlyArray<string>): Promise<string> {\n    const packager = this.packager\n    const vm = this.vm!\n    const kitPath = this.vendorPathKit!\n\n    const bundleName = packager.expandArtifactBeautyNamePattern(this.options, \"msixbundle\", Arch.x64)\n    const bundlePath = path.join(this.outDir, bundleName)\n\n    await packager.emitArtifactBuildStarted({\n      targetPresentableName: \"MSIX Bundle\",\n      file: bundlePath,\n      arch: null,\n    })\n\n    const stagingDir = path.join(this.outDir, \".msixbundle-staging\")\n    await mkdirs(stagingDir)\n    try {\n      await Promise.all(packagePaths.map(p => copyOrLinkFile(p, path.join(stagingDir, path.basename(p)))))\n      const makeAppxExe = path.join(kitPath, \"makeappx.exe\")\n      await ensureNotBusy(makeAppxExe)\n      await vm.exec(vm.toVmFile(makeAppxExe), [\"bundle\", \"/o\", \"/d\", vm.toVmFile(stagingDir), \"/p\", vm.toVmFile(bundlePath)])\n    } finally {\n      await remove(stagingDir)\n    }\n\n    await packager.signIf(bundlePath)\n\n    await packager.emitArtifactBuildCompleted({\n      file: bundlePath,\n      packager,\n      arch: null,\n      safeArtifactName: packager.computeSafeArtifactName(bundleName, \"msixbundle\"),\n      target: this,\n      isWriteUpdateInfo: false,\n    })\n\n    return bundlePath\n  }\n\n  private async createMsixUpload(sourcePath: string): Promise<void> {\n    const packager = this.packager\n    const uploadName = packager.expandArtifactBeautyNamePattern(this.options, \"msixupload\", Arch.x64)\n    const uploadPath = path.join(this.outDir, uploadName)\n\n    await packager.emitArtifactBuildStarted({\n      targetPresentableName: \"MSIX Upload\",\n      file: uploadPath,\n      arch: null,\n    })\n\n    const sevenZa = await getPath7za()\n    await exec(sevenZa, [\"a\", \"-tzip\", uploadPath, sourcePath])\n\n    await packager.emitArtifactBuildCompleted({\n      file: uploadPath,\n      packager,\n      arch: null,\n      safeArtifactName: packager.computeSafeArtifactName(uploadName, \"msixupload\"),\n      target: this,\n      isWriteUpdateInfo: false,\n    })\n  }\n\n  private async writeManifest(outFile: string, arch: Arch, publisher: string, userAssets: Array<string>) {\n    const appInfo = this.packager.appInfo\n    const options = this.options\n    const executable = `app\\\\${appInfo.productFilename}.exe`\n    const displayName = options.displayName || appInfo.productName\n    const capabilities = this.getCapabilities()\n    const extensions = await this.getExtensions(executable, displayName)\n    const defaultMinVersion = \"10.0.17763.0\"\n\n    const customManifestPath = await this.packager.getResource(options.customManifestPath)\n    if (customManifestPath) {\n      log.info({ manifestPath: log.filePath(customManifestPath) }, \"custom msix manifest found\")\n    }\n    const manifestFileContent = await readFile(customManifestPath || path.join(getTemplatePath(\"msix\"), \"appxmanifest.xml\"), \"utf8\")\n    const manifest = substituteManifestMacros(manifestFileContent, (p1): string => {\n      switch (p1) {\n        case \"publisher\":\n          return publisher\n\n        case \"publisherDisplayName\": {\n          const name = options.publisherDisplayName || appInfo.companyName\n          if (name == null) {\n            throw new InvalidConfigurationError(`Please specify \"author\" in the application package.json — it is required because \"msix.publisherDisplayName\" is not set.`)\n          }\n          return name\n        }\n\n        case \"version\":\n          return appInfo.getVersionInWeirdWindowsForm(options.setBuildNumber === true)\n\n        case \"applicationId\":\n          return resolvePackageApplicationId(options.applicationId, options.identityName, appInfo.name, \"MSIX\")\n\n        case \"identityName\":\n          return resolvePackageIdentityName(options.identityName, appInfo.name, \"MSIX\")\n\n        case \"executable\":\n          return executable\n\n        case \"displayName\":\n          return displayName\n\n        case \"description\":\n          return appInfo.description || appInfo.productName\n\n        case \"backgroundColor\":\n          return options.backgroundColor || \"#464646\"\n\n        case \"logo\":\n          return \"assets\\\\StoreLogo.png\"\n\n        case \"square150x150Logo\":\n          return \"assets\\\\Square150x150Logo.png\"\n\n        case \"square44x44Logo\":\n          return \"assets\\\\Square44x44Logo.png\"\n\n        case \"lockScreen\":\n          return lockScreenTag(userAssets)\n\n        case \"defaultTile\":\n          return defaultTileTag(userAssets, options.showNameOnTiles || false)\n\n        case \"splashScreen\":\n          return splashScreenTag(userAssets)\n\n        case \"arch\":\n          return arch === Arch.ia32 ? \"x86\" : arch === Arch.arm64 ? \"arm64\" : \"x64\"\n\n        case \"resourceLanguages\":\n          return resourceLanguageTag(asArray(options.languages))\n\n        case \"capabilities\":\n          return capabilities\n\n        case \"extensions\":\n          return extensions\n\n        case \"minVersion\":\n          return options.minVersion || defaultMinVersion\n\n        case \"maxVersionTested\":\n          return options.maxVersionTested || options.minVersion || defaultMinVersion\n\n        case \"packageIntegrity\":\n          // uap10:PackageIntegrity belongs inside <Properties>, not <Capabilities>. It takes no\n          // attributes; a child <uap10:Content Enforcement=\"on\" /> is required to actually enable\n          // runtime integrity checks (a bare/childless element is a no-op).\n          // https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-uap10-packageintegrity\n          return options.enforcePackageIntegrity === true ? '<uap10:PackageIntegrity><uap10:Content Enforcement=\"on\" /></uap10:PackageIntegrity>' : \"\"\n\n        default:\n          throw new Error(`Macro ${p1} is not defined`)\n      }\n    })\n    await writeFile(outFile, manifest)\n  }\n\n  private getCapabilities(): string {\n    const inner = buildCapabilitiesXml(this.options.capabilities)\n    return `<Capabilities>\\n${inner}\\n</Capabilities>`\n  }\n\n  private async getExtensions(executable: string, displayName: string): Promise<string> {\n    const packager = this.packager\n    const options = this.options\n\n    const baseExtensions = await buildExtensionsXml({\n      protocols: asArray(packager.config.protocols).concat(asArray(packager.platformOptions.protocols)),\n      fileAssociations: asArray(packager.config.fileAssociations).concat(asArray(packager.platformOptions.fileAssociations)),\n      addAutoLaunchExtension: options.addAutoLaunchExtension,\n      customExtensionsPath: options.customExtensionsPath,\n      appDir: packager.appDir,\n      executable,\n      displayName,\n      dependencyNames: packager.metadata.dependencies,\n    })\n\n    const servicesXml = buildWindowsServicesXml(options.windowsServices, executable)\n\n    if (!servicesXml) {\n      return baseExtensions\n    }\n\n    if (baseExtensions === \"\") {\n      return `<Extensions>${servicesXml}</Extensions>`\n    }\n\n    return baseExtensions.replace(\"</Extensions>\", `${servicesXml}</Extensions>`)\n  }\n}\n"]}

package/dist/targets/win/nsis/NsisTarget.d.ts

@@ -4,7 +4,7 @@ import { Target } from "../../../core.js";
 import { WinPackager } from "../../../winPackager.js";
 import { Defines } from "./Defines.js";
 import { NsisOptions } from "./nsisOptions.js";
-import { AppPackageHelper } from "./nsisUtil.js";
+import { AppPackageHelper, CopyElevateHelper } from "./nsisUtil.js";
 export declare class NsisTarget extends Target {
     readonly packager: WinPackager;
     readonly outDir: string;
@@ -19,10 +19,11 @@ export declare class NsisTarget extends Target {
     get isBuildDifferentialAware(): boolean;
     private getPreCompressedFileExtensions;
     /** @private */
-    buildAppPackage(appOutDir: string, arch: Arch): Promise<PackageFileInfo>;
+    buildAppPackage(appOutDir: string, arch: Arch, elevateHelper?: CopyElevateHelper | null): Promise<PackageFileInfo>;
     protected installerFilenamePattern(primaryArch?: Arch | null, defaultArch?: string): string;
     private get isPortable();
     finishBuild(): Promise<any>;
+    get appGuid(): string;
     private buildInstaller;
     private resolveArchPackageFiles;
     protected generateGitHubInstallerName(primaryArch: Arch | null, defaultArch: string | undefined): string;

package/dist/targets/win/nsis/NsisTarget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NsisTarget.d.ts","sourceRoot":"","sources":["../../../../src/targets/win/nsis/NsisTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAaL,MAAM,cAAc,CAAA;AACrB,OAAO,EAA8E,eAAe,EAAe,MAAM,sBAAsB,CAAA;AAK/I,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAOzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAKrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,OAAO,EAAE,WAAW,EAAmB,MAAM,kBAAkB,CAAA;AAG/D,OAAO,EAAE,gBAAgB,EAAuC,MAAM,eAAe,CAAA;AAYrF,qBAAa,UAAW,SAAQ,MAAM;IAQlC,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM;IAEvB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,gBAAgB;IAVpD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;IAE7B,eAAe;IACf,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY;IAC7C,QAAQ,CAAC,gBAAgB,SAAQ;gBAGtB,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EACC,aAAa,EAAE,gBAAgB;IAwBpD,IAAI,6BAA6B,YAGhC;IAED,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;IAQnC,IAAI,wBAAwB,IAAI,OAAO,CAEtC;IAED,OAAO,CAAC,8BAA8B;IAKtC,eAAe;IACT,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC;IA6B9E,SAAS,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM;IAO3F,OAAO,KAAK,UAAU,GAErB;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;YAqBnB,cAAc;YAkLd,uBAAuB;IA+CrC,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAOxG,OAAO,KAAK,gBAAgB,GAE3B;IAED,IAAI,cAAc,IAAI,OAAO,CAE5B;YAEa,+BAA+B;IAsD7C,OAAO,CAAC,iBAAiB;IAqBzB,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YA8E/D,uBAAuB;YAOvB,mBAAmB;YASnB,oBAAoB;YAMpB,mBAAmB;IASjC,OAAO,CAAC,qCAAqC;YA4B/B,eAAe;YAgEf,kCAAkC;YAiDlC,kBAAkB;CAgEjC"}
+{"version":3,"file":"NsisTarget.d.ts","sourceRoot":"","sources":["../../../../src/targets/win/nsis/NsisTarget.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EAcL,MAAM,cAAc,CAAA;AACrB,OAAO,EAA8E,eAAe,EAAe,MAAM,sBAAsB,CAAA;AAI/I,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAOzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAKrD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAGtC,OAAO,EAAE,WAAW,EAAmB,MAAM,kBAAkB,CAAA;AAI/D,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAuC,MAAM,eAAe,CAAA;AASxG,qBAAa,UAAW,SAAQ,MAAM;IAQlC,QAAQ,CAAC,QAAQ,EAAE,WAAW;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM;IAEvB,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,gBAAgB;IAVpD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;IAE7B,eAAe;IACf,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY;IAC7C,QAAQ,CAAC,gBAAgB,SAAQ;gBAGtB,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EACC,aAAa,EAAE,gBAAgB;IAwBpD,IAAI,6BAA6B,YAGhC;IAED,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI;IAQnC,IAAI,wBAAwB,IAAI,OAAO,CAEtC;IAED,OAAO,CAAC,8BAA8B;IAKtC,eAAe;IACT,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,aAAa,CAAC,EAAE,iBAAiB,GAAG,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC;IA2CxH,SAAS,CAAC,wBAAwB,CAAC,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM;IAO3F,OAAO,KAAK,UAAU,GAErB;IAEK,WAAW,IAAI,OAAO,CAAC,GAAG,CAAC;IAqBjC,IAAI,OAAO,IAAI,MAAM,CAEpB;YAEa,cAAc;YAiLd,uBAAuB;IA+CrC,SAAS,CAAC,2BAA2B,CAAC,WAAW,EAAE,IAAI,GAAG,IAAI,EAAE,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM;IAOxG,OAAO,KAAK,gBAAgB,GAE3B;IAED,IAAI,cAAc,IAAI,OAAO,CAE5B;YAEa,+BAA+B;IAsD7C,OAAO,CAAC,iBAAiB;IAqBzB,SAAS,CAAC,gBAAgB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;YA8E/D,uBAAuB;YAOvB,mBAAmB;YASnB,oBAAoB;YAMpB,mBAAmB;IASjC,OAAO,CAAC,qCAAqC;YA4B/B,eAAe;YAgEf,kCAAkC;YAiDlC,kBAAkB;CAkEjC"}

package/dist/targets/win/nsis/NsisTarget.js

@@ -1,7 +1,6 @@
-import { Arch, asArray, AsyncTaskManager, exists, spawnAndWriteWithOutput, generateKsuid, getArchSuffix, getPlatformIconFileName, InvalidConfigurationError, log, statOrNull, use, walk, } from "builder-util";
+import { Arch, asArray, AsyncTaskManager, ensureNotBusy, exists, spawnAndWriteWithOutput, generateKsuid, getArchSuffix, getPlatformIconFileName, InvalidConfigurationError, log, statOrNull, use, walk, } from "builder-util";
 import { CURRENT_APP_INSTALLER_FILE_NAME, CURRENT_APP_PACKAGE_FILE_NAME, deepAssign, sleep, UUID } from "builder-util-runtime";
 import _debug from "debug";
-import * as fs from "fs";
 import * as path from "path";
 import { Target } from "../../../core.js";
 import { DesktopShortcutCreationPolicy, getEffectiveOptions } from "../../../options/CommonWindowsInstallerConfiguration.js";
@@ -16,14 +15,13 @@ import { getWindowsInstallationAppPackageName, getWindowsInstallationDirName } f
 import { addCustomMessageFileInclude, createAddLangsMacro, LangConfigurator } from "./nsisLang.js";
 import { computeLicensePage } from "./nsisLicense.js";
 import { NsisScriptGenerator, nsisEscapeString } from "./nsisScriptGenerator.js";
+import { ELECTRON_BUILDER_NS_UUID, ProgIdMaker } from "./progId.js";
 import { getMakeNsisPath, getNsisPluginsPath } from "../../../toolsets/nsis.js";
 import { nsisTemplatesDir, UninstallerReader } from "./nsisUtil.js";
 import { checkMakensisOutput, verifyInstallerSize } from "./nsisValidation.js";
 import _fsExtra from "fs-extra";
 const { readFile, stat, unlink } = _fsExtra;
 const debug = _debug("electron-builder:nsis");
-// noinspection SpellCheckingInspection
-const ELECTRON_BUILDER_NS_UUID = UUID.parse("50e065bc-3134-11e6-9bab-38c9862bdaf3");
 const USE_NSIS_BUILT_IN_COMPRESSOR = false;
 export class NsisTarget extends Target {
     constructor(packager, outDir, targetName, packageHelper) {
@@ -69,7 +67,7 @@ export class NsisTarget extends Target {
         return result == null ? null : asArray(result).map(it => (it.startsWith(".") ? it : `.${it}`));
     }
     /** @private */
-    async buildAppPackage(appOutDir, arch) {
+    async buildAppPackage(appOutDir, arch, elevateHelper) {
         const options = this.options;
         const packager = this.packager;
         const isBuildDifferentialAware = this.isBuildDifferentialAware;
@@ -79,11 +77,24 @@ export class NsisTarget extends Target {
         const archiveOptions = {
             withoutDir: true,
             compression: packager.compression,
+            // The install-time Nsis7z extractor only decodes plain LZMA2/Copy and single-stream BCJ — not
+            // the CPU branch converters modern 7za applies to executables (BCJ2 on x86/x64, ARM64 on
+            // arm64), which it silently skips, dropping the main exe and every native binary from the
+            // install. Pin the payload to a filter it can decode. See #9983.
+            installTimeDecodable: true,
             excluded: preCompressedFileExtensions == null ? null : preCompressedFileExtensions.map(it => `*${it}`),
         };
         const timer = time(`nsis package, ${Arch[arch]}`);
         await archive(format, archiveFile, appOutDir, isBuildDifferentialAware ? configureDifferentialAwareArchiveOptions(archiveOptions) : archiveOptions);
         timer.end();
+        // Inject elevate.exe into the archive via a temp staging dir, never by mutating appOutDir
+        // during packaging. The copy into win-unpacked is deferred until all targets finish, so
+        // concurrent targets (Squirrel, ZIP, etc.) never pick up elevate.exe non-deterministically.
+        // `archiveOptions` was mutated in place by configureDifferentialAwareArchiveOptions above
+        // (when differential-aware), so it already reflects the effective compression settings.
+        if (elevateHelper) {
+            await elevateHelper.addToArchive(archiveFile, this, format, archiveOptions, appOutDir);
+        }
         if (isBuildDifferentialAware && this.isWebInstaller) {
             const data = await appendBlockmap(archiveFile);
             return {
@@ -125,6 +136,9 @@ export class NsisTarget extends Target {
             await this.packageHelper.finishBuild();
         }
     }
+    get appGuid() {
+        return this.options.guid || UUID.v5(this.packager.appInfo.id, ELECTRON_BUILDER_NS_UUID);
+    }
     async buildInstaller(archs) {
         const primaryArch = archs.size === 1 ? (archs.keys().next().value ?? null) : null;
         const packager = this.packager;
@@ -151,11 +165,10 @@ export class NsisTarget extends Target {
             file: installerPath,
             arch: primaryArch,
         }, logFields);
-        const guid = options.guid || UUID.v5(appInfo.id, ELECTRON_BUILDER_NS_UUID);
-        const uninstallAppKey = guid.replace(/\\/g, " - ");
+        const uninstallAppKey = this.appGuid.replace(/\\/g, " - ");
         const defines = {
             APP_ID: appInfo.id,
-            APP_GUID: guid,
+            APP_GUID: this.appGuid,
             // Windows bug - entry in Software\Microsoft\Windows\CurrentVersion\Uninstall cannot have \ symbols (dir)
             UNINSTALL_APP_KEY: uninstallAppKey,
             PRODUCT_NAME: appInfo.productName,
@@ -170,8 +183,8 @@ export class NsisTarget extends Target {
         if (options.customNsisBinary?.debugLogging) {
             defines.ENABLE_LOGGING_ELECTRON_BUILDER = null;
         }
-        if (uninstallAppKey !== guid) {
-            defines.UNINSTALL_REGISTRY_KEY_2 = `Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${guid}`;
+        if (uninstallAppKey !== this.appGuid) {
+            defines.UNINSTALL_REGISTRY_KEY_2 = `Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${this.appGuid}`;
         }
         const { homepage } = this.packager.metadata;
         use(options.uninstallUrlHelp || homepage, it => (defines.UNINSTALL_URL_HELP = it));
@@ -628,6 +641,7 @@ export class NsisTarget extends Target {
         const fileAssociations = packager.fileAssociations;
         if (fileAssociations.length !== 0) {
             scriptGenerator.include(path.join(path.join(nsisTemplatesDir, "include"), "FileAssociation.nsh"));
+            const progIdMaker = new ProgIdMaker(this.appGuid, packager.appInfo.productFilename);
             if (isInstaller) {
                 const registerFileAssociationsScript = new NsisScriptGenerator();
                 for (const item of fileAssociations) {
@@ -639,10 +653,11 @@ export class NsisTarget extends Target {
                             installedIconPath = `$INSTDIR\\resources\\${nsisEscapeString(path.basename(customIcon))}`;
                             registerFileAssociationsScript.file(installedIconPath, customIcon);
                         }
+                        const progID = progIdMaker.progId(item.name || ext);
                         const icon = `"${installedIconPath}"`;
                         const commandText = `"Open with ${nsisEscapeString(packager.appInfo.productName)}"`;
                         const command = '"$appExe $\\"%1$\\""';
-                        registerFileAssociationsScript.insertMacro("APP_ASSOCIATE", `"${nsisEscapeString(ext)}" "${nsisEscapeString(item.name || ext)}" "${nsisEscapeString(item.description || "")}" ${icon} ${commandText} ${command}`);
+                        registerFileAssociationsScript.insertMacro("APP_ASSOCIATE", `"${nsisEscapeString(ext)}" "${progID}" "${nsisEscapeString(item.description || "")}" ${icon} ${commandText} ${command}`);
                     }
                 }
                 scriptGenerator.macro("registerFileAssociations", registerFileAssociationsScript);
@@ -650,8 +665,8 @@ export class NsisTarget extends Target {
             else {
                 const unregisterFileAssociationsScript = new NsisScriptGenerator();
                 for (const item of fileAssociations) {
-                    for (const ext of asArray(item.ext)) {
-                        unregisterFileAssociationsScript.insertMacro("APP_UNASSOCIATE", `"${normalizeExt(ext)}" "${item.name || ext}"`);
+                    for (const ext of asArray(item.ext).map(normalizeExt)) {
+                        unregisterFileAssociationsScript.insertMacro("APP_UNASSOCIATE", `"${nsisEscapeString(ext)}" "${progIdMaker.progId(item.name || ext)}"`);
                     }
                 }
                 scriptGenerator.macro("unregisterFileAssociations", unregisterFileAssociationsScript);
@@ -683,39 +698,6 @@ async function generateForPreCompressed(preCompressedFileExtensions, dir, arch,
         scriptGenerator.macro(`customFiles_${Arch[arch]}`, macro);
     }
 }
-async function ensureNotBusy(outFile) {
-    function isBusy(wasBusyBefore) {
-        return new Promise((resolve, reject) => {
-            fs.open(outFile, "r+", (error, fd) => {
-                try {
-                    if (error != null && error.code === "EBUSY") {
-                        if (!wasBusyBefore) {
-                            log.info({}, "output file is locked for writing (maybe by virus scanner) => waiting for unlock...");
-                        }
-                        resolve(false);
-                    }
-                    else if (fd == null) {
-                        resolve(true);
-                    }
-                    else {
-                        fs.close(fd, () => resolve(true));
-                    }
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        }).then(result => {
-            if (result) {
-                return true;
-            }
-            else {
-                return sleep(2000).then(() => isBusy(true));
-            }
-        });
-    }
-    await isBusy(false);
-}
 async function createPackageFileInfo(file) {
     return {
         path: file,