From 47cca6717dcea09a25769f07e84e8fcd9d270bd9 Mon Sep 17 00:00:00 2001
From: Charles Gagnon <chgagnon@microsoft.com>
Date: Tue, 16 Nov 2021 14:00:10 -0800
Subject: [PATCH] Fix RID package paths (#1307)

---
 packages/Directory.Build.props                           | 2 +-
 ...ntime.osx-x64.native.Microsoft.SqlToolsService.csproj | 9 ---------
 ...osx.10.11-x64.native.Microsoft.SqlToolsService.csproj | 9 +++++++++
 ...ntu.14.04-x64.native.Microsoft.SqlToolsService.csproj | 4 ++--
 ...ntu.16.04-x64.native.Microsoft.SqlToolsService.csproj | 2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj
 create mode 100644 packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj

diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props
index 9e06cbb9..d83dc5f2 100644
--- a/packages/Directory.Build.props
+++ b/packages/Directory.Build.props
@@ -15,7 +15,7 @@
     it's only the release pipeline that generates the tag to use for the Github release. This
     is a workaround to get releases out until the pipelines can be refactored to pass in
     the correct version -->
-    <PackageVersion>3.0.0-release.156</PackageVersion>
+    <PackageVersion>3.0.0-release.157</PackageVersion>
     <PackageLicenseExpression></PackageLicenseExpression>
     <PackageLicenseFile>license/license.txt</PackageLicenseFile>
     <PackageIcon>images\sqlserver.png</PackageIcon>
diff --git a/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj
deleted file mode 100644
index b1ada5ed..00000000
--- a/packages/runtime.osx-x64.native.Microsoft.SqlToolsService/runtime.osx-x64.native.Microsoft.SqlToolsService.csproj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.Build.NoTargets">
-  <PropertyGroup>
-    <PackageDescription>SQL Tools Service application for the osx-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly.</PackageDescription>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/osx-x64/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/osx-x64/native" />
-  </ItemGroup>
-</Project>
diff --git a/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj
new file mode 100644
index 00000000..36083946
--- /dev/null
+++ b/packages/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService/runtime.osx.10.11-x64.native.Microsoft.SqlToolsService.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <PackageDescription>SQL Tools Service application for the osx.10.11-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly.</PackageDescription>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/osx.10.11-x64/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/osx.10.11-x64/native" />
+  </ItemGroup>
+</Project>
diff --git a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj
index 248b639e..51254e53 100644
--- a/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj
+++ b/packages/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.14.04-x64.native.Microsoft.SqlToolsService.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
-    <PackageDescription>SQL Tools Service application for the ubuntu.14.04 runtime. This package is intended to be used by internal applications only and should not be referenced directly.</PackageDescription>
+    <PackageDescription>SQL Tools Service application for the ubuntu.14.04-x64 runtime. This package is intended to be used by internal applications only and should not be referenced directly.</PackageDescription>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/ubuntu.14.04/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/ubuntu.14.04-x64/native" />
+    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/ubuntu.14.04-x64/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/ubuntu.14.04-x64/native" />
   </ItemGroup>
 </Project>
diff --git a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj b/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj
index d94e6e42..360bda3e 100644
--- a/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj
+++ b/packages/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService/runtime.ubuntu.16.04-x64.native.Microsoft.SqlToolsService.csproj
@@ -4,6 +4,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/ubuntu.16.04/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/ubuntu.16.04-x64/native" />
+    <None Include="../../artifacts/publish/Microsoft.SqlTools.ServiceLayer/ubuntu.16.04-x64/$(TargetFramework)/**" Pack="true" PackagePath="runtimes/ubuntu.16.04-x64/native" />
   </ItemGroup>
 </Project>