-Increment prerelease to beta3

-Remove internals from ResolvePropertyName
This commit is contained in:
James Newton-King
2015-05-03 19:46:59 +12:00
parent e1233d22d8
commit e8f4589e53
4 changed files with 5 additions and 6 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
$zipFileName = "Json70r1.zip" $zipFileName = "Json70r1.zip"
$majorVersion = "7.0" $majorVersion = "7.0"
$majorWithReleaseVersion = "7.0.1" $majorWithReleaseVersion = "7.0.1"
$nugetPrelease = "beta2" $nugetPrelease = "beta3"
$version = GetVersion $majorWithReleaseVersion $version = GetVersion $majorWithReleaseVersion
$packageId = "Newtonsoft.Json" $packageId = "Newtonsoft.Json"
$signAssemblies = $false $signAssemblies = $false
@@ -536,12 +536,11 @@ namespace Newtonsoft.Json.Tests.Converters
public class LowercaseContractResolver : DefaultContractResolver public class LowercaseContractResolver : DefaultContractResolver
{ {
protected internal override string ResolvePropertyName(string propertyName) protected override string ResolvePropertyName(string propertyName)
{ {
return propertyName.ToLower(); return propertyName.ToLower();
} }
} }
} }
} }
#endif #endif
@@ -48,7 +48,7 @@ namespace Newtonsoft.Json.Serialization
/// </summary> /// </summary>
/// <param name="propertyName">Name of the property.</param> /// <param name="propertyName">Name of the property.</param>
/// <returns>The property name camel cased.</returns> /// <returns>The property name camel cased.</returns>
protected internal override string ResolvePropertyName(string propertyName) protected override string ResolvePropertyName(string propertyName)
{ {
// lower case the first letter of the passed in name // lower case the first letter of the passed in name
return StringUtils.ToCamelCase(propertyName); return StringUtils.ToCamelCase(propertyName);
@@ -1361,7 +1361,7 @@ namespace Newtonsoft.Json.Serialization
/// </summary> /// </summary>
/// <param name="propertyName">Name of the property.</param> /// <param name="propertyName">Name of the property.</param>
/// <returns>Resolved name of the property.</returns> /// <returns>Resolved name of the property.</returns>
protected internal virtual string ResolvePropertyName(string propertyName) protected virtual string ResolvePropertyName(string propertyName)
{ {
return propertyName; return propertyName;
} }
@@ -1371,7 +1371,7 @@ namespace Newtonsoft.Json.Serialization
/// </summary> /// </summary>
/// <param name="dictionaryKey">Key of the dictionary.</param> /// <param name="dictionaryKey">Key of the dictionary.</param>
/// <returns>Resolved key of the dictionary.</returns> /// <returns>Resolved key of the dictionary.</returns>
protected internal virtual string ResolveDictionaryKey(string dictionaryKey) protected virtual string ResolveDictionaryKey(string dictionaryKey)
{ {
return ResolvePropertyName(dictionaryKey); return ResolvePropertyName(dictionaryKey);
} }