netStandard 2.0 compatibility changes.

PingmanTools · Jun 25, 2024 · 53475d3 · 53475d3
1 parent e004d89
commit 53475d3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 36 deletions.
diff --git a/src/FluffySpoon.AspNet.EncryptWeMust/Certes/LetsEncryptRenewalService.cs b/src/FluffySpoon.AspNet.EncryptWeMust/Certes/LetsEncryptRenewalService.cs
@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using FluffySpoon.AspNet.EncryptWeMust.Certificates;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using static FluffySpoon.AspNet.EncryptWeMust.Certificates.CertificateRenewalStatus;
 
@@ -15,7 +14,6 @@ public class LetsEncryptRenewalService : ILetsEncryptRenewalService
 		private readonly ICertificateProvider _certificateProvider;
 		private readonly IEnumerable<ICertificateRenewalLifecycleHook> _lifecycleHooks;
 		private readonly ILogger<ILetsEncryptRenewalService> _logger;
-		private readonly IHostApplicationLifetime _lifetime;
 		private readonly SemaphoreSlim _semaphoreSlim;
 		private readonly LetsEncryptOptions _options;
 
@@ -24,19 +22,17 @@ public class LetsEncryptRenewalService : ILetsEncryptRenewalService
 		public LetsEncryptRenewalService(
 			ICertificateProvider certificateProvider,
 			IEnumerable<ICertificateRenewalLifecycleHook> lifecycleHooks,
-			IHostApplicationLifetime lifetime,
 			ILogger<ILetsEncryptRenewalService> logger,
 			LetsEncryptOptions options)
 		{
 			_certificateProvider = certificateProvider;
 			_lifecycleHooks = lifecycleHooks;
-			_lifetime = lifetime;
 			_logger = logger;
 			_options = options;
 			_semaphoreSlim = new SemaphoreSlim(1);
 		}
 
-		internal static IAbstractCertificate Certificate { get; private set; }
+		public static IAbstractCertificate Certificate { get; private set; }
 
 		public Uri LetsEncryptUri => _options.LetsEncryptUri;
 
@@ -55,8 +51,8 @@ public async Task StartAsync(CancellationToken cancellationToken)
 				await lifecycleHook.OnStartAsync();
 
 			_timer = new Timer(async state => await RunOnceWithErrorHandlingAsync(), null, Timeout.InfiniteTimeSpan, TimeSpan.FromHours(1));
-			
-			_lifetime.ApplicationStarted.Register(() => OnApplicationStarted(cancellationToken));
+
+			OnApplicationStarted(cancellationToken);
 		}
 
 		public async Task StopAsync(CancellationToken cancellationToken)
@@ -82,24 +78,19 @@ public async Task RunOnceAsync()
 				if (result.Status != Unchanged)
 				{
 					// Preload intermediate certs before exposing certificate to the Kestrel
-					using var chain = new X509Chain
+					using (var chain = new X509Chain { ChainPolicy = { RevocationMode = X509RevocationMode.NoCheck } })
 					{
-						ChainPolicy =
-						{
-							RevocationMode = X509RevocationMode.NoCheck
-						}
-					};
-
-					if (result.Certificate is LetsEncryptX509Certificate x509cert)
-					{
-						if (chain.Build(x509cert.GetCertificate()))
-						{
-							_logger.LogInformation("Successfully built certificate chain");
-						}
-						else
+						if (result.Certificate is LetsEncryptX509Certificate x509cert)
 						{
-							_logger.LogWarning(
-								"Was not able to build certificate chain. This can cause an outage of your app.");
+							if (chain.Build(x509cert.GetCertificate()))
+							{
+								_logger.LogInformation("Successfully built certificate chain");
+							}
+							else
+							{
+								_logger.LogWarning(
+									"Was not able to build certificate chain. This can cause an outage of your app.");
+							}
 						}
 					}
 				}

diff --git a/src/FluffySpoon.AspNet.EncryptWeMust/Certificates/CertificateInterfaces.cs b/src/FluffySpoon.AspNet.EncryptWeMust/Certificates/CertificateInterfaces.cs
@@ -7,7 +7,7 @@ namespace FluffySpoon.AspNet.EncryptWeMust.Certificates
     /// </summary>
     public interface IPersistableCertificate : IAbstractCertificate
     {
-        public byte[] RawData { get; }
+        byte[] RawData { get; }
     }
 
     /// <summary>

diff --git a/src/FluffySpoon.AspNet.EncryptWeMust/Certificates/IAbstractCertificate.cs b/src/FluffySpoon.AspNet.EncryptWeMust/Certificates/IAbstractCertificate.cs
@@ -7,8 +7,8 @@ namespace FluffySpoon.AspNet.EncryptWeMust.Certificates
     /// </summary>
     public interface IAbstractCertificate
     {
-        public DateTime NotAfter { get; }
-        public DateTime NotBefore { get; }
+        DateTime NotAfter { get; }
+        DateTime NotBefore { get; }
         string Thumbprint { get; }
     }
 }
diff --git a/src/FluffySpoon.AspNet.EncryptWeMust/FluffySpoon.AspNet.EncryptWeMust.csproj b/src/FluffySpoon.AspNet.EncryptWeMust/FluffySpoon.AspNet.EncryptWeMust.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -10,13 +10,13 @@
 
   <ItemGroup>
     <PackageReference Include="certes" Version="3.0.4" />
-    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FluffySpoon.AspNet.EncryptWeMust/Persistence/FileChallengePersistenceStrategy.cs b/src/FluffySpoon.AspNet.EncryptWeMust/Persistence/FileChallengePersistenceStrategy.cs
@@ -9,11 +9,11 @@ namespace FluffySpoon.AspNet.EncryptWeMust.Persistence
 {
 	public class FileChallengePersistenceStrategy : IChallengePersistenceStrategy
 	{
-		private readonly string _relativeFilePath;
+		private readonly string _challengeFilePath;
 
-		public FileChallengePersistenceStrategy(string relativeFilePath)
+		public FileChallengePersistenceStrategy(string challengeFilePath)
 		{
-			_relativeFilePath = relativeFilePath;
+			_challengeFilePath = challengeFilePath;
 		}
 
 		public async Task DeleteAsync(IEnumerable<ChallengeDto> challenges)
@@ -60,7 +60,7 @@ public Task<IEnumerable<ChallengeDto>> RetrieveAsync()
 
 		private string GetChallengesStorePath()
 		{
-			return _relativeFilePath + "_Challenges";
+			return _challengeFilePath + "_Challenges";
 		}
 	}
 }