namespace changes.

src/FluffySpoon.AspNet.LetsEncrypt.Azure/AzureAppServiceSslBindingCertificatePersistenceStrategy.cs

@@ -1,4 +1,5 @@
 using System;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Azure.Management.AppService.Fluent.Models;
 using Microsoft.Azure.Management.Fluent;

src/FluffySpoon.AspNet.LetsEncrypt.Azure/RegistrationExtensions.cs

@@ -1,4 +1,5 @@
 using FluffySpoon.AspNet.LetsEncrypt.Azure;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using FluffySpoon.LetsEncrypt.Azure;
 using Microsoft.Extensions.DependencyInjection;

src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Program.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 

src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework.Sample/Startup.cs

@@ -2,7 +2,8 @@
 using System.IO;
 using System.Linq;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/EntityFrameworkChallengePersistenceStrategy.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 

src/FluffySpoon.AspNet.LetsEncrypt.EntityFramework/RegistrationExtensions.cs

@@ -1,6 +1,5 @@
 using FluffySpoon.AspNet.LetsEncrypt.EntityFramework;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using System;

src/FluffySpoon.AspNet.LetsEncrypt.Redis/DistributedCacheChallengePersistenceStrategy.cs

@@ -4,7 +4,6 @@
 using System.Text;
 using System.Threading.Tasks;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;

src/FluffySpoon.AspNet.LetsEncrypt.Sample/Program.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+ using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Logging;
 

src/FluffySpoon.AspNet.LetsEncrypt.Sample/Startup.cs

@@ -1,5 +1,6 @@
 using System;
 using Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;

src/FluffySpoon.AspNet.LetsEncrypt.Tests/CertificateValidatorTests.cs

@@ -2,7 +2,8 @@
 using System.Collections.Generic;
 using FluentAssertions;
 using FluentAssertions.Extensions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 

src/FluffySpoon.AspNet.LetsEncrypt.Tests/FluffySpoon.AspNet.LetsEncrypt.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

src/FluffySpoon.AspNet.LetsEncrypt.Tests/LetsEncryptClientTests.cs

@@ -6,14 +6,13 @@
 using Certes.Acme;
 using FluentAssertions;
 using FluentAssertions.Extensions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using NSubstitute;
