Merge branch 'master' into fix/asar-symlink-check

Author: mmaietta

.changeset/witty-ghosts-kneel.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+feat(nsis): add support for more Windows Installer options

packages/app-builder-lib/scheme.json

@@ -4169,6 +4169,34 @@
           "description": "The uninstaller display name in the control panel.",
           "type": "string"
         },
+        "uninstallUrlHelp": {
+          "description": "The URL to the uninstaller help page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "uninstallUrlInfoABout": {
+          "description": "The URL to the uninstaller info about page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "uninstallUrlUpdateInfo": {
+          "description": "The URL to the uninstaller update info page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
+        "uninstallUrlReadme": {
+          "description": "The URL to the uninstaller readme in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.",
+          "type": [
+            "null",
+            "string"
+          ]
+        },
         "uninstallerIcon": {
           "description": "The path to uninstaller icon, relative to the [build resources](./contents.md#extraresources) or to the project directory.\nDefaults to `build/uninstallerIcon.ico` or application icon.",
           "type": [

packages/app-builder-lib/src/targets/nsis/Defines.ts

@@ -90,6 +90,10 @@ export type Defines = {
 
   UNINSTALLER_ICON?: string
   UNINSTALL_DISPLAY_NAME?: string
+  UNINSTALL_URL_HELP?: string
+  UNINSTALL_URL_INFO_ABOUT?: string
+  UNINSTALL_URL_UPDATE_INFO?: string
+  UNINSTALL_URL_README?: string
 
   RECREATE_DESKTOP_SHORTCUT?: null
 

packages/app-builder-lib/src/targets/nsis/NsisTarget.ts

@@ -225,6 +225,12 @@ export class NsisTarget extends Target {
       defines.UNINSTALL_REGISTRY_KEY_2 = `Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\${guid}`
     }
 
+    const { homepage } = this.packager.info.metadata
+    use(options.uninstallUrlHelp || homepage, it => (defines.UNINSTALL_URL_HELP = it))
+    use(options.uninstallUrlInfoAbout || homepage, it => (defines.UNINSTALL_URL_INFO_ABOUT = it))
+    use(options.uninstallUrlUpdateInfo || homepage, it => (defines.UNINSTALL_URL_UPDATE_INFO = it))
+    use(options.uninstallUrlReadme || homepage, it => (defines.UNINSTALL_URL_README = it))
+
     const commands: Commands = {
       OutFile: `"${installerPath}"`,
       VIProductVersion: appInfo.getVersionInWeirdWindowsForm(),

packages/app-builder-lib/src/targets/nsis/nsisOptions.ts

@@ -155,6 +155,22 @@ export interface NsisOptions extends CommonNsisOptions, CommonWindowsInstallerCo
    * @default ${productName} ${version}
    */
   readonly uninstallDisplayName?: string
+  /**
+   * The URL to the uninstaller help page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.
+   */
+  readonly uninstallUrlHelp?: string
+  /**
+   * The URL to the uninstaller info about page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.
+   */
+  readonly uninstallUrlInfoAbout?: string
+  /**
+   * The URL to the uninstaller update info page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.
+   */
+  readonly uninstallUrlUpdateInfo?: string
+  /**
+   * The URL to the uninstaller readme page in the control panel. Defaults to [homepage](./configuration.md#homepage) from application package.json.
+   */
+  readonly uninstallUrlReadme?: string
 
   /**
    * The path to NSIS include script to customize installer. Defaults to `build/installer.nsh`. See [Custom NSIS script](#custom-nsis-script).

packages/app-builder-lib/templates/nsis/include/installer.nsh

@@ -133,6 +133,26 @@
     WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "Publisher" "${COMPANY_NAME}"
   !endif
 
+  !ifdef APP_DESCRIPTION
+    WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "Comments" "${APP_DESCRIPTION}"
+  !endif
+
+  !ifdef UNINSTALL_URL_HELP
+    WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "HelpLink" "${UNINSTALL_URL_HELP}"
+  !endif
+
+  !ifdef UNINSTALL_URL_INFO_ABOUT
+    WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "URLInfoAbout" "${UNINSTALL_URL_INFO_ABOUT}"
+  !endif
+
+  !ifdef UNINSTALL_URL_UPDATE_INFO
+    WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "URLUpdateInfo" "${UNINSTALL_URL_UPDATE_INFO}"
+  !endif
+
+  !ifdef UNINSTALL_URL_README
+    WriteRegStr SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" "Readme" "${UNINSTALL_URL_README}"
+  !endif
+
   WriteRegDWORD SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" NoModify 1
   WriteRegDWORD SHELL_CONTEXT "${UNINSTALL_REGISTRY_KEY}" NoRepair 1