From e261d77bb8a1712a1538e36b98c7c8f27126130c Mon Sep 17 00:00:00 2001
From: Karl Burtram <karlb@microsoft.com>
Date: Tue, 26 Mar 2019 18:34:28 -0700
Subject: [PATCH] Fix "Save to CSV" CodePages assembly version mismatch (#790)

* Fix "Save to CSV" CodePages assembly version mismatch

* Add comment to delete packagereference once moving off preview version
---
 build.json                                                    | 4 ++--
 .../Microsoft.SqlTools.Credentials.csproj                     | 3 +++
 .../Microsoft.SqlTools.ResourceProvider.csproj                | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.json b/build.json
index d3c0b1c9..c18a6155 100644
--- a/build.json
+++ b/build.json
@@ -16,9 +16,9 @@
     "netcoreapp2.2"
   ],
   "MainProjects": [     
-    "Microsoft.SqlTools.ServiceLayer",
     "Microsoft.SqlTools.Credentials",
-    "Microsoft.SqlTools.ResourceProvider"
+    "Microsoft.SqlTools.ResourceProvider",
+    "Microsoft.SqlTools.ServiceLayer"
   ],
   "PackageProjects": [
     "Microsoft.SqlTools.CoreServices",
diff --git a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
index 8aa493f2..99d55c87 100644
--- a/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
+++ b/src/Microsoft.SqlTools.Credentials/Microsoft.SqlTools.Credentials.csproj
@@ -28,6 +28,9 @@
     <PackageReference Include="System.Composition" Version="1.1.0" />
     <PackageReference Include="Newtonsoft.Json" Version="10.0.2" />
     <PackageReference Include="System.Security.Permissions" Version="4.5.0" />
+
+    <!-- delete reference from project once moving off preview version !-->
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview3-26501-04" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="**\*.cs" />
diff --git a/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj b/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj
index c3703890..7a148110 100644
--- a/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj
+++ b/src/Microsoft.SqlTools.ResourceProvider/Microsoft.SqlTools.ResourceProvider.csproj
@@ -19,6 +19,10 @@
     <DefineConstants>TRACE;DEBUG;NETCOREAPP1_0;NETCOREAPP2_0</DefineConstants>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- delete reference from project once moving off preview version !-->
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.6.0-preview3-26501-04" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.SqlTools.Hosting\Microsoft.SqlTools.Hosting.csproj" />
     <!-- Note: must reference the resource provider projects in order for them to be bundled into the app. Otherwise will not have any of the required DLLs and