From 8aaba37f2a5643801d97f28a4f5bd619ac619a8d Mon Sep 17 00:00:00 2001 From: Antony Kellermann Date: Thu, 28 Apr 2022 21:13:16 -0400 Subject: [PATCH] Fix namespaces --- .../FluentEmailServiceCollectionExtensions.cs | 4 ++-- .../FluentEmailFluidBuilderExtensions.cs | 8 +++----- src/Renderers/FluentEmail.Liquid/LiquidParser.cs | 2 ++ .../FluentEmailRazorBuilderExtensions.cs | 5 +++-- .../FluentEmailGraphBuilderExtensions.cs | 7 ++++--- .../FluentEmailMailKitBuilderExtensions.cs | 7 ++++--- .../FluentEmailMailgunBuilderExtensions.cs | 7 ++++--- .../FluentEmailMailtrapBuilderExtensions.cs | 7 ++++--- .../FluentEmailSendGridBuilderExtensions.cs | 7 ++++--- .../FluentEmailSmtpBuilderExtensions.cs | 11 ++++++----- test/FluentEmail.Core.Tests/GraphSenderTests.cs | 8 ++++---- test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs | 3 +-- test/FluentEmail.Core.Tests/MailgunSenderTests.cs | 6 +++--- test/FluentEmail.Core.Tests/MailtrapSenderTests.cs | 4 ++-- test/FluentEmail.Core.Tests/SendGridSenderTests.cs | 8 ++++---- test/FluentEmail.Core.Tests/SmtpSenderTests.cs | 4 ++-- .../ComplexModel/ParentModel.cs | 2 +- .../FluentEmail.Liquid.Tests/ComplexModel/TestData.cs | 2 +- 18 files changed, 54 insertions(+), 48 deletions(-) diff --git a/src/FluentEmail.Core/FluentEmailServiceCollectionExtensions.cs b/src/FluentEmail.Core/FluentEmailServiceCollectionExtensions.cs index a3d7925c..31d22f1f 100644 --- a/src/FluentEmail.Core/FluentEmailServiceCollectionExtensions.cs +++ b/src/FluentEmail.Core/FluentEmailServiceCollectionExtensions.cs @@ -1,9 +1,9 @@ using System; -using FluentEmail.Core; using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Core { public static class FluentEmailServiceCollectionExtensions { diff --git a/src/Renderers/FluentEmail.Liquid/FluentEmailFluidBuilderExtensions.cs b/src/Renderers/FluentEmail.Liquid/FluentEmailFluidBuilderExtensions.cs index 9da2ebf4..9d531e77 100644 --- a/src/Renderers/FluentEmail.Liquid/FluentEmailFluidBuilderExtensions.cs +++ b/src/Renderers/FluentEmail.Liquid/FluentEmailFluidBuilderExtensions.cs @@ -1,12 +1,10 @@ using System; - +using FluentEmail.Core; using FluentEmail.Core.Interfaces; -using FluentEmail.Liquid; - +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -// ReSharper disable once CheckNamespace -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Liquid { public static class FluentEmailFluidBuilderExtensions { diff --git a/src/Renderers/FluentEmail.Liquid/LiquidParser.cs b/src/Renderers/FluentEmail.Liquid/LiquidParser.cs index 00351086..22aabf04 100644 --- a/src/Renderers/FluentEmail.Liquid/LiquidParser.cs +++ b/src/Renderers/FluentEmail.Liquid/LiquidParser.cs @@ -7,6 +7,8 @@ using Fluid; using Fluid.Ast; +namespace FluentEmail.Liquid; + public class LiquidParser : FluidParser { public LiquidParser() diff --git a/src/Renderers/FluentEmail.Razor/FluentEmailRazorBuilderExtensions.cs b/src/Renderers/FluentEmail.Razor/FluentEmailRazorBuilderExtensions.cs index 52ebdcf3..9b9d51ad 100644 --- a/src/Renderers/FluentEmail.Razor/FluentEmailRazorBuilderExtensions.cs +++ b/src/Renderers/FluentEmail.Razor/FluentEmailRazorBuilderExtensions.cs @@ -1,10 +1,11 @@ using System; +using FluentEmail.Core; using FluentEmail.Core.Interfaces; -using FluentEmail.Razor; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using RazorLight.Razor; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Razor { public static class FluentEmailRazorBuilderExtensions { diff --git a/src/Senders/FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs b/src/Senders/FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs index 07806b71..bd04a478 100644 --- a/src/Senders/FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs +++ b/src/Senders/FluentEmail.Graph/FluentEmailGraphBuilderExtensions.cs @@ -1,8 +1,9 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.Graph; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Graph { public static class FluentEmailGraphBuilderExtensions { diff --git a/src/Senders/FluentEmail.MailKit/FluentEmailMailKitBuilderExtensions.cs b/src/Senders/FluentEmail.MailKit/FluentEmailMailKitBuilderExtensions.cs index d730f9b9..e67783bd 100644 --- a/src/Senders/FluentEmail.MailKit/FluentEmailMailKitBuilderExtensions.cs +++ b/src/Senders/FluentEmail.MailKit/FluentEmailMailKitBuilderExtensions.cs @@ -1,8 +1,9 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.MailKitSmtp; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.MailKitSmtp { public static class FluentEmailMailKitBuilderExtensions { diff --git a/src/Senders/FluentEmail.Mailgun/FluentEmailMailgunBuilderExtensions.cs b/src/Senders/FluentEmail.Mailgun/FluentEmailMailgunBuilderExtensions.cs index 69762e6d..61fa5b49 100644 --- a/src/Senders/FluentEmail.Mailgun/FluentEmailMailgunBuilderExtensions.cs +++ b/src/Senders/FluentEmail.Mailgun/FluentEmailMailgunBuilderExtensions.cs @@ -1,8 +1,9 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.Mailgun; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Mailgun { public static class FluentEmailMailgunBuilderExtensions { diff --git a/src/Senders/FluentEmail.Mailtrap/FluentEmailMailtrapBuilderExtensions.cs b/src/Senders/FluentEmail.Mailtrap/FluentEmailMailtrapBuilderExtensions.cs index 9d495ca8..fdc032f4 100644 --- a/src/Senders/FluentEmail.Mailtrap/FluentEmailMailtrapBuilderExtensions.cs +++ b/src/Senders/FluentEmail.Mailtrap/FluentEmailMailtrapBuilderExtensions.cs @@ -1,8 +1,9 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.Mailtrap; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Mailtrap { public static class FluentEmailMailtrapBuilderExtensions { diff --git a/src/Senders/FluentEmail.SendGrid/FluentEmailSendGridBuilderExtensions.cs b/src/Senders/FluentEmail.SendGrid/FluentEmailSendGridBuilderExtensions.cs index 048544d1..915fa3f2 100644 --- a/src/Senders/FluentEmail.SendGrid/FluentEmailSendGridBuilderExtensions.cs +++ b/src/Senders/FluentEmail.SendGrid/FluentEmailSendGridBuilderExtensions.cs @@ -1,8 +1,9 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.SendGrid; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.SendGrid { public static class FluentEmailSendGridBuilderExtensions { diff --git a/src/Senders/FluentEmail.Smtp/FluentEmailSmtpBuilderExtensions.cs b/src/Senders/FluentEmail.Smtp/FluentEmailSmtpBuilderExtensions.cs index 0fabbca8..43a39279 100644 --- a/src/Senders/FluentEmail.Smtp/FluentEmailSmtpBuilderExtensions.cs +++ b/src/Senders/FluentEmail.Smtp/FluentEmailSmtpBuilderExtensions.cs @@ -1,11 +1,12 @@ -using FluentEmail.Core.Interfaces; -using FluentEmail.Smtp; -using Microsoft.Extensions.DependencyInjection.Extensions; -using System; +using System; using System.Net; using System.Net.Mail; +using FluentEmail.Core; +using FluentEmail.Core.Interfaces; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection.Extensions; -namespace Microsoft.Extensions.DependencyInjection +namespace FluentEmail.Smtp { public static class FluentEmailSmtpBuilderExtensions { diff --git a/test/FluentEmail.Core.Tests/GraphSenderTests.cs b/test/FluentEmail.Core.Tests/GraphSenderTests.cs index 5e3d2905..ee8d484b 100644 --- a/test/FluentEmail.Core.Tests/GraphSenderTests.cs +++ b/test/FluentEmail.Core.Tests/GraphSenderTests.cs @@ -1,11 +1,11 @@ -using FluentEmail.Core; -using FluentEmail.Core.Models; -using NUnit.Framework; using System; using System.IO; using System.Threading.Tasks; +using FluentEmail.Core.Models; +using FluentEmail.Graph; +using NUnit.Framework; -namespace FluentEmail.Graph.Tests +namespace FluentEmail.Core.Tests { public class Tests { diff --git a/test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs b/test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs index 7b80921b..4da2be5d 100644 --- a/test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs +++ b/test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs @@ -1,11 +1,10 @@ using System.IO; using System.Threading.Tasks; -using FluentEmail.Core; using FluentEmail.MailKitSmtp; using NUnit.Framework; using Attachment = FluentEmail.Core.Models.Attachment; -namespace FluentEmail.MailKit.Tests +namespace FluentEmail.Core.Tests { [NonParallelizable] public class MailKitSmtpSenderTests diff --git a/test/FluentEmail.Core.Tests/MailgunSenderTests.cs b/test/FluentEmail.Core.Tests/MailgunSenderTests.cs index 40cb8bf9..08af800f 100644 --- a/test/FluentEmail.Core.Tests/MailgunSenderTests.cs +++ b/test/FluentEmail.Core.Tests/MailgunSenderTests.cs @@ -1,11 +1,11 @@ using System.IO; using System.Threading.Tasks; -using FluentEmail.Core; using FluentEmail.Core.Models; -using NUnit.Framework; +using FluentEmail.Mailgun; using Newtonsoft.Json; +using NUnit.Framework; -namespace FluentEmail.Mailgun.Tests +namespace FluentEmail.Core.Tests { public class MailgunSenderTests { diff --git a/test/FluentEmail.Core.Tests/MailtrapSenderTests.cs b/test/FluentEmail.Core.Tests/MailtrapSenderTests.cs index e192dc5f..df84f731 100644 --- a/test/FluentEmail.Core.Tests/MailtrapSenderTests.cs +++ b/test/FluentEmail.Core.Tests/MailtrapSenderTests.cs @@ -1,10 +1,10 @@ using System.IO; using System.Threading.Tasks; -using FluentEmail.Core; using FluentEmail.Core.Models; +using FluentEmail.Mailtrap; using NUnit.Framework; -namespace FluentEmail.Mailtrap.Tests +namespace FluentEmail.Core.Tests { public class MailtrapSenderTests { diff --git a/test/FluentEmail.Core.Tests/SendGridSenderTests.cs b/test/FluentEmail.Core.Tests/SendGridSenderTests.cs index 95867f07..84ec64b4 100644 --- a/test/FluentEmail.Core.Tests/SendGridSenderTests.cs +++ b/test/FluentEmail.Core.Tests/SendGridSenderTests.cs @@ -1,11 +1,11 @@ -using FluentEmail.Core; -using NUnit.Framework; -using System; +using System; using System.IO; using System.Threading.Tasks; +using FluentEmail.SendGrid; +using NUnit.Framework; using Attachment = FluentEmail.Core.Models.Attachment; -namespace FluentEmail.SendGrid.Tests +namespace FluentEmail.Core.Tests { public class SendGridSenderTests { diff --git a/test/FluentEmail.Core.Tests/SmtpSenderTests.cs b/test/FluentEmail.Core.Tests/SmtpSenderTests.cs index 8fca3c39..611ebfaf 100644 --- a/test/FluentEmail.Core.Tests/SmtpSenderTests.cs +++ b/test/FluentEmail.Core.Tests/SmtpSenderTests.cs @@ -2,11 +2,11 @@ using System.Net.Mail; using System.Threading; using System.Threading.Tasks; -using FluentEmail.Core; +using FluentEmail.Smtp; using NUnit.Framework; using Attachment = FluentEmail.Core.Models.Attachment; -namespace FluentEmail.Smtp.Tests +namespace FluentEmail.Core.Tests { [NonParallelizable] public class SmtpSenderTests diff --git a/test/FluentEmail.Liquid.Tests/ComplexModel/ParentModel.cs b/test/FluentEmail.Liquid.Tests/ComplexModel/ParentModel.cs index 029f3449..fd328188 100644 --- a/test/FluentEmail.Liquid.Tests/ComplexModel/ParentModel.cs +++ b/test/FluentEmail.Liquid.Tests/ComplexModel/ParentModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace FluentEmail.Liquid.Tests +namespace FluentEmail.Liquid.Tests.ComplexModel { public class ParentModel { diff --git a/test/FluentEmail.Liquid.Tests/ComplexModel/TestData.cs b/test/FluentEmail.Liquid.Tests/ComplexModel/TestData.cs index e1dd598c..0ccb9dcc 100644 --- a/test/FluentEmail.Liquid.Tests/ComplexModel/TestData.cs +++ b/test/FluentEmail.Liquid.Tests/ComplexModel/TestData.cs @@ -1,4 +1,4 @@ -namespace FluentEmail.Liquid.Tests +namespace FluentEmail.Liquid.Tests.ComplexModel { public static class TestData {