Skip to content

Commit 032cbc6

Browse files
committed
Merge remote-tracking branch 'origin/v3.5'
2 parents a39b14e + 6e793d6 commit 032cbc6

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/NerdBank.GitVersioning/Nerdbank.GitVersioning.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0182" PrivateAssets="none" />
1414
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
1515
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.478-beta" PrivateAssets="all" />
16-
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
16+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1717
<PackageReference Include="Validation" Version="2.5.51" />
1818
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="3.4.173-alpha" />
1919
<PackageReference Include="System.Text.Json" Version="4.7.2" />

src/NerdBank.GitVersioning/VersionOptions.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.Reflection;
77
using Newtonsoft.Json;
88
using Newtonsoft.Json.Converters;
9+
using Newtonsoft.Json.Serialization;
910
using Validation;
1011
using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute;
1112
using EditorBrowsableState = System.ComponentModel.EditorBrowsableState;
@@ -594,7 +595,7 @@ public static JsonSerializerSettings GetJsonSettings(bool includeDefaults = fals
594595
new VersionConverter(),
595596
new SemanticVersionJsonConverter(),
596597
new AssemblyVersionOptionsConverter(includeDefaults),
597-
new StringEnumConverter() { CamelCaseText = true },
598+
new StringEnumConverter() { NamingStrategy = new CamelCaseNamingStrategy() },
598599
new FilterPathJsonConverter(repoRelativeBaseDirectory),
599600
},
600601
ContractResolver = new VersionOptionsContractResolver

0 commit comments

Comments
 (0)