Merge pull request #11 from Microsoft/dev/andarno/netstandard

Support netstandard1.1

src/StreamJsonRpc.Desktop/project.json

@@ -22,7 +22,7 @@
       "suppressParent": "none"
     },
     "Newtonsoft.Json": "6.0.6",
-    "Microsoft.VisualStudio.Threading": "15.0.208"
+    "Microsoft.VisualStudio.Threading": "15.0.224"
   },
   "frameworks": {
     "net45": { }

src/StreamJsonRpc.NuGet/StreamJsonRpc.NuGet.nuproj

@@ -15,7 +15,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <NuSpecTemplate>StreamJsonRpc.nuspec</NuSpecTemplate>
-    <NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.10.48-beta-gea4a31bbc5\tools\</NuProjPath>
+    <NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.11.14-beta\tools\</NuProjPath>
   </PropertyGroup>
   <Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
   <PropertyGroup Label="Configuration">
@@ -31,6 +31,8 @@
     <LicenseUrl>https://raw.githubusercontent.com/Microsoft/vs-streamjsonrpc/$GitCommitIdShort$/LICENSE</LicenseUrl>
     <Copyright>Copyright © Microsoft</Copyright>
     <Tags>ServiceHub</Tags>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <NoDefaultExcludes>false</NoDefaultExcludes>
   </PropertyGroup>
   <ItemGroup>
     <None Include="project.json" />
@@ -52,6 +54,12 @@
         <TargetPath Condition=" '%(File.WithCulture)' == 'true' ">lib\dotnet\%(File.Culture)\%(FileName)%(Extension)</TargetPath>
         <TargetPath Condition=" '%(File.MSBuildSourceTargetName)' == 'SatelliteDllsProjectOutputGroup' ">lib\dotnet\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(Identity)))))\%(FileName)%(Extension)</TargetPath>
       </File>
-    </ItemGroup>
+      <File Include="@(File)"
+            Condition=" '%(File.TargetFrameworkMoniker)' == '.NETPortable,Version=v4.5,Profile=Profile111' ">
+        <TargetPath Condition=" '%(File.WithCulture)' != 'true' ">lib\netstandard1.1\%(FileName)%(Extension)</TargetPath>
+        <TargetPath Condition=" '%(File.WithCulture)' == 'true' ">lib\netstandard1.1\%(File.Culture)\%(FileName)%(Extension)</TargetPath>
+        <TargetPath Condition=" '%(File.MSBuildSourceTargetName)' == 'SatelliteDllsProjectOutputGroup' ">lib\netstandard1.1\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(Identity)))))\%(FileName)%(Extension)</TargetPath>
+      </File>
+     </ItemGroup>
   </Target>
 </Project>

src/StreamJsonRpc.NuGet/StreamJsonRpc.nuspec

@@ -14,8 +14,8 @@
       <group targetFramework="dotnet">
         <dependency id="System.Reflection.TypeExtensions" version="4.0.0" />
         <dependency id="Microsoft.CSharp" version="4.0.0" />
-        <dependency id="Microsoft.VisualStudio.Threading" version="15.0.208" />
-        <dependency id="Microsoft.VisualStudio.Validation" version="15.0.75" />
+        <dependency id="Microsoft.VisualStudio.Threading" version="15.0.224" />
+        <dependency id="Microsoft.VisualStudio.Validation" version="15.0.82" />
         <dependency id="Newtonsoft.Json" version="6.0.6" />
         <dependency id="System.Collections" version="4.0.0" />
         <dependency id="System.Diagnostics.Debug" version="4.0.0" />
@@ -33,8 +33,12 @@
         <dependency id="System.Threading" version="4.0.0" />
         <dependency id="System.Threading.Tasks" version="4.0.0" />
       </group>
+      <group targetFramework="netstandard1.1">
+        <dependency id="Microsoft.VisualStudio.Threading" version="15.0.224" />
+        <dependency id="Newtonsoft.Json" version="9.0.1" />
+      </group>
       <group targetFramework="net45">
-        <dependency id="Microsoft.VisualStudio.Threading" version="15.0.208" />
+        <dependency id="Microsoft.VisualStudio.Threading" version="15.0.224" />
         <dependency id="Newtonsoft.Json" version="6.0.6" />
       </group>
     </dependencies>

src/StreamJsonRpc.NuGet/project.json

@@ -15,7 +15,7 @@
       "version": "1.5.46",
       "suppressParent": "none"
     },
-    "NuProj": "0.10.48-beta-gea4a31bbc5",
+    "NuProj": "0.11.14-beta",
     "ReadOnlySourceTree": {
       "version": "0.1.36-beta",
       "suppressParent": "none"

src/StreamJsonRpc/project.json

@@ -18,7 +18,7 @@
     },
     "Newtonsoft.Json": "6.0.6",
     "NuSpec.ReferenceGenerator": "1.4.2",
-    "Microsoft.VisualStudio.Threading": "15.0.208",
+    "Microsoft.VisualStudio.Threading": "15.0.224",
     "PdbGit": "3.0.41",
     "ReadOnlySourceTree": {
       "version": "0.1.36-beta",