From e8f4589e53f0a2295957bda6c9edf4995d4b6fb8 Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Sun, 3 May 2015 19:46:59 +1200 Subject: [PATCH] -Increment prerelease to beta3 -Remove internals from ResolvePropertyName --- Build/build.ps1 | 2 +- Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs | 3 +-- .../Serialization/CamelCasePropertyNamesContractResolver.cs | 2 +- Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Build/build.ps1 b/Build/build.ps1 index 3cbe8b81..de1e238f 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -2,7 +2,7 @@ $zipFileName = "Json70r1.zip" $majorVersion = "7.0" $majorWithReleaseVersion = "7.0.1" - $nugetPrelease = "beta2" + $nugetPrelease = "beta3" $version = GetVersion $majorWithReleaseVersion $packageId = "Newtonsoft.Json" $signAssemblies = $false diff --git a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs index e6974081..12a1f793 100644 --- a/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs @@ -536,12 +536,11 @@ namespace Newtonsoft.Json.Tests.Converters public class LowercaseContractResolver : DefaultContractResolver { - protected internal override string ResolvePropertyName(string propertyName) + protected override string ResolvePropertyName(string propertyName) { return propertyName.ToLower(); } } } } - #endif \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs b/Src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs index 8ffa3982..c49a07cf 100644 --- a/Src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs +++ b/Src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs @@ -48,7 +48,7 @@ namespace Newtonsoft.Json.Serialization /// /// Name of the property. /// The property name camel cased. - protected internal override string ResolvePropertyName(string propertyName) + protected override string ResolvePropertyName(string propertyName) { // lower case the first letter of the passed in name return StringUtils.ToCamelCase(propertyName); diff --git a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs index ef35646a..54310fcd 100644 --- a/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs +++ b/Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs @@ -1361,7 +1361,7 @@ namespace Newtonsoft.Json.Serialization /// /// Name of the property. /// Resolved name of the property. - protected internal virtual string ResolvePropertyName(string propertyName) + protected virtual string ResolvePropertyName(string propertyName) { return propertyName; } @@ -1371,7 +1371,7 @@ namespace Newtonsoft.Json.Serialization /// /// Key of the dictionary. /// Resolved key of the dictionary. - protected internal virtual string ResolveDictionaryKey(string dictionaryKey) + protected virtual string ResolveDictionaryKey(string dictionaryKey) { return ResolvePropertyName(dictionaryKey); }