diff --git a/Directory.Build.props b/Directory.Build.props index a8b019b7..48671296 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ net6.0 net6.0 net6.0 - 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;linux-x64 + 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 true true diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index 0821de09..0c1602f0 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -146,6 +146,14 @@ steps: archiveType: tar archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-osx-x64-net6.0.tar.gz' +- task: ArchiveFiles@1 + displayName: 'Archive osx arm build' + inputs: + rootFolder: '$(Build.SourcesDirectory)/artifacts/publish/Microsoft.SqlTools.ServiceLayer/osx-arm64/net6.0' + includeRootFolder: false + archiveType: tar + archiveFile: '$(Build.SourcesDirectory)/artifacts/package/Microsoft.SqlTools.ServiceLayer-osx-arm64-net6.0.tar.gz' + - task: ArchiveFiles@1 displayName: 'Archive rhel build' inputs: diff --git a/build.cake b/build.cake index 00741346..da6d1aa5 100644 --- a/build.cake +++ b/build.cake @@ -121,6 +121,7 @@ Task("PopulateRuntimes") "opensuse.13.2-x64", "osx.10.11-x64", "osx-x64", + "osx-arm64", "linux-x64" }; }); diff --git a/build.json b/build.json index f9081f2e..7e44525f 100644 --- a/build.json +++ b/build.json @@ -44,6 +44,7 @@ "runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService", "runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService", "runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService", - "runtime.win-x64.native.Microsoft.SqlToolsService" + "runtime.win-x64.native.Microsoft.SqlToolsService", + "runtime.osx-arm64.native.Microsoft.SqlToolsService" ] } \ No newline at end of file diff --git a/global.json b/global.json index 93dd4113..76b8d414 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.201" + "version": "6.0.301" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.2.9" diff --git a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj index 60d5d7d0..9424e748 100644 --- a/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj +++ b/packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj @@ -15,17 +15,19 @@ + - + +