From 96bca90000512f58c573b7a85f67b282523e8b9c Mon Sep 17 00:00:00 2001 From: Curtis Carter Date: Mon, 21 Sep 2020 07:58:59 -0500 Subject: [PATCH] Fixing Enum Deserialization for Logging It was defaulting to integers instead of strings --- Src/NuGetDefense/Configuration/Settings.cs | 4 ++++ Src/NuGetDefense/NuGetDefense.csproj | 8 ++++---- Src/NuGetDefense/NuGetDefense.nuspec | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Src/NuGetDefense/Configuration/Settings.cs b/Src/NuGetDefense/Configuration/Settings.cs index 753d5407..59f1adc8 100644 --- a/Src/NuGetDefense/Configuration/Settings.cs +++ b/Src/NuGetDefense/Configuration/Settings.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using System.Text.Json; +using System.Text.Json.Serialization; using System.Threading; using NuGetDefense.Core; @@ -90,6 +91,7 @@ private static Settings LoadSettingsFile(string settingsFilePath) PropertyNameCaseInsensitive = true, ReadCommentHandling = JsonCommentHandling.Skip, AllowTrailingCommas = true, + Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase)}, }; settings = JsonSerializer.Deserialize(settingsFileContents, ops); @@ -127,6 +129,8 @@ private static bool SaveSettings(Settings settings, string settingsFilePath) IgnoreNullValues = true, AllowTrailingCommas = true, WriteIndented = true, + Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase)}, + }; try diff --git a/Src/NuGetDefense/NuGetDefense.csproj b/Src/NuGetDefense/NuGetDefense.csproj index cb27cd3d..088d992d 100644 --- a/Src/NuGetDefense/NuGetDefense.csproj +++ b/Src/NuGetDefense/NuGetDefense.csproj @@ -20,11 +20,11 @@ - + - - - + + + diff --git a/Src/NuGetDefense/NuGetDefense.nuspec b/Src/NuGetDefense/NuGetDefense.nuspec index d60293f5..aaf689bc 100644 --- a/Src/NuGetDefense/NuGetDefense.nuspec +++ b/Src/NuGetDefense/NuGetDefense.nuspec @@ -3,7 +3,7 @@ NuGetDefense NuGetDefense - 1.0.8 + 1.0.9 Curtis Carter Curtis Carter https://digitalcoyote.github.io/NuGetDefense/