Make System.Json target netstandard1.0

Build and package as a netstandard1.0 assembly.  Clean up project file.

Commit migrated from https://github.com/dotnet/corefx/commit/99dd5d4734aa59919b62bb0d46cd4b4360dd7ca7

diff --git a/src/libraries/System.Json/pkg/System.Json.pkgproj b/src/libraries/System.Json/pkg/System.Json.pkgproj
index b5fd29c..87eb80c 100644 (file)
--- a/src/libraries/System.Json/pkg/System.Json.pkgproj
+++ b/src/libraries/System.Json/pkg/System.Json.pkgproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <ItemGroup>
     <ProjectReference Include="..\src\System.Json.builds">
-      <SupportedFramework>net46;netcore50;netcoreapp1.0</SupportedFramework>
+      <SupportedFramework>net45;netcore45;netcoreapp1.0;wp8;wpa81</SupportedFramework>
     </ProjectReference>
     <InboxOnTargetFramework Include="MonoAndroid10" />
     <InboxOnTargetFramework Include="MonoTouch10" />

diff --git a/src/libraries/System.Json/src/System.Json.csproj b/src/libraries/System.Json/src/System.Json.csproj
index 9993a07..324c207 100644 (file)
--- a/src/libraries/System.Json/src/System.Json.csproj
+++ b/src/libraries/System.Json/src/System.Json.csproj
@@ -4,10 +4,8 @@
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <ProjectGuid>{2ADDB484-6F57-4D71-A3FE-A57EC6329A2B}</ProjectGuid>
-    <PackageTargetFramework>netstandard1.3</PackageTargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <UseOpenKey Condition="'$(UseOpenKey)'==''">true</UseOpenKey>
-    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
+    <PackageTargetFramework>netstandard1.0</PackageTargetFramework>
+    <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.0</NuGetTargetMoniker>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the options -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />

diff --git a/src/libraries/System.Json/src/project.json b/src/libraries/System.Json/src/project.json
index c0275d6..dc6dd4b 100644 (file)
--- a/src/libraries/System.Json/src/project.json
+++ b/src/libraries/System.Json/src/project.json
@@ -1,30 +1,13 @@
 {
   "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.0": {
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1",
-        "System.Collections": "4.0.10",
-        "System.Diagnostics.Contracts": "4.0.0",
-        "System.Diagnostics.Debug": "4.0.10",
-        "System.Diagnostics.Tools": "4.0.0",
-        "System.IO": "4.0.10",
-        "System.Linq": "4.0.0",
-        "System.Resources.ResourceManager": "4.0.0",
-        "System.Runtime": "4.0.20",
-        "System.Runtime.Extensions": "4.0.10",
-        "System.Runtime.Handles": "4.0.0",
-        "System.Runtime.InteropServices": "4.0.20",
-        "System.Text.Encoding": "4.0.10",
-        "System.Threading": "4.0.0",
-        "System.Threading.Tasks": "4.0.10"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
-    },
-    "net46": {
-      "dependencies": {
-        "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1"
+        "System.Collections": "4.0.11",
+        "System.IO": "4.1.0",
+        "System.Linq": "4.1.0",
+        "System.Runtime": "4.1.0",
+        "System.Runtime.Extensions": "4.1.0",
+        "System.Resources.ResourceManager": "4.0.1"
       }
     }
   }