chore(CI) Fix bad merge breaking build.

rnwood · Jul 10, 2022 · 0ca1b0a · 0ca1b0a
1 parent d3ea366
commit 0ca1b0a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);