From b89a7ab7aaba0343004aa1f1539c515a0697b96d Mon Sep 17 00:00:00 2001 From: Josh Creek Date: Sun, 4 Apr 2021 09:33:42 +0100 Subject: [PATCH] refactor(*): Move EmailService inside the main project --- EmailService/EmailService.csproj | 12 ------------ My.ProjectName.sln | 6 ------ .../Identity/Pages/Account/ExternalLogin.cshtml.cs | 6 +++--- .../Identity/Pages/Account/ForgotPassword.cshtml.cs | 6 +++--- .../Identity/Pages/Account/Manage/Email.cshtml.cs | 6 +++--- .../Areas/Identity/Pages/Account/Register.cshtml.cs | 6 +++--- .../Pages/Account/ResendEmailConfirmation.cshtml.cs | 6 +++--- My.ProjectName/My.ProjectName.csproj | 8 +++----- .../Services/EmailService}/EmailConfiguration.cs | 2 +- .../Services/EmailService}/EmailSender.cs | 2 +- .../Services/EmailService}/IEmailSender.cs | 2 +- .../Services/EmailService}/Message.cs | 2 +- My.ProjectName/Startup.cs | 2 +- 13 files changed, 23 insertions(+), 43 deletions(-) delete mode 100644 EmailService/EmailService.csproj rename {EmailService => My.ProjectName/Services/EmailService}/EmailConfiguration.cs (87%) rename {EmailService => My.ProjectName/Services/EmailService}/EmailSender.cs (98%) rename {EmailService => My.ProjectName/Services/EmailService}/IEmailSender.cs (83%) rename {EmailService => My.ProjectName/Services/EmailService}/Message.cs (93%) diff --git a/EmailService/EmailService.csproj b/EmailService/EmailService.csproj deleted file mode 100644 index 9dc3f3e..0000000 --- a/EmailService/EmailService.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net5.0 - - - - - - - - diff --git a/My.ProjectName.sln b/My.ProjectName.sln index 7e9a770..91f292c 100644 --- a/My.ProjectName.sln +++ b/My.ProjectName.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.31025.194 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "My.ProjectName", "My.ProjectName\My.ProjectName.csproj", "{DAEED4B6-860F-4622-AE3E-7084CF5A48EF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmailService", "EmailService\EmailService.csproj", "{3B7004B2-126B-4458-BA25-3B2F65E28F6E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,10 +15,6 @@ Global {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Debug|Any CPU.Build.0 = Debug|Any CPU {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.ActiveCfg = Release|Any CPU {DAEED4B6-860F-4622-AE3E-7084CF5A48EF}.Release|Any CPU.Build.0 = Release|Any CPU - {3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B7004B2-126B-4458-BA25-3B2F65E28F6E}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/My.ProjectName/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs b/My.ProjectName/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs index 52eaf90..e31df21 100644 --- a/My.ProjectName/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs +++ b/My.ProjectName/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; -using EmailService; +using My.ProjectName.Services.EmailService; namespace My.ProjectName.Areas.Identity.Pages.Account { @@ -22,14 +22,14 @@ namespace My.ProjectName.Areas.Identity.Pages.Account { private readonly SignInManager _signInManager; private readonly UserManager _userManager; - private readonly EmailService.IEmailSender _emailSender; + private readonly Services.EmailService.IEmailSender _emailSender; private readonly ILogger _logger; public ExternalLoginModel( SignInManager signInManager, UserManager userManager, ILogger logger, - EmailService.IEmailSender emailSender) + Services.EmailService.IEmailSender emailSender) { _signInManager = signInManager; _userManager = userManager; diff --git a/My.ProjectName/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs b/My.ProjectName/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs index 565fed3..55fa6a7 100644 --- a/My.ProjectName/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs +++ b/My.ProjectName/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using EmailService; +using My.ProjectName.Services.EmailService; namespace My.ProjectName.Areas.Identity.Pages.Account { @@ -18,9 +18,9 @@ namespace My.ProjectName.Areas.Identity.Pages.Account public class ForgotPasswordModel : PageModel { private readonly UserManager _userManager; - private readonly EmailService.IEmailSender _emailSender; + private readonly Services.EmailService.IEmailSender _emailSender; - public ForgotPasswordModel(UserManager userManager, EmailService.IEmailSender emailSender) + public ForgotPasswordModel(UserManager userManager, Services.EmailService.IEmailSender emailSender) { _userManager = userManager; _emailSender = emailSender; diff --git a/My.ProjectName/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs b/My.ProjectName/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs index 1c15a1b..b2f08e5 100644 --- a/My.ProjectName/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs +++ b/My.ProjectName/Areas/Identity/Pages/Account/Manage/Email.cshtml.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using EmailService; +using My.ProjectName.Services.EmailService; namespace My.ProjectName.Areas.Identity.Pages.Account.Manage { @@ -18,12 +18,12 @@ namespace My.ProjectName.Areas.Identity.Pages.Account.Manage { private readonly UserManager _userManager; private readonly SignInManager _signInManager; - private readonly EmailService.IEmailSender _emailSender; + private readonly Services.EmailService.IEmailSender _emailSender; public EmailModel( UserManager userManager, SignInManager signInManager, - EmailService.IEmailSender emailSender) + Services.EmailService.IEmailSender emailSender) { _userManager = userManager; _signInManager = signInManager; diff --git a/My.ProjectName/Areas/Identity/Pages/Account/Register.cshtml.cs b/My.ProjectName/Areas/Identity/Pages/Account/Register.cshtml.cs index c212201..a19f046 100644 --- a/My.ProjectName/Areas/Identity/Pages/Account/Register.cshtml.cs +++ b/My.ProjectName/Areas/Identity/Pages/Account/Register.cshtml.cs @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; using Microsoft.Extensions.Logging; -using EmailService; +using My.ProjectName.Services.EmailService; namespace My.ProjectName.Areas.Identity.Pages.Account { @@ -23,13 +23,13 @@ namespace My.ProjectName.Areas.Identity.Pages.Account private readonly SignInManager _signInManager; private readonly UserManager _userManager; private readonly ILogger _logger; - private readonly EmailService.IEmailSender _emailSender; + private readonly Services.EmailService.IEmailSender _emailSender; public RegisterModel( UserManager userManager, SignInManager signInManager, ILogger logger, - EmailService.IEmailSender emailSender) + Services.EmailService.IEmailSender emailSender) { _userManager = userManager; _signInManager = signInManager; diff --git a/My.ProjectName/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs b/My.ProjectName/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs index 889b333..be1383c 100644 --- a/My.ProjectName/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs +++ b/My.ProjectName/Areas/Identity/Pages/Account/ResendEmailConfirmation.cshtml.cs @@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Identity.UI.Services; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; using Microsoft.AspNetCore.WebUtilities; -using EmailService; +using My.ProjectName.Services.EmailService; namespace My.ProjectName.Areas.Identity.Pages.Account { @@ -18,9 +18,9 @@ namespace My.ProjectName.Areas.Identity.Pages.Account public class ResendEmailConfirmationModel : PageModel { private readonly UserManager _userManager; - private readonly EmailService.IEmailSender _emailSender; + private readonly Services.EmailService.IEmailSender _emailSender; - public ResendEmailConfirmationModel(UserManager userManager, EmailService.IEmailSender emailSender) + public ResendEmailConfirmationModel(UserManager userManager, Services.EmailService.IEmailSender emailSender) { _userManager = userManager; _emailSender = emailSender; diff --git a/My.ProjectName/My.ProjectName.csproj b/My.ProjectName/My.ProjectName.csproj index 44f9f9f..3a3da50 100644 --- a/My.ProjectName/My.ProjectName.csproj +++ b/My.ProjectName/My.ProjectName.csproj @@ -8,6 +8,7 @@ + @@ -17,9 +18,10 @@ + - + @@ -27,8 +29,4 @@ - - - - diff --git a/EmailService/EmailConfiguration.cs b/My.ProjectName/Services/EmailService/EmailConfiguration.cs similarity index 87% rename from EmailService/EmailConfiguration.cs rename to My.ProjectName/Services/EmailService/EmailConfiguration.cs index 159d786..47343f5 100644 --- a/EmailService/EmailConfiguration.cs +++ b/My.ProjectName/Services/EmailService/EmailConfiguration.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace EmailService +namespace My.ProjectName.Services.EmailService { public class EmailConfiguration { diff --git a/EmailService/EmailSender.cs b/My.ProjectName/Services/EmailService/EmailSender.cs similarity index 98% rename from EmailService/EmailSender.cs rename to My.ProjectName/Services/EmailService/EmailSender.cs index 010c99e..8b619a9 100644 --- a/EmailService/EmailSender.cs +++ b/My.ProjectName/Services/EmailService/EmailSender.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -namespace EmailService +namespace My.ProjectName.Services.EmailService { public class EmailSender : IEmailSender { diff --git a/EmailService/IEmailSender.cs b/My.ProjectName/Services/EmailService/IEmailSender.cs similarity index 83% rename from EmailService/IEmailSender.cs rename to My.ProjectName/Services/EmailService/IEmailSender.cs index e80c166..095f515 100644 --- a/EmailService/IEmailSender.cs +++ b/My.ProjectName/Services/EmailService/IEmailSender.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -namespace EmailService +namespace My.ProjectName.Services.EmailService { public interface IEmailSender { diff --git a/EmailService/Message.cs b/My.ProjectName/Services/EmailService/Message.cs similarity index 93% rename from EmailService/Message.cs rename to My.ProjectName/Services/EmailService/Message.cs index 0b0c618..f446cce 100644 --- a/EmailService/Message.cs +++ b/My.ProjectName/Services/EmailService/Message.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace EmailService +namespace My.ProjectName.Services.EmailService { public class Message { diff --git a/My.ProjectName/Startup.cs b/My.ProjectName/Startup.cs index 2defdac..4e4ee5d 100644 --- a/My.ProjectName/Startup.cs +++ b/My.ProjectName/Startup.cs @@ -1,4 +1,4 @@ -using EmailService; +using My.ProjectName.Services.EmailService; using My.ProjectName.Data; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting;