From 9958c9f003bb25b8c44d7a7922927d6e89d9b0e5 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Wed, 1 Mar 2023 15:58:10 -0800 Subject: [PATCH] produce windows arm64 bits (#1886) * add win-arm64 support * test version * fix error --- Directory.Build.props | 2 +- azure-pipelines/build.yml | 11 +++++------ azure-pipelines/release.yml | 2 +- build.cake | 1 + build.json | 3 ++- .../Microsoft.SqlToolsService.csproj | 2 ++ ....win-arm64.native.Microsoft.SqlToolsService.csproj | 9 +++++++++ 7 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj diff --git a/Directory.Build.props b/Directory.Build.props index 86379272..103458d7 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,7 +23,7 @@ $(VersionPrefix)-$(VersionSuffix) version=$(PackageVersion) - win-x64;win-x86;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64;osx-x64;osx-arm64;linux-x64 + win-x64;win-x86;win-arm64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64;osx.10.11-x64;osx-x64;osx-arm64;linux-x64 true true diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index d7995657..29a3bf55 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -27,12 +27,11 @@ parameters: archiveName: 'win-x86' archiveFileFormat: 'zip' archiveType: 'zip' - # - name: 'win10-arm64' - # displayName: 'Windows 10 ARM 64 bit' - # archiveFileFormat: 'zip' - # - name: 'win10-arm' - # displayName: 'Windows 10 ARM' - # archiveFileFormat: 'zip' + - name: 'win-arm64' + archiveName: 'win-arm64' + displayName: 'Windows ARM 64 bit' + archiveFileFormat: 'zip' + archiveType: 'zip' - name: projects type: object default: diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml index dd9f8611..436ae94c 100644 --- a/azure-pipelines/release.yml +++ b/azure-pipelines/release.yml @@ -25,7 +25,7 @@ steps: displayName: 'Run Automated Release Script' inputs: filePath: '$(System.DefaultWorkingDirectory)/CrossPlatBuildScripts/AutomatedReleases/sqltoolsserviceRelease.ps1' - arguments: '-workspace $(Build.SourcesDirectory) -minTag 4.5.0.0 -target $(Build.SourceBranch) -isPrerelease $false -artifactsBuildId $(Build.BuildId)' + arguments: '-workspace $(Build.SourcesDirectory) -minTag 5.5.0.0 -target $(Build.SourceBranch) -isPrerelease $false -artifactsBuildId $(Build.BuildId)' workingDirectory: '$(Build.SourcesDirectory)' env: GITHUB_DISTRO_MIXIN_PASSWORD: $(github-distro-mixin-password) diff --git a/build.cake b/build.cake index 063fe457..ffbf43c7 100644 --- a/build.cake +++ b/build.cake @@ -125,6 +125,7 @@ Task("PopulateRuntimes") "default", // To allow testing the published artifact "win-x64", "win-x86", + "win-arm64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "centos.7-x64", diff --git a/build.json b/build.json index c8b3a2ac..6c55a73f 100644 --- a/build.json +++ b/build.json @@ -54,7 +54,8 @@ "runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService", "runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService", "runtime.win-x64.native.Microsoft.SqlToolsService", - "runtime.osx-arm64.native.Microsoft.SqlToolsService" + "runtime.osx-arm64.native.Microsoft.SqlToolsService", + "runtime.win-arm64.native.Microsoft.SqlToolsService" ], "DotnetToolProjects": [ "Microsoft.SqlTools.ServiceLayer", diff --git a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj index 9424e748..fb509182 100644 --- a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj +++ b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj @@ -20,6 +20,7 @@ + @@ -32,5 +33,6 @@ + diff --git a/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj new file mode 100644 index 00000000..2067ecc3 --- /dev/null +++ b/packages/runtime.win-arm64.native.Microsoft.SqlToolsService/runtime.win-arm64.native.Microsoft.SqlToolsService.csproj @@ -0,0 +1,9 @@ + + + SQL Tools Service application for the win-arm64 runtime. This package is intended to be used by internal applications only and should not be referenced directly. + + + + + +