-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: Allow for NSIS windows installer to be wrapped in an MSI #7407
Merged
mmaietta
merged 8 commits into
electron-userland:master
from
ghost1face:msi-wrapped-nsis
Feb 14, 2023
Merged
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
d077909
feat: Allow for NSIS windows installer to be wrapped in an MSI
ghost1face 1818c8f
maint: Code cleanup
ghost1face 0a51df6
fix line endings
ghost1face 975b1d8
DRY
ghost1face 26bd33a
Move fast-xml-parser dependency to test namespace
ghost1face ceebd21
Cleanup common methods between msi & msiwrapped targets
ghost1face 034966c
linting
ghost1face a1dde6f
Create plenty-bees-give.md
mmaietta File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { TargetSpecificOptions } from "../core" | ||
import { CommonWindowsInstallerConfiguration } from "./CommonWindowsInstallerConfiguration" | ||
|
||
export interface MsiWrappedOptions extends CommonWindowsInstallerConfiguration, TargetSpecificOptions { | ||
/** | ||
* Extra arguments to provide to the wrapped installer (ie: /S for silent install) | ||
*/ | ||
readonly wrappedInstallerArgs?: string | null | ||
|
||
/** | ||
* Determines if the wrapped installer should be executed with impersonation | ||
* @default false | ||
*/ | ||
readonly impersonate?: boolean | ||
|
||
/** | ||
* The [upgrade code](https://msdn.microsoft.com/en-us/library/windows/desktop/aa372375(v=vs.85).aspx). Optional, by default generated using app id. | ||
*/ | ||
readonly upgradeCode?: string | null | ||
|
||
/** | ||
* If `warningsAsErrors` is `true` (default): treat warnings as errors. If `warningsAsErrors` is `false`: allow warnings. | ||
* @default true | ||
*/ | ||
readonly warningsAsErrors?: boolean | ||
|
||
/** | ||
* Any additional arguments to be passed to the WiX installer compiler, such as `["-ext", "WixUtilExtension"]` | ||
*/ | ||
readonly additionalWixArgs?: Array<string> | null | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this needs to be a dependency in
app-builder-lib
specifically. Not sure if prod or dev dependency thoughThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-xml-parser
is only referenced in the unit tests. So my thought is that it's only a devDependency hereThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahhh fair enough. Does it still need to be at the electron-builder workspace level or can it be installed within the
/test/package.json
then?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I went ahead and moved the dependency to the appropriate location, under test