-Added additional frameworks to project.json files

This commit is contained in:
James Newton-King
2015-08-22 19:08:40 +12:00
parent 6b02abe20c
commit a9ea63da59
142 changed files with 1090 additions and 222 deletions
+2 -2
View File
@@ -29,7 +29,7 @@ using System.Globalization;
using System.IO;
using System.Reflection;
using System.Text.RegularExpressions;
#if NET20
#if (NET20 || NET35)
using Newtonsoft.Json.Serialization;
#else
using System.Runtime.Serialization.Json;
@@ -196,7 +196,7 @@ namespace Newtonsoft.Json.Tests
[TestFixture]
public abstract class TestFixtureBase
{
#if !NET20
#if !(NET20 || NET35)
protected string GetDataContractJsonSerializeResult(object o)
{
MemoryStream ms = new MemoryStream();