Skip to content

Commit e8f4589

Browse files
committed
-Increment prerelease to beta3
-Remove internals from ResolvePropertyName
1 parent e1233d2 commit e8f4589

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

Build/build.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$zipFileName = "Json70r1.zip"
33
$majorVersion = "7.0"
44
$majorWithReleaseVersion = "7.0.1"
5-
$nugetPrelease = "beta2"
5+
$nugetPrelease = "beta3"
66
$version = GetVersion $majorWithReleaseVersion
77
$packageId = "Newtonsoft.Json"
88
$signAssemblies = $false

Src/Newtonsoft.Json.Tests/Converters/DataSetConverterTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
536536

537537
public class LowercaseContractResolver : DefaultContractResolver
538538
{
539-
protected internal override string ResolvePropertyName(string propertyName)
539+
protected override string ResolvePropertyName(string propertyName)
540540
{
541541
return propertyName.ToLower();
542542
}
543543
}
544544
}
545545
}
546-
547546
#endif

Src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public CamelCasePropertyNamesContractResolver()
4848
/// </summary>
4949
/// <param name="propertyName">Name of the property.</param>
5050
/// <returns>The property name camel cased.</returns>
51-
protected internal override string ResolvePropertyName(string propertyName)
51+
protected override string ResolvePropertyName(string propertyName)
5252
{
5353
// lower case the first letter of the passed in name
5454
return StringUtils.ToCamelCase(propertyName);

Src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,7 @@ private void SetIsSpecifiedActions(JsonProperty property, MemberInfo member, boo
13611361
/// </summary>
13621362
/// <param name="propertyName">Name of the property.</param>
13631363
/// <returns>Resolved name of the property.</returns>
1364-
protected internal virtual string ResolvePropertyName(string propertyName)
1364+
protected virtual string ResolvePropertyName(string propertyName)
13651365
{
13661366
return propertyName;
13671367
}
@@ -1371,7 +1371,7 @@ protected internal virtual string ResolvePropertyName(string propertyName)
13711371
/// </summary>
13721372
/// <param name="dictionaryKey">Key of the dictionary.</param>
13731373
/// <returns>Resolved key of the dictionary.</returns>
1374-
protected internal virtual string ResolveDictionaryKey(string dictionaryKey)
1374+
protected virtual string ResolveDictionaryKey(string dictionaryKey)
13751375
{
13761376
return ResolvePropertyName(dictionaryKey);
13771377
}

0 commit comments

Comments
 (0)