Skip to content

Commit

Permalink
Rollback Newtonsoft.Json 12 upgrade
Browse files Browse the repository at this point in the history
Fixes #306
  • Loading branch information
AArnott committed Jun 19, 2019
1 parent 92a5558 commit f2ecae3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<PackageReference Include="DotNetMDDocs" Version="0.111.0" PrivateAssets="all" Condition=" '$(GenerateMarkdownApiDocs)' == 'true' " />
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0007" PrivateAssets="none" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="System.Diagnostics.Tools" Version="4.3.0" Condition=" '$(TargetFramework)' == 'netcoreapp2.0' " />
<PackageReference Include="Validation" Version="2.4.18" />
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="1.6.20-beta-gfea83a8c9e" />
Expand Down
3 changes: 1 addition & 2 deletions src/NerdBank.GitVersioning/VersionOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using System.Reflection;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using Validation;

/// <summary>
Expand Down Expand Up @@ -209,7 +208,7 @@ public static JsonSerializerSettings GetJsonSettings(bool includeDefaults = fals
new VersionConverter(),
new SemanticVersionJsonConverter(),
new AssemblyVersionOptionsConverter(includeDefaults),
new StringEnumConverter() { NamingStrategy = new CamelCaseNamingStrategy() },
new StringEnumConverter() { CamelCaseText = true },
},
ContractResolver = new VersionOptionsContractResolver
{
Expand Down

0 comments on commit f2ecae3

Please sign in to comment.