diff --git a/build/package.json b/build/package.json index d1edeb7624..9f6c4802c6 100644 --- a/build/package.json +++ b/build/package.json @@ -41,7 +41,7 @@ "minimist": "^1.2.0", "request": "^2.85.0", "tslint": "^5.9.1", - "service-downloader": "github:anthonydresser/service-downloader#0.1.5", + "service-downloader": "github:anthonydresser/service-downloader#0.1.7", "typescript": "3.5.2", "vsce": "1.48.0", "vscode-telemetry-extractor": "^1.5.4", diff --git a/build/yarn.lock b/build/yarn.lock index 75e3562368..0d865bebc3 100644 --- a/build/yarn.lock +++ b/build/yarn.lock @@ -485,6 +485,13 @@ async-each@^1.0.1: resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.2.tgz#8b8a7ca2a658f927e9f307d6d1a42f4199f0f735" integrity sha512-6xrbvN0MOBKSJDdonmSSz2OwFSgxRaVtBDes26mj9KIGtDo+g9xosFRSC+i1gQh2oAN/tQ62AI/pGZGQjVOiRg== +async-retry@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.2.3.tgz#a6521f338358d322b1a0012b79030c6f411d1ce0" + integrity sha512-tfDb02Th6CE6pJUF2gjW5ZVjsgwlucVXOEQMvEX9JgSJMs9gAX+Nz3xRuJBKuUYjTSYORqvDBORdAQ3LU59g7Q== + dependencies: + retry "0.12.0" + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -2983,6 +2990,11 @@ ret@~0.1.10: resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== +retry@0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + reusify@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" @@ -3049,10 +3061,11 @@ semver@^5.1.0, semver@^5.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== -"service-downloader@github:anthonydresser/service-downloader#0.1.5": - version "0.1.5" - resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/6ebb0465573cc140e461a22f334260f55ef45546" +"service-downloader@github:anthonydresser/service-downloader#0.1.7": + version "0.1.7" + resolved "https://codeload.github.com/anthonydresser/service-downloader/tar.gz/c08de456c9f1af6258061fdc524275b21c6db667" dependencies: + async-retry "^1.2.3" decompress "^4.2.0" eventemitter2 "^5.0.1" http-proxy-agent "^2.1.0" diff --git a/extensions/admin-tool-ext-win/src/config.json b/extensions/admin-tool-ext-win/src/config.json index 0694c774a9..d38b487341 100644 --- a/extensions/admin-tool-ext-win/src/config.json +++ b/extensions/admin-tool-ext-win/src/config.json @@ -8,5 +8,12 @@ "installDirectory": "ssmsmin/{#platform#}/{#version#}", "executableFiles": [ "SsmsMin.exe" - ] -} \ No newline at end of file + ], + "retry": { + "retries": 15, + "factor": 2, + "minTimeout": 1000, + "maxTimeout": 300000, + "randomize": false + } +} diff --git a/extensions/mssql/src/config.json b/extensions/mssql/src/config.json index 1daba5dde5..d5180d2114 100644 --- a/extensions/mssql/src/config.json +++ b/extensions/mssql/src/config.json @@ -15,5 +15,12 @@ "Ubuntu_16": "rhel-x64-netcoreapp2.2.tar.gz" }, "installDirectory": "../sqltoolsservice/{#platform#}/{#version#}", - "executableFiles": ["MicrosoftSqlToolsServiceLayer.exe", "MicrosoftSqlToolsServiceLayer"] + "executableFiles": ["MicrosoftSqlToolsServiceLayer.exe", "MicrosoftSqlToolsServiceLayer"], + "retry": { + "retries": 15, + "factor": 2, + "minTimeout": 1000, + "maxTimeout": 300000, + "randomize": false + } } diff --git a/package.json b/package.json index fd41814a48..7f76c53e8e 100644 --- a/package.json +++ b/package.json @@ -92,13 +92,13 @@ "@types/keytar": "^4.4.0", "@types/mocha": "2.2.39", "@types/node": "^10.12.12", + "@types/plotly.js": "^1.44.9", "@types/sanitize-html": "^1.18.2", "@types/semver": "^5.5.0", "@types/should": "^13.0.0", "@types/sinon": "^1.16.36", "@types/webpack": "^4.4.10", "@types/winreg": "^1.2.30", - "@types/plotly.js": "^1.44.9", "ansi-colors": "^3.2.3", "asar": "^0.14.0", "chromium-pickle-js": "^0.2.0",