ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

use native win-arm64 STS builds (#22103)

Browse Source 
* 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
This commit is contained in:
Alan Ren
2023-03-02 12:37:14 -08:00
committed by GitHub
parent 20969bf244
commit 91ee26a888
23 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/mssql/build/postinstall.js
View File

@@ -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()));

3
extensions/mssql/config.json
View File

@@ -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"
},

2
extensions/mssql/package.json
View File

@@ -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",

8
extensions/mssql/yarn.lock
View File

@@ -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"