diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 3c0b7273fe2..b26fb4ed54b 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -16,6 +16,7 @@
+
diff --git a/package.json b/package.json
index ac3e0121e36..aa8a0b13bcf 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"ajv": "^5.2.2",
"ajv-keywords": "^2.1.0",
"archiver": "^2.0.0",
- "aws-sdk": "^2.89.0",
+ "aws-sdk": "^2.90.0",
"bluebird-lst": "^1.0.2",
"chalk": "^2.0.1",
"chromium-pickle-js": "^0.2.0",
@@ -67,7 +67,7 @@
},
"devDependencies": {
"@types/ini": "^1.3.29",
- "@types/jest": "^20.0.4",
+ "@types/jest": "^20.0.5",
"@types/js-yaml": "^3.9.0",
"@types/source-map-support": "^0.4.0",
"@types/xml2js": "^0.4.0",
@@ -90,7 +90,7 @@
"jsdoc-to-markdown": "^3.0.0",
"path-sort": "^0.1.0",
"shebang-loader": "^0.0.1",
- "ts-babel": "^3.1.2",
+ "ts-babel": "^3.1.4",
"tslint": "^5.5.0",
"typescript": "^2.4.2",
"v8-compile-cache": "^1.1.0",
diff --git a/packages/electron-builder/templates/nsis/multiUserUi.nsh b/packages/electron-builder/templates/nsis/multiUserUi.nsh
index a0e76727bba..08f983e4139 100755
--- a/packages/electron-builder/templates/nsis/multiUserUi.nsh
+++ b/packages/electron-builder/templates/nsis/multiUserUi.nsh
@@ -188,14 +188,14 @@ Var RadioButtonLabel1
nsDialogs::GetUserData $1
pop $1
GetDlgItem $0 $hwndParent 1 ; get item 1 (next button) at parent window, store in $0 - (0 is back, 1 is next .. what about CANCEL? http://nsis.sourceforge.net/Buttons_Header )
-
+
StrCpy $7 ""
${if} "$1" == "0" ; current user
${if} $hasPerUserInstallation == "1"
!ifndef BUILD_UNINSTALLER
- StrCpy $7 "There is already a per-user installation. ($perUserInstallationFolder)$\r$\nWill reinstall/upgrade."
+ StrCpy $7 "$(perUserInstallExists)($perUserInstallationFolder)$\r$\n$(reinstallUpgrade)"
!else
- StrCpy $7 "There is a per-user installation. ($perUserInstallationFolder)$\r$\nWill uninstall."
+ StrCpy $7 "$(perUserInstall)($perUserInstallationFolder)$\r$\n$(uninstall)"
!endif
${else}
StrCpy $7 "$(freshInstallForCurrent)"
@@ -204,15 +204,15 @@ Var RadioButtonLabel1
${else} ; all users
${if} $hasPerMachineInstallation == "1"
!ifndef BUILD_UNINSTALLER
- StrCpy $7 "There is already a per-machine installation. ($perMachineInstallationFolder)$\r$\nWill reinstall/upgrade."
+ StrCpy $7 "$(perMachineInstallExists)($perMachineInstallationFolder)$\r$\n$(reinstallUpgrade)"
!else
- StrCpy $7 "There is a per-machine installation. ($perMachineInstallationFolder)$\r$\nWill uninstall."
+ StrCpy $7 "$(perMachineInstall)($perMachineInstallationFolder)$\r$\n$(uninstall)"
!endif
${else}
StrCpy $7 "$(freshInstallForAll)"
${endif}
${ifNot} ${UAC_IsAdmin}
- StrCpy $7 "$7 (will prompt for admin credentials)"
+ StrCpy $7 "$7"
SendMessage $0 ${BCM_SETSHIELD} 0 1 ; display SHIELD
${else}
SendMessage $0 ${BCM_SETSHIELD} 0 0 ; hide SHIELD
@@ -220,4 +220,4 @@ Var RadioButtonLabel1
${endif}
SendMessage $RadioButtonLabel1 ${WM_SETTEXT} 0 "STR:$7"
FunctionEnd
-!macroend
\ No newline at end of file
+!macroend
diff --git a/packages/electron-publisher-s3/package.json b/packages/electron-publisher-s3/package.json
index ae9fbc4a99b..2b8dec3d540 100644
--- a/packages/electron-publisher-s3/package.json
+++ b/packages/electron-publisher-s3/package.json
@@ -12,7 +12,7 @@
],
"dependencies": {
"fs-extra-p": "^4.4.0",
- "aws-sdk": "^2.89.0",
+ "aws-sdk": "^2.90.0",
"mime": "^1.3.6",
"electron-publish": "~0.0.0-semantic-release",
"electron-builder-util": "~0.0.0-semantic-release",
diff --git a/yarn.lock b/yarn.lock
index 38dbaabd3cc..19e624868c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26,17 +26,17 @@
version "1.3.29"
resolved "https://registry.yarnpkg.com/@types/ini/-/ini-1.3.29.tgz#1325e981e047d40d13ce0359b821475b97741d2f"
-"@types/jest@^20.0.4":
- version "20.0.4"
- resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.4.tgz#91e2c76fbe90b3a719b5d689958f0495f005beb9"
+"@types/jest@^20.0.5":
+ version "20.0.5"
+ resolved "https://registry.yarnpkg.com/@types/jest/-/jest-20.0.5.tgz#f463e58b2de6e801f40e33b05db894babdbad98c"
"@types/js-yaml@^3.9.0":
version "3.9.0"
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.9.0.tgz#cf82d31326251e8e94848d98a0665875928cdae6"
"@types/node@*":
- version "8.0.16"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.16.tgz#5aa51abd72621a0ce53fb86bccd76825ee1b4ca9"
+ version "8.0.17"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.17.tgz#677bc8c118cfb76013febb62ede1f31d2c7222a1"
"@types/source-map-support@^0.4.0":
version "0.4.0"
@@ -275,9 +275,9 @@ asynckit@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-aws-sdk@^2.89.0:
- version "2.89.0"
- resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.89.0.tgz#dbf46999cbd5e74ce1b06640b07fa8e258ef07bc"
+aws-sdk@^2.90.0:
+ version "2.90.0"
+ resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.90.0.tgz#7dfe5c5ce2f2b7d33ef426692586f7d539919ea0"
dependencies:
buffer "4.9.1"
crypto-browserify "1.0.9"
@@ -3360,14 +3360,14 @@ truncate-utf8-bytes@^1.0.0:
dependencies:
utf8-byte-length "^1.0.1"
-ts-babel@^3.1.2:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-3.1.2.tgz#e63b93f842b607bb0121ec977c12074543bc552f"
+ts-babel@^3.1.4:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/ts-babel/-/ts-babel-3.1.4.tgz#a9af0db7ba240fb542b806775638e52e8baea3d9"
dependencies:
babel-core "^6.25.0"
bluebird-lst "^1.0.2"
chalk "^2.0.1"
- fs-extra-p "^4.3.0"
+ fs-extra-p "^4.4.0"
source-map-support "^0.4.15"
v8-compile-cache "^1.1.0"