use native win-arm64 STS builds (#22103)

* use native windows arm STS * update downloader and build job * remove workarounds * vbump STS * revert change * update ads-service-downloader version * fix admin-tool-ext-win extension
2026-01-13 17:22:15 -05:00 · 2023-03-02 12:37:14 -08:00
parent 20969bf244
commit 91ee26a888
23 changed files with 47 additions and 52 deletions
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -48,6 +48,7 @@ stages:
        variables:
          NPM_CONFIG_ARCH: arm64
          VSCODE_ARCH: arm64
+          AZDATA_RUNTIME: OSX_ARM64
          # Do not run tests for arm64 build
          RUN_TESTS: false
          RUN_SMOKE_TESTS: false
@@ -123,6 +124,7 @@ stages:
      - job: Windows_ARM64
        variables:
          VSCODE_ARCH: arm64
+          AZDATA_RUNTIME: Windows_ARM64
        condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32_ARM64'], 'true'))
        steps:
        - template: win32/sql-product-build-win32.yml
--- a/extensions/admin-tool-ext-win/config.json
+++ b/extensions/admin-tool-ext-win/config.json
@@ -2,8 +2,8 @@
 	"downloadUrl": "https://sqlopsextensions.blob.core.windows.net/tools/ssmsmin/{#version#}/{#fileName#}",
 	"version": "16.0.19061.0",
 	"downloadFileNames": {
-		"Windows_64": "SsmsMin-16.0.19061.0-win-x64.zip",
-		"Windows_86": "SsmsMin-16.0.19061.0-win-x86.zip"
+		"Windows_86": "SsmsMin-16.0.19061.0-win-x86.zip",
+		"Windows": "SsmsMin-16.0.19061.0-win-x64.zip"
 	},
 	"installDirectory": "ssmsmin/{#platform#}/{#version#}",
 	"executableFiles": [
--- 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.4.0",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "vscode-nls": "^4.1.2"
  },
  "devDependencies": {
--- a/extensions/admin-tool-ext-win/yarn.lock
+++ b/extensions/admin-tool-ext-win/yarn.lock
@@ -189,10 +189,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/azuremonitor/config.json
+++ b/extensions/azuremonitor/config.json
@@ -3,7 +3,7 @@
 	"version": "3.0.0-release.133",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net5.0.zip",
-		"Windows_64": "win-x64-net5.0.zip",
+		"Windows": "win-x64-net5.0.zip",
 		"OSX": "osx-x64-net5.0.tar.gz",
 		"Linux": "rhel-x64-net5.0.tar.gz"
 	},
--- a/extensions/azuremonitor/package.json
+++ b/extensions/azuremonitor/package.json
@@ -212,7 +212,7 @@
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1",
    "figures": "^2.0.0",
    "find-remove": "1.2.1",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "@microsoft/ads-extension-telemetry": "^1.4.0",
    "vscode-languageclient": "5.2.1",
    "vscode-nls": "^4.0.0"
--- a/extensions/azuremonitor/yarn.lock
+++ b/extensions/azuremonitor/yarn.lock
@@ -9,10 +9,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/datavirtualization/config.json
+++ b/extensions/datavirtualization/config.json
@@ -2,7 +2,7 @@
 	"downloadUrl": "https://sqlopsextensions.blob.core.windows.net/extensions/datavirtualization/service/{#version#}/scaleoutdataservice-{#fileName#}",
 	"version": "1.11.0",
 	"downloadFileNames": {
-		"Windows_64": "win-x64.zip",
+		"Windows": "win-x64.zip",
 		"Windows_86": "win-x86.zip",
 		"OSX": "osx-x64.tar.gz",
 		"Linux": "linux-x64.tar.gz"
--- a/extensions/datavirtualization/package.json
+++ b/extensions/datavirtualization/package.json
@@ -106,7 +106,7 @@
  },
  "dependencies": {
    "@microsoft/ads-extension-telemetry": "^1.4.0",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.2",
    "vscode-nls": "^5.2.0"
  },
--- a/extensions/datavirtualization/yarn.lock
+++ b/extensions/datavirtualization/yarn.lock
@@ -213,10 +213,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/import/config.json
+++ b/extensions/import/config.json
@@ -3,7 +3,7 @@
 	"useDefaultLinuxRuntime": true,
 	"version": "0.0.10",
 	"downloadFileNames": {
-		"Windows_64": "win-x64.zip",
+		"Windows": "win-x64.zip",
 		"Windows_86": "win-x86.zip",
 		"OSX": "osx-x64.tar.gz",
 		"Linux": "linux-x64.tar.gz"
--- a/extensions/import/package.json
+++ b/extensions/import/package.json
@@ -79,7 +79,7 @@
  "dependencies": {
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1",
    "htmlparser2": "^3.10.1",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "@microsoft/ads-extension-telemetry": "^1.4.0",
    "vscode-nls": "^4.1.2"
  },
--- a/extensions/import/yarn.lock
+++ b/extensions/import/yarn.lock
@@ -189,10 +189,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/kusto/config.json
+++ b/extensions/kusto/config.json
@@ -3,7 +3,7 @@
 	"version": "3.0.0-release.133",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net5.0.zip",
-		"Windows_64": "win-x64-net5.0.zip",
+		"Windows": "win-x64-net5.0.zip",
 		"OSX": "osx-x64-net5.0.tar.gz",
 		"Linux": "rhel-x64-net5.0.tar.gz"
 	},
--- a/extensions/kusto/package.json
+++ b/extensions/kusto/package.json
@@ -430,7 +430,7 @@
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1",
    "figures": "^2.0.0",
    "find-remove": "1.2.1",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "@microsoft/ads-extension-telemetry": "^1.4.0",
    "vscode-languageclient": "5.2.1",
    "vscode-nls": "^4.0.0"
--- a/extensions/kusto/yarn.lock
+++ b/extensions/kusto/yarn.lock
@@ -9,10 +9,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/mssql/build/postinstall.js
+++ b/extensions/mssql/build/postinstall.js
@@ -15,15 +15,6 @@
 	async function installService() {
 		const absoluteConfigPath = require.resolve('../config.json');
 		const config = require(absoluteConfigPath);
-		let runtime = (await platform.PlatformInformation.getCurrent()).runtimeId;
-		const arch = process.env['npm_config_arch'];
-
-		// In the build pipeline, macOS x64 image is used to produce arm64 build,
-		// we need to check the environment variable to determine the actual target runtime.
-		if (runtime === platform.Runtime.OSX && arch === 'arm64') {
-			console.log(`Set the target runtime to OSX_ARM64`);
-			runtime = platform.Runtime.OSX_ARM64;
-		}
 		// fix path since it won't be correct
 		config.installDirectory = path.join(path.dirname(absoluteConfigPath), config.installDirectory);
 		let installer = new serviceDownloader(config);
@@ -32,6 +23,7 @@
 			readline.clearLine(process.stdout, 0);
 			process.stdout.write(`${event}${values && values.length > 0 ? ` - ${values.join(' ')}` : ''}`);
 		});
