From 0ca1b0aa7a428eda12c8f8acf4b31779add5997c Mon Sep 17 00:00:00 2001
From: Rob Wood <rob@rnwood.co.uk>
Date: Sun, 10 Jul 2022 07:50:12 +0100
Subject: [PATCH] chore(CI) Fix bad merge breaking build.

---
 Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs | 4 ++--
 Rnwood.Smtp4dev/Program.cs                       | 1 -
 Rnwood.Smtp4dev/Server/RelayOptions.cs           | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs b/Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs
index c698c389e..71e9b5f6e 100644
--- a/Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs
+++ b/Rnwood.Smtp4dev/ApiModel/MessageEntitySummary.cs
@@ -1,10 +1,10 @@
-using Newtonsoft.Json;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using MimeKit;
 using System.Collections;
+using System.Text.Json.Serialization;
 
 namespace Rnwood.Smtp4dev.ApiModel
 {
diff --git a/Rnwood.Smtp4dev/Program.cs b/Rnwood.Smtp4dev/Program.cs
index 56975b6eb..d09732e21 100644
--- a/Rnwood.Smtp4dev/Program.cs
+++ b/Rnwood.Smtp4dev/Program.cs
@@ -17,7 +17,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Mono.Options;
-using Newtonsoft.Json.Linq;
 using Rnwood.Smtp4dev.Server;
 using Rnwood.Smtp4dev.Service;
 using Serilog;
diff --git a/Rnwood.Smtp4dev/Server/RelayOptions.cs b/Rnwood.Smtp4dev/Server/RelayOptions.cs
index 83c18b1e1..96a47ce31 100644
--- a/Rnwood.Smtp4dev/Server/RelayOptions.cs
+++ b/Rnwood.Smtp4dev/Server/RelayOptions.cs
@@ -1,5 +1,6 @@
 using Ardalis.GuardClauses;
 using MailKit.Security;
+using System.Text.Json.Serialization;
 
 namespace Rnwood.Smtp4dev.Server
 {
@@ -30,8 +31,7 @@ public int SmtpPort
 
         public string Password { get; set; } = "";
 
-        [Newtonsoft.Json.JsonIgnore]
-        [System.Text.Json.Serialization.JsonIgnore]
+        [JsonIgnore]
         public string AutomaticEmailsString
         {
             get => string.Join(",", AutomaticEmails);