Use netstandard for coreservices DLL (#676)

* Use netstandard for coreservices DLL
- This is possible thanks to recent updates that target SMO bits using netstandard

* Fix localization failure during dotnet pack
- Namespace changes on SRGen, so updated references to accept the name change
This commit is contained in:
Kevin Cunnane
2018-08-07 14:49:27 -07:00
committed by GitHub
parent 71195869e1
commit d9e8d5ac12
9 changed files with 11 additions and 5 deletions

View File

@@ -248,7 +248,7 @@ Task("DotnetPack")
{ {
StandardOutputListing = runLog StandardOutputListing = runLog
}) })
.ExceptionOnError($"Packaging test {project} failed."); .ExceptionOnError($"Packaging {project} failed.");
System.IO.File.WriteAllLines(System.IO.Path.Combine(logFolder, $"{project}-pack.log"), runLog.ToArray()); System.IO.File.WriteAllLines(System.IO.Path.Combine(logFolder, $"{project}-pack.log"), runLog.ToArray());
} }
}); });
@@ -501,8 +501,8 @@ Task("All")
.IsDependentOn("Cleanup") .IsDependentOn("Cleanup")
.IsDependentOn("Restore") .IsDependentOn("Restore")
.IsDependentOn("TestAll") .IsDependentOn("TestAll")
.IsDependentOn("AllPublish")
.IsDependentOn("DotnetPack") .IsDependentOn("DotnetPack")
.IsDependentOn("AllPublish")
//.IsDependentOn("TestPublished") //.IsDependentOn("TestPublished")
.Does(() => .Does(() =>
{ {

View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFramework>netcoreapp2.1</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Microsoft.SqlTools.CoreServices</PackageId> <PackageId>Microsoft.SqlTools.CoreServices</PackageId>
<AssemblyName>Microsoft.SqlTools.CoreServices</AssemblyName> <AssemblyName>Microsoft.SqlTools.CoreServices</AssemblyName>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems> <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>

View File

@@ -9,6 +9,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using Microsoft.SqlTools.Hosting.Utility; using Microsoft.SqlTools.Hosting.Utility;
using Microsoft.SqlTools.Hosting.v2;
namespace Microsoft.SqlTools.Hosting.Extensibility namespace Microsoft.SqlTools.Hosting.Extensibility
{ {

View File

@@ -3,7 +3,7 @@
// from information in sr.strings // from information in sr.strings
// DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN // DO NOT MODIFY THIS FILE'S CONTENTS, THEY WILL BE OVERWRITTEN
// //
namespace Microsoft.SqlTools.Hosting namespace Microsoft.SqlTools.Hosting.v2
{ {
using System; using System;
using System.Reflection; using System.Reflection;
@@ -149,7 +149,7 @@ namespace Microsoft.SqlTools.Hosting
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class Keys public class Keys
{ {
static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.Hosting.Localization.SR", typeof(SR).GetTypeInfo().Assembly); static ResourceManager resourceManager = new ResourceManager("Microsoft.SqlTools.Hosting.v2.Localization.SR", typeof(SR).GetTypeInfo().Assembly);
static CultureInfo _culture = null; static CultureInfo _culture = null;

View File

@@ -4,6 +4,7 @@
// //
using System; using System;
using Microsoft.SqlTools.Hosting.v2;
namespace Microsoft.SqlTools.Hosting.Protocol namespace Microsoft.SqlTools.Hosting.Protocol
{ {

View File

@@ -13,6 +13,7 @@ using Microsoft.SqlTools.Hosting.Channels;
using Microsoft.SqlTools.Hosting.Contracts; using Microsoft.SqlTools.Hosting.Contracts;
using Microsoft.SqlTools.Hosting.Contracts.Internal; using Microsoft.SqlTools.Hosting.Contracts.Internal;
using Microsoft.SqlTools.Hosting.Utility; using Microsoft.SqlTools.Hosting.Utility;
using Microsoft.SqlTools.Hosting.v2;
namespace Microsoft.SqlTools.Hosting.Protocol namespace Microsoft.SqlTools.Hosting.Protocol
{ {

View File

@@ -7,6 +7,7 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using Microsoft.SqlTools.Hosting.Contracts; using Microsoft.SqlTools.Hosting.Contracts;
using Microsoft.SqlTools.Hosting.Contracts.Internal; using Microsoft.SqlTools.Hosting.Contracts.Internal;
using Microsoft.SqlTools.Hosting.v2;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json.Serialization; using Newtonsoft.Json.Serialization;

View File

@@ -9,6 +9,7 @@ using System.IO;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.SqlTools.Hosting.Utility; using Microsoft.SqlTools.Hosting.Utility;
using Microsoft.SqlTools.Hosting.v2;
namespace Microsoft.SqlTools.Hosting.Protocol namespace Microsoft.SqlTools.Hosting.Protocol
{ {

View File

@@ -4,6 +4,7 @@
// //
using System; using System;
using Microsoft.SqlTools.Hosting.v2;
namespace Microsoft.SqlTools.Hosting.Utility namespace Microsoft.SqlTools.Hosting.Utility
{ {