+		let runtime = (await platform.PlatformInformation.getCurrent()).runtimeId;
 		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()));
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,9 +1,10 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "4.5.0.33",
+	"version": "4.5.0.35",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
 		"Windows_64": "win-x64-net7.0.zip",
+		"Windows_ARM64": "win-arm64-net7.0.zip",
 		"OSX": "osx-x64-net7.0.tar.gz",
 		"Linux": "rhel-x64-net7.0.tar.gz"
 	},
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -1423,7 +1423,7 @@
  },
  "dependencies": {
    "@microsoft/ads-extension-telemetry": "^1.4.0",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.2",
    "find-remove": "1.2.1",
    "vscode-languageclient": "5.2.1",
--- a/extensions/mssql/yarn.lock
+++ b/extensions/mssql/yarn.lock
@@ -189,10 +189,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"
--- a/extensions/sql-migration/config.json
+++ b/extensions/sql-migration/config.json
@@ -4,7 +4,7 @@
 	"version": "4.5.0.28",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-net7.0.zip",
-		"Windows_64": "win-x64-net7.0.zip",
+		"Windows": "win-x64-net7.0.zip",
 		"OSX": "osx-x64-net7.0.tar.gz",
 		"Linux": "rhel-x64-net7.0.tar.gz"
 	},
--- a/extensions/sql-migration/package.json
+++ b/extensions/sql-migration/package.json
@@ -154,7 +154,7 @@
  },
  "dependencies": {
    "dataprotocol-client": "github:Microsoft/sqlops-dataprotocolclient#1.3.1",
-    "@microsoft/ads-service-downloader": "^1.1.0",
+    "@microsoft/ads-service-downloader": "^1.2.0",
    "@microsoft/ads-extension-telemetry": "^1.4.0",
    "uuid": "^8.3.2",
    "vscode-nls": "^4.1.2"
--- a/extensions/sql-migration/yarn.lock
+++ b/extensions/sql-migration/yarn.lock
@@ -9,10 +9,10 @@
  dependencies:
    "@vscode/extension-telemetry" "0.6.1"

-"@microsoft/ads-service-downloader@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.1.0.tgz#c51ba28bc17a137e92f99a2b050821965588d7d6"
-  integrity sha512-WSJ4NZvpuebg/CjlTUpqXPUYV5y5mSNJQE/dd+kuOt0nkMYzCmp5IYyFFpMFUR1CiZy/19V7DH2wGdy60+9SRg==
+"@microsoft/ads-service-downloader@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@microsoft/ads-service-downloader/-/ads-service-downloader-1.2.0.tgz#e7b1febc89fe310256ed168fbe0aed1b90f1db1d"
+  integrity sha512-8QYnRGvzYDiJavuITnLcLTGIcXN66LP6AuNByiBA/iRc1SHypjaCqXPOK1gDHDP6KTKuXmTrKBkhojkKFE8GKA==
  dependencies:
    async-retry "^1.2.3"
    eventemitter2 "^5.0.1"