Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix namespaces #327

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
2 changes: 2 additions & 0 deletions src/Renderers/FluentEmail.Liquid/LiquidParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using Fluid;
using Fluid.Ast;

namespace FluentEmail.Liquid;

public class LiquidParser : FluidParser
{
public LiquidParser()
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
11 changes: 6 additions & 5 deletions src/Senders/FluentEmail.Smtp/FluentEmailSmtpBuilderExtensions.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions test/FluentEmail.Core.Tests/GraphSenderTests.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
3 changes: 1 addition & 2 deletions test/FluentEmail.Core.Tests/MailKitSmtpSenderTests.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/FluentEmail.Core.Tests/MailgunSenderTests.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions test/FluentEmail.Core.Tests/MailtrapSenderTests.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions test/FluentEmail.Core.Tests/SendGridSenderTests.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions test/FluentEmail.Core.Tests/SmtpSenderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/FluentEmail.Liquid.Tests/ComplexModel/ParentModel.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Collections.Generic;

namespace FluentEmail.Liquid.Tests
namespace FluentEmail.Liquid.Tests.ComplexModel
{
public class ParentModel
{
Expand Down
2 changes: 1 addition & 1 deletion test/FluentEmail.Liquid.Tests/ComplexModel/TestData.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace FluentEmail.Liquid.Tests
namespace FluentEmail.Liquid.Tests.ComplexModel
{
public static class TestData
{
Expand Down