Skip to content

Commit

Permalink
Bump Newtonsoft.Json from 9.0.1 to 13.0.1 in /src/NerdBank.GitVersion…
Browse files Browse the repository at this point in the history
…ing (#777)

* Bump Newtonsoft.Json from 9.0.1 to 13.0.1 in /src/NerdBank.GitVersioning

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 9.0.1 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](JamesNK/Newtonsoft.Json@9.0.1...13.0.1)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix build warning after Newtonsoft.Json upgrade

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Arnott <andrew.arnott@microsoft.com>
  • Loading branch information
dependabot[bot] and AArnott committed Jul 12, 2022
1 parent 6463ef6 commit 6e793d6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/NerdBank.GitVersioning/NerdBank.GitVersioning.csproj
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="LibGit2Sharp" Version="0.27.0-preview-0158" PrivateAssets="none" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.478-beta" PrivateAssets="all" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
<PackageReference Include="Validation" Version="2.5.51" />
<PackageReference Include="Nerdbank.GitVersioning.LKG" Version="3.4.173-alpha" />
Expand Down
3 changes: 2 additions & 1 deletion src/NerdBank.GitVersioning/VersionOptions.cs
Expand Up @@ -10,6 +10,7 @@ namespace Nerdbank.GitVersioning
using System.Reflection;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using Validation;
using EditorBrowsableAttribute = System.ComponentModel.EditorBrowsableAttribute;
using EditorBrowsableState = System.ComponentModel.EditorBrowsableState;
Expand Down Expand Up @@ -493,7 +494,7 @@ public static JsonSerializerSettings GetJsonSettings(bool includeDefaults = fals
new VersionConverter(),
new SemanticVersionJsonConverter(),
new AssemblyVersionOptionsConverter(includeDefaults),
new StringEnumConverter() { CamelCaseText = true },
new StringEnumConverter() { NamingStrategy = new CamelCaseNamingStrategy() },
new FilterPathJsonConverter(repoRelativeBaseDirectory),
},
ContractResolver = new VersionOptionsContractResolver
Expand Down

0 comments on commit 6e793d6

Please sign in to comment.