From 16721cac0012ccbf2e45725c648947fc09b6b2fc Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Mon, 3 Oct 2022 19:34:04 -0700 Subject: [PATCH] fix web build (#20718) * add logging * new version with more logging * fix downloader * update more extensions Co-authored-by: Charles Gagnon --- extensions/admin-tool-ext-win/package.json | 2 +- extensions/admin-tool-ext-win/yarn.lock | 8 ++++---- extensions/azuremonitor/package.json | 2 +- extensions/azuremonitor/yarn.lock | 8 ++++---- extensions/import/package.json | 2 +- extensions/import/yarn.lock | 8 ++++---- extensions/kusto/package.json | 2 +- extensions/kusto/yarn.lock | 8 ++++---- extensions/mssql/build/postinstall.js | 1 + extensions/mssql/package.json | 2 +- extensions/mssql/yarn.lock | 8 ++++---- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/extensions/admin-tool-ext-win/package.json b/extensions/admin-tool-ext-win/package.json index 9a81226c1d..e89a634d4d 100644 --- a/extensions/admin-tool-ext-win/package.json +++ b/extensions/admin-tool-ext-win/package.json @@ -108,7 +108,7 @@ }, "dependencies": { "@microsoft/ads-extension-telemetry": "^1.2.0", - "@microsoft/ads-service-downloader": "1.0.2", + "@microsoft/ads-service-downloader": "1.0.4", "vscode-nls": "^4.1.2" }, "devDependencies": { diff --git a/extensions/admin-tool-ext-win/yarn.lock b/extensions/admin-tool-ext-win/yarn.lock index 828bf11127..701aa51298 100644 --- a/extensions/admin-tool-ext-win/yarn.lock +++ b/extensions/admin-tool-ext-win/yarn.lock @@ -207,10 +207,10 @@ dependencies: "@vscode/extension-telemetry" "^0.6.2" -"@microsoft/ads-service-downloader@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe" - integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ== +"@microsoft/ads-service-downloader@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.4.tgz#94e13461d655d0864cbf93978247cbd1097e7863" + integrity sha512-XVJ3RW4X5mzlPYeJnwTii5/6ywVib4UqCtrvxwRWSFe214Hi8jO2zNxzcpamiTCnHm2b8wZAuWGfsvIShbf/yg== dependencies: async-retry "^1.2.3" eventemitter2 "^5.0.1" diff --git a/extensions/azuremonitor/package.json b/extensions/azuremonitor/package.json index 613392cd47..fd10ba1deb 100644 --- a/extensions/azuremonitor/package.json +++ b/extensions/azuremonitor/package.json @@ -212,7 +212,7 @@ "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.0", "figures": "^2.0.0", "find-remove": "1.2.1", - "@microsoft/ads-service-downloader": "1.0.2", + "@microsoft/ads-service-downloader": "1.0.4", "vscode-extension-telemetry": "0.4.2", "vscode-languageclient": "5.2.1", "vscode-nls": "^4.0.0" diff --git a/extensions/azuremonitor/yarn.lock b/extensions/azuremonitor/yarn.lock index b82fac1998..504b527b31 100644 --- a/extensions/azuremonitor/yarn.lock +++ b/extensions/azuremonitor/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@microsoft/ads-service-downloader@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe" - integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ== +"@microsoft/ads-service-downloader@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.4.tgz#94e13461d655d0864cbf93978247cbd1097e7863" + integrity sha512-XVJ3RW4X5mzlPYeJnwTii5/6ywVib4UqCtrvxwRWSFe214Hi8jO2zNxzcpamiTCnHm2b8wZAuWGfsvIShbf/yg== dependencies: async-retry "^1.2.3" eventemitter2 "^5.0.1" diff --git a/extensions/import/package.json b/extensions/import/package.json index 512ee715ad..bbf81e15d8 100644 --- a/extensions/import/package.json +++ b/extensions/import/package.json @@ -79,7 +79,7 @@ "dependencies": { "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#0.3.0", "htmlparser2": "^3.10.1", - "@microsoft/ads-service-downloader": "1.0.2", + "@microsoft/ads-service-downloader": "1.0.4", "vscode-extension-telemetry": "0.4.2", "vscode-nls": "^3.2.1" }, diff --git a/extensions/import/yarn.lock b/extensions/import/yarn.lock index 6d761c74a9..8410aa6b39 100644 --- a/extensions/import/yarn.lock +++ b/extensions/import/yarn.lock @@ -182,10 +182,10 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@microsoft/ads-service-downloader@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe" - integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ== +"@microsoft/ads-service-downloader@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.4.tgz#94e13461d655d0864cbf93978247cbd1097e7863" + integrity sha512-XVJ3RW4X5mzlPYeJnwTii5/6ywVib4UqCtrvxwRWSFe214Hi8jO2zNxzcpamiTCnHm2b8wZAuWGfsvIShbf/yg== dependencies: async-retry "^1.2.3" eventemitter2 "^5.0.1" diff --git a/extensions/kusto/package.json b/extensions/kusto/package.json index 6bb03fd639..448ae40c36 100644 --- a/extensions/kusto/package.json +++ b/extensions/kusto/package.json @@ -430,7 +430,7 @@ "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.0", "figures": "^2.0.0", "find-remove": "1.2.1", - "@microsoft/ads-service-downloader": "1.0.2", + "@microsoft/ads-service-downloader": "1.0.4", "vscode-extension-telemetry": "0.4.2", "vscode-languageclient": "5.2.1", "vscode-nls": "^4.0.0" diff --git a/extensions/kusto/yarn.lock b/extensions/kusto/yarn.lock index e0aefd0b10..2827f35f68 100644 --- a/extensions/kusto/yarn.lock +++ b/extensions/kusto/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@microsoft/ads-service-downloader@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe" - integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ== +"@microsoft/ads-service-downloader@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.4.tgz#94e13461d655d0864cbf93978247cbd1097e7863" + integrity sha512-XVJ3RW4X5mzlPYeJnwTii5/6ywVib4UqCtrvxwRWSFe214Hi8jO2zNxzcpamiTCnHm2b8wZAuWGfsvIShbf/yg== dependencies: async-retry "^1.2.3" eventemitter2 "^5.0.1" diff --git a/extensions/mssql/build/postinstall.js b/extensions/mssql/build/postinstall.js index 2f77ddff1f..d692b49cc0 100644 --- a/extensions/mssql/build/postinstall.js +++ b/extensions/mssql/build/postinstall.js @@ -24,6 +24,7 @@ readline.clearLine(process.stdout, 0); process.stdout.write(`${event}${values && values.length > 0 ? ` - ${values.join(' ')}` : ''}`); }); + console.log(`Installing SQL tools service, target runtime: ${runtime}.`); let serviceInstallFolder = installer.getInstallDirectory(runtime); await new Promise((rs, rj) => rimraf(serviceInstallFolder, (e) => e ? rj(e) : rs())); await installer.installService(runtime); diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json index 09d7a35212..807be40ea6 100644 --- a/extensions/mssql/package.json +++ b/extensions/mssql/package.json @@ -1355,7 +1355,7 @@ "find-remove": "1.2.1", "request": "^2.88.0", "request-light": "^0.3.0", - "@microsoft/ads-service-downloader": "1.0.2", + "@microsoft/ads-service-downloader": "1.0.4", "stream-meter": "^1.0.4", "through2": "^3.0.1", "tough-cookie": "^3.0.1", diff --git a/extensions/mssql/yarn.lock b/extensions/mssql/yarn.lock index 313de1d39e..160e65f921 100644 --- a/extensions/mssql/yarn.lock +++ b/extensions/mssql/yarn.lock @@ -189,10 +189,10 @@ dependencies: nan "^2.14.0" -"@microsoft/ads-service-downloader@1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.2.tgz#76cc9a44074525ac65a6ea15f8b5ee7eac87efbe" - integrity sha512-Qpc5HNLywVZbSxeUC4S7d+VRAUddrYjkIfDXl76UwCA0iuwzi71RtciEgWfCWAZMm9CbKTIbtFGh4pYw+h81nQ== +"@microsoft/ads-service-downloader@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.0.4.tgz#94e13461d655d0864cbf93978247cbd1097e7863" + integrity sha512-XVJ3RW4X5mzlPYeJnwTii5/6ywVib4UqCtrvxwRWSFe214Hi8jO2zNxzcpamiTCnHm2b8wZAuWGfsvIShbf/yg== dependencies: async-retry "^1.2.3" eventemitter2 "^5.0.1"