-using static FluffySpoon.AspNet.LetsEncrypt.Logic.Models.CertificateRenewalStatus;
+using static FluffySpoon.AspNet.LetsEncrypt.Certificates.CertificateRenewalStatus;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Tests
 {

src/FluffySpoon.AspNet.LetsEncrypt.Tests/ResolutionTests.cs

@@ -1,5 +1,6 @@
 using System;
 using Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;

src/FluffySpoon.AspNet.LetsEncrypt.sln.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=IdentifierTypo/@EntryIndexedValue">DO_NOT_SHOW</s:String></wpf:ResourceDictionary>

src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptChallengeApprovalMiddleware.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptChallengeApprovalMiddleware.cs

@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public interface ILetsEncryptChallengeApprovalMiddleware
 	{

src/FluffySpoon.AspNet.LetsEncrypt/ILetsEncryptRenewalService.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/ILetsEncryptRenewalService.cs

@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public interface ILetsEncryptRenewalService: IHostedService, IDisposable
 	{

src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptChallengeApprovalMiddleware.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptChallengeApprovalMiddleware.cs

@@ -4,7 +4,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class LetsEncryptChallengeApprovalMiddleware : ILetsEncryptChallengeApprovalMiddleware
     {

src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClient.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClient.cs

@@ -5,11 +5,10 @@
 using Certes.Acme;
 using Certes.Acme.Resource;
 using FluffySpoon.AspNet.LetsEncrypt.Exceptions;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public interface ILetsEncryptClient
     {

src/FluffySpoon.AspNet.LetsEncrypt/Logic/LetsEncryptClientFactory.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptClientFactory.cs

@@ -3,7 +3,7 @@
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public interface ILetsEncryptClientFactory
     {

src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptOptions.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptOptions.cs

@@ -3,7 +3,7 @@
 using Certes;
 using Certes.Acme;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public class LetsEncryptOptions
 	{

src/FluffySpoon.AspNet.LetsEncrypt/LetsEncryptRenewalService.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/LetsEncryptRenewalService.cs

@@ -3,11 +3,11 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 using Microsoft.Extensions.Logging;
-using static FluffySpoon.AspNet.LetsEncrypt.Logic.Models.CertificateRenewalStatus;
+using static FluffySpoon.AspNet.LetsEncrypt.Certificates.CertificateRenewalStatus;
 
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	public class LetsEncryptRenewalService : ILetsEncryptRenewalService
 	{

src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PfxCertificate.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/PfxCertificate.cs

@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class PfxCertificate
     {

src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/PlacedOrder.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/PlacedOrder.cs

@@ -1,7 +1,7 @@
 using Certes.Acme;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
     public class PlacedOrder
     {

src/FluffySpoon.AspNet.LetsEncrypt/RenewalFailMode.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certes/RenewalFailMode.cs

@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt
+namespace FluffySpoon.AspNet.LetsEncrypt.Certes
 {
 	/// <summary>
 	/// Defines the ways errors are handle by the <see cref="ILetsEncryptRenewalService" />.

src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateProvider.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateProvider.cs

@@ -2,23 +2,21 @@
 using System.Linq;
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic.Models;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using FluffySpoon.AspNet.LetsEncrypt.Persistence;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
-    public interface ICertificateProvider
-    {
-        Task<CertificateRenewalResult> RenewCertificateIfNeeded(X509Certificate2 current = null);
-    }
-
+
     public class CertificateProvider : ICertificateProvider
     {
         private readonly IPersistenceService _persistenceService;
         private readonly ILetsEncryptClientFactory _clientFactory;
         private readonly ICertificateValidator _certificateValidator;
+
         private readonly ILogger<CertificateProvider> _logger;
+
         private readonly string[] _domains;
 
         public CertificateProvider(

src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalResult.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalResult.cs

@@ -1,6 +1,6 @@
 using System.Security.Cryptography.X509Certificates;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public class CertificateRenewalResult
     {

src/FluffySpoon.AspNet.LetsEncrypt/Logic/Models/CertificateRenewalStatus.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateRenewalStatus.cs

@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public enum CertificateRenewalStatus
     {

src/FluffySpoon.AspNet.LetsEncrypt/Logic/CertificateValidator.cs → src/FluffySpoon.AspNet.LetsEncrypt/Certificates/CertificateValidator.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
 using Microsoft.Extensions.Logging;
 
-namespace FluffySpoon.AspNet.LetsEncrypt.Logic
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
 {
     public interface ICertificateValidator
     {

src/FluffySpoon.AspNet.LetsEncrypt/Certificates/ICertificateProvider.cs

@@ -0,0 +1,10 @@
+using System.Security.Cryptography.X509Certificates;
+using System.Threading.Tasks;
+
+namespace FluffySpoon.AspNet.LetsEncrypt.Certificates
+{
+    public interface ICertificateProvider
+    {
+        Task<CertificateRenewalResult> RenewCertificateIfNeeded(X509Certificate2 current = null);
+    }
+}

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/Models/ChallengeDto.cs → src/FluffySpoon.AspNet.LetsEncrypt/Persistence/ChallengeDto.cs

@@ -1,4 +1,4 @@
-namespace FluffySpoon.AspNet.LetsEncrypt.Persistence.Models
+namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {
 	public class ChallengeDto
 	{

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/CustomChallengePersistenceStrategy.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/FileChallengePersistenceStrategy.cs

@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IChallengePersistenceStrategy.cs

@@ -1,5 +1,4 @@
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/IPersistenceService.cs

@@ -1,7 +1,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 
 namespace FluffySpoon.AspNet.LetsEncrypt.Persistence
 {

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/MemoryChallengePersistenceStrategy.cs

@@ -1,5 +1,4 @@
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 

src/FluffySpoon.AspNet.LetsEncrypt/Persistence/PersistenceService.cs

@@ -6,7 +6,6 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Certes;
-using FluffySpoon.AspNet.LetsEncrypt.Persistence.Models;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 

src/FluffySpoon.AspNet.LetsEncrypt/RegistrationExtensions.cs

@@ -5,7 +5,8 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using FluffySpoon.AspNet.LetsEncrypt.Logic;
+using FluffySpoon.AspNet.LetsEncrypt.Certes;
+using FluffySpoon.AspNet.LetsEncrypt.Certificates;
 
 namespace FluffySpoon.AspNet.LetsEncrypt
 {