Add osx-arm runtime to build (#1545)

Directory.Build.props

@@ -8,7 +8,7 @@
     <CredentialsTargetFramework>net6.0</CredentialsTargetFramework>
     <ServiceLayerTargetFramework>net6.0</ServiceLayerTargetFramework>
     <ResourceProviderTargetFramework>net6.0</ResourceProviderTargetFramework>
-    <ToolsServiceTargetRuntimes>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</ToolsServiceTargetRuntimes>
+    <ToolsServiceTargetRuntimes>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</ToolsServiceTargetRuntimes>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <!-- This is required for IDE0005 to fail the build https://github.com/dotnet/roslyn/issues/41640 -->

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:

build.cake

@@ -121,6 +121,7 @@ Task("PopulateRuntimes")
                 "opensuse.13.2-x64",
                 "osx.10.11-x64",
                 "osx-x64",
+                "osx-arm64",
                 "linux-x64"
             };
 });

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"
   ]
 }

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.201"
+        "version": "6.0.301"
     },
     "msbuild-sdks": {
       "Microsoft.Build.NoTargets": "3.2.9"

packages/Microsoft.SqlToolsService/Microsoft.SqlToolsService.csproj

@@ -15,17 +15,19 @@
     <ProjectReference Include="../runtime.linux-x64.native.Microsoft.SqlToolsService/runtime.linux-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService/runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
+    <ProjectReference Include="../runtime.osx-arm64.native.Microsoft.SqlToolsService/runtime.osx-arm64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService/runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
     <ProjectReference Include="../runtime.win-x64.native.Microsoft.SqlToolsService/runtime.win-x64.native.Microsoft.SqlToolsService.csproj" PrivateAssets="All" />
-  </ItemGroup>
+     </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="runtime.linux-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.debian.8-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.opensuse.13.2-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.osx-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
+    <PackageReference Include="runtime.osx-arm64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.rhel.7.2-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />
     <PackageReference Include="runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService" VersionOverride="$(PackageVersion)" />