From 239cde86f0f458863f76f063a09eb7fc0d64ecfa Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Wed, 30 Sep 2015 18:04:18 +1300 Subject: [PATCH] -Added support for immutable collections to Portable .NET 4.0 build --- Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj | 1 + Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs | 2 +- Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs | 2 +- Src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj index a77ce560..2bb9aa2e 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Portable40.csproj @@ -224,6 +224,7 @@ + diff --git a/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs b/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs index d2df403c..736abdc3 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonArrayContract.cs @@ -212,7 +212,7 @@ namespace Newtonsoft.Json.Serialization } #endif -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) Type immutableCreatedType; ObjectConstructor immutableParameterizedCreator; if (ImmutableCollectionsUtils.TryBuildImmutableForArrayContract(underlyingType, CollectionItemType, out immutableCreatedType, out immutableParameterizedCreator)) diff --git a/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs b/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs index 7e016130..b79d48bf 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs @@ -176,7 +176,7 @@ namespace Newtonsoft.Json.Serialization } #endif -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) Type immutableCreatedType; ObjectConstructor immutableParameterizedCreator; if (ImmutableCollectionsUtils.TryBuildImmutableForDictionaryContract(underlyingType, DictionaryKeyType, DictionaryValueType, out immutableCreatedType, out immutableParameterizedCreator)) diff --git a/Src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs b/Src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs index f18d8442..2a438199 100644 --- a/Src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs +++ b/Src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs @@ -23,7 +23,7 @@ // OTHER DEALINGS IN THE SOFTWARE. #endregion -#if !(NET20 || NET35 || NET40 || PORTABLE40) +#if !(NET20 || NET35 || NET40) using System; using System.Collections.Generic; using System.Linq;