Skip to content

Commit d20bcf0

Browse files
authored
fix: Downgrading nsis to v3.0.4.1 since v3.0.4.2 throws false virus positives (#6334) (#6447)
1 parent e95afc1 commit d20bcf0

File tree

5 files changed

+29
-20
lines changed

5 files changed

+29
-20
lines changed

.changeset/purple-swans-beam.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"app-builder-lib": patch
3+
---
4+
5+
fix(nsis): downgrade nsis from v3.0.4.2 to v3.0.4.1 due to (#6334)

packages/app-builder-lib/scheme.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -493,11 +493,25 @@
493493
"description": "Repository slug/name",
494494
"type": "string"
495495
},
496+
"token": {
497+
"description": "The access token to support auto-update from private bitbucket repositories.",
498+
"type": [
499+
"null",
500+
"string"
501+
]
502+
},
496503
"updaterCacheDirName": {
497504
"type": [
498505
"null",
499506
"string"
500507
]
508+
},
509+
"username": {
510+
"description": "The user name to support auto-update from private bitbucket repositories.",
511+
"type": [
512+
"null",
513+
"string"
514+
]
501515
}
502516
},
503517
"required": [
@@ -525,7 +539,7 @@
525539
]
526540
},
527541
"version": {
528-
"default": "3.0.4.2",
542+
"default": "3.0.4.1",
529543
"type": [
530544
"null",
531545
"string"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ interface CustomNsisBinary {
1111

1212
/**
1313
* @private
14-
* @default o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==
14+
* @default VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==
1515
*/
1616

1717
readonly checksum?: string | null
1818

1919
/**
2020
* @private
21-
* @default 3.0.4.2
21+
* @default 3.0.4.1
2222
*/
2323

2424
readonly version?: string | null

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ export const NSIS_PATH = () => {
3333
return getBinFromCustomLoc("nsis", binaryVersion, url, checksum)
3434
}
3535
}
36+
// Warning: Don't use v3.0.4.2 - https://github.com/electron-userland/electron-builder/issues/6334
3637
// noinspection SpellCheckingInspection
37-
return getBinFromUrl("nsis", "3.0.4.2", "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==")
38+
return getBinFromUrl("nsis", "3.0.4.1", "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==")
3839
})
3940
}
4041

test/src/windows/assistedInstallerTest.ts

+5-16
Original file line numberDiff line numberDiff line change
@@ -117,28 +117,17 @@ test.ifAll.ifNotCiMac("assisted, MUI_HEADER as option", () => {
117117
)
118118
})
119119

120-
test.ifNotCiMac(
121-
"custom makensis.exe",
120+
test.skip.ifNotCiMac(
121+
"debug logging enabled",
122122
app({
123123
targets: nsisTarget,
124124
config: {
125125
nsis: {
126126
customNsisBinary: {
127-
url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.1/nsis-3.0.4.1.7z",
128-
version: "3.0.4.1",
129-
checksum: "VKMiizYdmNdJOWpRGz4trl4lD++BvYP2irAXpMilheUP0pc93iKlWAoP843Vlraj8YG19CVn0j+dCo/hURz9+Q==",
127+
url: "https://github.com/electron-userland/electron-builder-binaries/releases/download/nsis-3.0.4.2/nsis-3.0.4.2.7z",
128+
version: "3.0.4.2",
129+
checksum: "o+YZsXHp8LNihhuk7JsCDhdIgx0MKKK+1b3sGD+4zX5djZULe4/4QMcAsfQ+0r+a8FnwBt7BVBHkIkJHjKQ0sg==",
130130
},
131-
},
132-
},
133-
})
134-
)
135-
136-
test.ifNotCiMac(
137-
"debug logging enabled",
138-
app({
139-
targets: nsisTarget,
140-
config: {
141-
nsis: {
142131
debugLogging: true,
143132
},
144133
},

0 commit comments

Comments
 (0)