Merge pull request #610 from dmascord/master

Add support for updating the application manifest and requested execution level for Windows targets

docs/api.md

@@ -375,6 +375,10 @@ Object (also known as a "hash") of application metadata to embed into the execut
 - `OriginalFilename`
 - `ProductName`
 - `InternalName`
+- `requested-execution-level`
+- `application-manifest`
+
+For more information, see the [node-rcedit module](https://github.com/electron/node-rcedit).
 
 ## callback
 

package.json

@@ -26,7 +26,7 @@
     "get-package-info": "^1.0.0",
     "minimist": "^1.1.1",
     "plist": "^2.0.0",
-    "rcedit": "^0.8.0",
+    "rcedit": "^0.9.0",
     "resolve": "^1.1.6",
     "run-series": "^1.1.1",
     "sanitize-filename": "^1.6.0",

test/win32.js

@@ -90,6 +90,36 @@ function setCopyrightAndCompanyNameTest (appCopyright, companyName) {
   )
 }
 
+function setRequestedExecutionLevelTest (requestedExecutionLevel) {
+  var opts = {
+    win32metadata: {
+      'requested-execution-level': requestedExecutionLevel
+    }
+  }
+
+  return generateVersionStringTest(
+    'requested-execution-level',
+    opts,
+    requestedExecutionLevel,
+    'requested-execution-level in win32metadata should match rcOpts value'
+  )
+}
+
+function setApplicationManifestTest (applicationManifest) {
+  var opts = {
+    win32metadata: {
+      'application-manifest': applicationManifest
+    }
+  }
+
+  return generateVersionStringTest(
+    'application-manifest',
+    opts,
+    applicationManifest,
+    'application-manifest in win32metadata should match rcOpts value'
+  )
+}
+
 function setCompanyNameTest (companyName, optName) {
   let opts = {}
   opts[optName] = {
@@ -159,3 +189,5 @@ util.packagerTest('win32 app copyright sets LegalCopyright test', setCopyrightTe
 util.packagerTest('win32 set LegalCopyright and CompanyName test', setCopyrightAndCompanyNameTest('Copyright Bar', 'MyCompany LLC'))
 util.packagerTest('win32 set CompanyName test (win32metadata)', setCompanyNameTest('MyCompany LLC', 'win32metadata'))
 util.packagerTest('win32 set CompanyName test (version-string)', setCompanyNameTest('MyCompany LLC', 'version-string'))
+util.packagerTest('win32 set requested-execution-level test (win32metadata)', setRequestedExecutionLevelTest('asInvoker'))
+util.packagerTest('win32 set application-manifest test (win32metadata)', setApplicationManifestTest('/path/to/manifest.xml'))

usage.txt

@@ -94,3 +94,4 @@ win32metadata      a list of sub-properties used to set the application metadata
                    - OriginalFilename
                    - ProductName
                    - InternalName
+                   - requestedExecutionLevel (user, asInvoker or requireAdministrator)

win32.js

@@ -22,6 +22,13 @@ function generateRceditOptionsSansIcon (opts) {
     rcOpts['version-string'].LegalCopyright = opts.appCopyright
   }
 
+  const manifestProperties = ['application-manifest', 'requested-execution-level']
+  for (const manifestProperty of manifestProperties) {
+    if (win32metadata[manifestProperty]) {
+      rcOpts[manifestProperty] = win32metadata[manifestProperty]
+    }
+  }
+
   return rcOpts
 }