Misc cleanup

webprofusion-chrisc · webprofusion-chrisc · commit f399a87e9fce · 2025-03-20T12:55:35.000+08:00
diff --git a/src/Certify.Client/ManagementServerClient.cs b/src/Certify.Client/ManagementServerClient.cs
@@ -11,14 +11,16 @@ namespace Certify.Client
     /// </summary>
     public class ManagementServerClient : IManagementServerClient
     {
-
+#pragma warning disable CS0067 // The event is never used
         public event Action OnConnectionReconnecting;
 
         public event Action OnConnectionReconnected;
 
         public event Action OnConnectionClosed;
 
         public event Func<ManagedInstanceItems> OnGetInstanceItems;
+#pragma warning restore CS0067 // The event is never used
+
         public event Func<InstanceCommandRequest, Task<InstanceCommandResult>> OnGetCommandResult;
 
         private HubConnection _connection;
diff --git a/src/Certify.Models/Providers/ICertifyManager.cs b/src/Certify.Models/Providers/ICertifyManager.cs
@@ -23,40 +23,40 @@ public interface ICertifyManager
         Task<Version> GetServerTypeVersion(StandardServerTypes serverType);
         Task<List<ActionStep>> RunServerDiagnostics(StandardServerTypes serverType, string siteId);
         Task<ManagedCertificate> GetManagedCertificate(string id);
-        Task<List<ManagedCertificate>> GetManagedCertificates(ManagedCertificateFilter filter = null);
-        Task<ManagedCertificateSearchResult> GetManagedCertificateResults(ManagedCertificateFilter filter = null);
-        Task<Certify.Models.Reporting.StatusSummary> GetManagedCertificateSummary(ManagedCertificateFilter filter = null);
+        Task<List<ManagedCertificate>> GetManagedCertificates(ManagedCertificateFilter? filter = null);
+        Task<ManagedCertificateSearchResult> GetManagedCertificateResults(ManagedCertificateFilter? filter = null);
+        Task<Certify.Models.Reporting.StatusSummary> GetManagedCertificateSummary(ManagedCertificateFilter? filter = null);
         Task<ManagedCertificate> UpdateManagedCertificate(ManagedCertificate site);
         Task<ActionResult> DeleteManagedCertificate(string id);
         Task<ImportExportPackage> PerformExport(ExportRequest exportRequest);
         Task<List<ActionStep>> PerformImport(ImportRequest importRequest);
-        Task<List<SimpleAuthorizationChallengeItem>> GetCurrentChallengeResponses(string challengeType, string key = null);
+        Task<List<SimpleAuthorizationChallengeItem>> GetCurrentChallengeResponses(string challengeType, string? key = null);
 
         Task<List<AccountDetails>> GetAccountRegistrations();
         Task<ActionResult> AddAccount(ContactRegistration reg);
         Task<ActionResult> UpdateAccountContact(string storageKey, ContactRegistration contact);
         Task<ActionResult> RemoveAccount(string storageKey, bool includeAccountDeactivation = false);
-        Task<ActionResult<AccountDetails>> ChangeAccountKey(string storageKey, string newKeyPEM = null);
+        Task<ActionResult<AccountDetails>> ChangeAccountKey(string storageKey, string? newKeyPEM = null);
 
-        Task<List<StatusMessage>> TestChallenge(ILog log, ManagedCertificate managedCertificate, bool isPreviewMode, IProgress<RequestProgressState> progress = null);
-        Task<List<StatusMessage>> PerformChallengeCleanup(ILog log, ManagedCertificate managedCertificate, IProgress<RequestProgressState> progress = null);
+        Task<List<StatusMessage>> TestChallenge(ILog log, ManagedCertificate managedCertificate, bool isPreviewMode, IProgress<RequestProgressState>? progress = null);
+        Task<List<StatusMessage>> PerformChallengeCleanup(ILog log, ManagedCertificate managedCertificate, IProgress<RequestProgressState>? progress = null);
         Task<List<ActionResult>> PerformServiceDiagnostics();
         Task<List<DnsZone>> GetDnsProviderZones(string providerTypeId, string credentialId);
         Task<ActionResult> UpdateCertificateAuthority(CertificateAuthority certificateAuthority);
         Task<List<CertificateAuthority>> GetCertificateAuthorities();
         Task<StatusMessage> RevokeCertificate(ILog log, ManagedCertificate managedCertificate);
-        Task<CertificateRequestResult> PerformDummyCertificateRequest(ManagedCertificate managedCertificate, IProgress<RequestProgressState> progress = null);
+        Task<CertificateRequestResult> PerformDummyCertificateRequest(ManagedCertificate managedCertificate, IProgress<RequestProgressState>? progress = null);
         Task<ActionResult> RemoveCertificateAuthority(string id);
-        Task<List<SiteInfo>> GetPrimaryWebSites(StandardServerTypes serverType, bool ignoreStoppedSites, string itemId = null);
-        Task<List<CertificateRequestResult>> RedeployManagedCertificates(ManagedCertificateFilter filter, IProgress<RequestProgressState> progress = null, bool isPreviewOnly = false, bool includeDeploymentTasks = false);
-        Task<CertificateRequestResult> DeployCertificate(ManagedCertificate managedCertificate, IProgress<RequestProgressState> progress = null, bool isPreviewOnly = false, bool includeDeploymentTasks = false);
-        Task<CertificateRequestResult> PerformCertificateRequest(ILog log, ManagedCertificate managedCertificate, IProgress<RequestProgressState> progress = null, bool resumePaused = false, bool skipRequest = false, bool failOnSkip = false, bool skipTasks = false, bool isInteractive = false, string reason = null);
+        Task<List<SiteInfo>> GetPrimaryWebSites(StandardServerTypes serverType, bool ignoreStoppedSites, string? itemId = null);
+        Task<List<CertificateRequestResult>> RedeployManagedCertificates(ManagedCertificateFilter filter, IProgress<RequestProgressState>? progress = null, bool isPreviewOnly = false, bool includeDeploymentTasks = false);
+        Task<CertificateRequestResult> DeployCertificate(ManagedCertificate managedCertificate, IProgress<RequestProgressState>? progress = null, bool isPreviewOnly = false, bool includeDeploymentTasks = false);
+        Task<CertificateRequestResult> PerformCertificateRequest(ILog log, ManagedCertificate managedCertificate, IProgress<RequestProgressState>? progress = null, bool resumePaused = false, bool skipRequest = false, bool failOnSkip = false, bool skipTasks = false, bool isInteractive = false, string? reason = null);
         Task<List<DomainOption>> GetDomainOptionsFromSite(StandardServerTypes serverType, string siteId);
-        Task<List<CertificateRequestResult>> PerformRenewAll(RenewalSettings settings, ConcurrentDictionary<string, Progress<RequestProgressState>> progressTrackers = null);
+        Task<List<CertificateRequestResult>> PerformRenewAll(RenewalSettings settings, ConcurrentDictionary<string, Progress<RequestProgressState>>? progressTrackers = null);
         Task<bool> PerformRenewalTasks();
         Task<bool> PerformDailyMaintenanceTasks();
         Task PerformCertificateCleanup();
-        Task<List<ActionResult>> PerformCertificateMaintenanceTasks(string managedItemId = null);
+        Task<List<ActionResult>> PerformCertificateMaintenanceTasks(string? managedItemId = null);
         Task<List<ActionStep>> GeneratePreview(ManagedCertificate item);
         void ReportProgress(IProgress<RequestProgressState> progress, RequestProgressState state, bool logThisEvent = true);
         Task<List<ActionStep>> PerformDeploymentTask(ILog log, string managedCertificateId, string taskId, bool isPreviewOnly, bool skipDeferredTasks, bool forceTaskExecution);
diff --git a/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs b/src/Certify.Server/Certify.Server.Core/Certify.Server.Core/Startup.cs
@@ -1,10 +1,8 @@
-﻿using System.Text;
-using Certify.Management;
+﻿using Certify.Management;
 using Certify.Models;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.ResponseCompression;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.OpenApi.Models;
 
 namespace Certify.Server.Core
 {
@@ -59,33 +57,33 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSwaggerGen(c =>
             {
 
-                c.SwaggerDoc("v1", new OpenApiInfo
+                c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo
                 {
                     Title = "Certify Core Internal API",
                     Version = "v1",
                     Description = "Provides a private API for use by the Certify The Web UI and related components. This internal API changes between versions, you should use the public API when building integrations instead."
                 });
 
                 // declare authorization method
-                c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+                c.AddSecurityDefinition("Bearer", new Microsoft.OpenApi.Models.OpenApiSecurityScheme
                 {
                     Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
                     Name = "Authorization",
                     Scheme = "bearer",
                     BearerFormat = "JWT",
-                    In = ParameterLocation.Header,
-                    Type = SecuritySchemeType.Http
+                    In = Microsoft.OpenApi.Models.ParameterLocation.Header,
+                    Type = Microsoft.OpenApi.Models.SecuritySchemeType.Http
                 });
 
                 // set security requirement
-                c.AddSecurityRequirement(new OpenApiSecurityRequirement
+                c.AddSecurityRequirement(new Microsoft.OpenApi.Models.OpenApiSecurityRequirement
                 {
                     {
-                        new OpenApiSecurityScheme
+                        new Microsoft.OpenApi.Models.OpenApiSecurityScheme
                         {
-                            Reference = new OpenApiReference
+                            Reference = new Microsoft.OpenApi.Models.OpenApiReference
                             {
-                                Type = ReferenceType.SecurityScheme,
+                                Type = Microsoft.OpenApi.Models.ReferenceType.SecurityScheme,
                                 Id = "Bearer"
                             }
                         }, new List<string>()
@@ -129,6 +127,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                 throw new Exception("Certify Manager not registered");
             }
 
+#if DEBUG
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
@@ -145,7 +144,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
                     c.SwaggerEndpoint("/swagger/v1/swagger.json", "Certify Core Server API");
                 });
             }
-
+#endif
             // set status report context provider
             certifyManager.SetStatusReporting(new Service.StatusHubReporting(statusHubContext));
 
@@ -170,7 +169,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
 #if DEBUG
                 endpoints.MapGet("/debug/routes", (IEnumerable<EndpointDataSource> endpointSources) =>
                 {
-                    var sb = new StringBuilder();
+                    var sb = new System.Text.StringBuilder();
                     var endpoints = endpointSources.SelectMany(es => es.Endpoints);
                     foreach (var endpoint in endpoints)
                     {
diff --git a/src/Certify.Server/Certify.Server.HubService/.config/dotnet-tools.json b/src/Certify.Server/Certify.Server.HubService/.config/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.3",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}
diff --git a/src/Certify.Tests/Certify.Core.Tests.Integration/Certify.Core.Tests.Integration.csproj b/src/Certify.Tests/Certify.Core.Tests.Integration/Certify.Core.Tests.Integration.csproj
@@ -4,18 +4,28 @@
         <Configurations>Debug;Release;</Configurations>
         <RootNamespace>Certify.Core.Tests</RootNamespace>
         <AssemblyName>Certify.Core.Tests</AssemblyName>
+        <PlatformTarget>AnyCPU</PlatformTarget>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <ProjectGuid>{7D4DEE0D-88B3-4DB8-B214-C0EC4FC4711F}</ProjectGuid>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>Certify.Core.Tests</RootNamespace>
+        <AssemblyName>Certify.Core.Tests</AssemblyName>
+        <FileAlignment>512</FileAlignment>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug' ">
         <DebugSymbols>true</DebugSymbols>
         <DebugType>full</DebugType>
         <Optimize>false</Optimize>
         <OutputPath>bin\Debug\</OutputPath>
         <DefineConstants>DEBUG;TRACE</DefineConstants>
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
-        <PlatformTarget>AnyCPU</PlatformTarget>
+
     </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release' ">
         <DebugType>pdbonly</DebugType>
         <Optimize>true</Optimize>
         <OutputPath>bin\Release\</OutputPath>
@@ -24,27 +34,8 @@
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
 
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{7D4DEE0D-88B3-4DB8-B214-C0EC4FC4711F}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>Certify.Core.Tests</RootNamespace>
-        <AssemblyName>Certify.Core.Tests</AssemblyName>
-        <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-        <NuGetPackageImportStamp />
-        <TargetFrameworkProfile />
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-        <StartupObject />
-    </PropertyGroup>
     <Import Project="..\..\Certify.Plugins\Licensing\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\..\Certify.Plugins\Licensing\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
-    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-        <PlatformTarget>AnyCPU</PlatformTarget>
-    </PropertyGroup>
+
     <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net9.0|AnyCPU'">
         <NoWarn>1701;1702;NU1701</NoWarn>
     </PropertyGroup>
@@ -82,14 +73,6 @@
         <PackageReference Include="Npgsql" Version="8.0.6" />
         <PackageReference Include="Polly" Version="8.5.2" />
         <PackageReference Include="System.Security.AccessControl" Version="6.0.1" />
-
-
-    </ItemGroup>
-    <ItemGroup>
-        <Reference Include="System.ComponentModel.Composition" />
-        <Reference Include="System.Configuration" />
-        <Reference Include="System.ServiceProcess" />
-        <Reference Include="System.Data.DataSetExtensions" />
     </ItemGroup>
     <ItemGroup>
         <None Include="app.config" />
diff --git a/src/Certify.Tests/Certify.Core.Tests.Integration/ServerManagers/IISManagerTests.cs b/src/Certify.Tests/Certify.Core.Tests.Integration/ServerManagers/IISManagerTests.cs
@@ -4,7 +4,6 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Net;
-using System.Threading;
 using System.Threading.Tasks;
 using Certify.Core.Management;
 using Certify.Management;
@@ -147,11 +146,10 @@ public async Task TestCreateFixedIPBindings()
         }
 
         [TestMethod]
-        [Ignore]
         public async Task TestManySiteBindingUpdates()
         {
             var numSites = 100;
-            // create a large number of site bindings, to see if we encounter isses saving IIS changes
+            // create a large number of site bindings, to see if we encounter issues saving IIS changes
 
             try
             {
@@ -215,22 +213,12 @@ public async Task TestManySiteBindingUpdates()
                     }
                 }
 
-                ThreadPool.QueueUserWorkItem(async x =>
-                {
-                    Thread.Sleep(500);
-                    var results = await Task.WhenAll<ActionStep>(allBindingTasksSet1);
-
-                    // verify all actions ok
-                    Assert.IsFalse(results.Any(r => r.HasError), "Thread1: One or more actions failed");
-                });
-
-                ThreadPool.QueueUserWorkItem(async x =>
-                {
-                    var results = await Task.WhenAll<ActionStep>(allBindingTasksSet2);
+                var resultsSet1 = await Task.WhenAll(allBindingTasksSet1);
+                var resultsSet2 = await Task.WhenAll(allBindingTasksSet2);
 
-                    // verify all actions ok
-                    Assert.IsFalse(results.Any(r => r.HasError), "Thread2: One or more actions failed");
-                });
+                // verify all actions ok
+                Assert.IsFalse(resultsSet1.Any(r => r.HasError), "Thread1: One or more actions failed");
+                Assert.IsFalse(resultsSet2.Any(r => r.HasError), "Thread2: One or more actions failed");
             }
             finally
             {
diff --git a/src/Certify.Tests/Certify.Core.Tests.Unit/Certify.Core.Tests.Unit.csproj b/src/Certify.Tests/Certify.Core.Tests.Unit/Certify.Core.Tests.Unit.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`		`-using System.Text;`
`2`		`-using Certify.Management;`
	`1`	`+using Certify.Management;`
`3`	`2`	`using Certify.Models;`
`4`	`3`	`using Microsoft.AspNetCore.DataProtection;`
`5`	`4`	`using Microsoft.AspNetCore.ResponseCompression;`
`6`	`5`	`using Microsoft.AspNetCore.SignalR;`
`7`		`-using Microsoft.OpenApi.Models;`
`8`	`6`
`9`	`7`	`namespace Certify.Server.Core`
`10`	`8`	`{`
`@@ -59,33 +57,33 @@ public void ConfigureServices(IServiceCollection services)`
`59`	`57`	`services.AddSwaggerGen(c =>`
`60`	`58`	`{`
`61`	`59`
`62`		`- c.SwaggerDoc("v1", new OpenApiInfo`
	`60`	`+ c.SwaggerDoc("v1", new Microsoft.OpenApi.Models.OpenApiInfo`
`63`	`61`	`{`
`64`	`62`	`Title = "Certify Core Internal API",`
`65`	`63`	`Version = "v1",`
`66`	`64`	`Description = "Provides a private API for use by the Certify The Web UI and related components. This internal API changes between versions, you should use the public API when building integrations instead."`
`67`	`65`	`});`
`68`	`66`
`69`	`67`	`// declare authorization method`
`70`		`- c.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme`
	`68`	`+ c.AddSecurityDefinition("Bearer", new Microsoft.OpenApi.Models.OpenApiSecurityScheme`
`71`	`69`	`{`
`72`	`70`	`Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",`
`73`	`71`	`Name = "Authorization",`
`74`	`72`	`Scheme = "bearer",`
`75`	`73`	`BearerFormat = "JWT",`
`76`		`- In = ParameterLocation.Header,`
`77`		`- Type = SecuritySchemeType.Http`
	`74`	`+ In = Microsoft.OpenApi.Models.ParameterLocation.Header,`
	`75`	`+ Type = Microsoft.OpenApi.Models.SecuritySchemeType.Http`
`78`	`76`	`});`
`79`	`77`
`80`	`78`	`// set security requirement`
`81`		`- c.AddSecurityRequirement(new OpenApiSecurityRequirement`
	`79`	`+ c.AddSecurityRequirement(new Microsoft.OpenApi.Models.OpenApiSecurityRequirement`
`82`	`80`	`{`
`83`	`81`	`{`
`84`		`- new OpenApiSecurityScheme`
	`82`	`+ new Microsoft.OpenApi.Models.OpenApiSecurityScheme`
`85`	`83`	`{`
`86`		`- Reference = new OpenApiReference`
	`84`	`+ Reference = new Microsoft.OpenApi.Models.OpenApiReference`
`87`	`85`	`{`
`88`		`- Type = ReferenceType.SecurityScheme,`
	`86`	`+ Type = Microsoft.OpenApi.Models.ReferenceType.SecurityScheme,`
`89`	`87`	`Id = "Bearer"`
`90`	`88`	`}`
`91`	`89`	`}, new List<string>()`
`@@ -129,6 +127,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`129`	`127`	`throw new Exception("Certify Manager not registered");`
`130`	`128`	`}`
`131`	`129`
	`130`	`+#if DEBUG`
`132`	`131`	`if (env.IsDevelopment())`
`133`	`132`	`{`
`134`	`133`	`app.UseDeveloperExceptionPage();`
`@@ -145,7 +144,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`145`	`144`	`c.SwaggerEndpoint("/swagger/v1/swagger.json", "Certify Core Server API");`
`146`	`145`	`});`
`147`	`146`	`}`
`148`		`-`
	`147`	`+#endif`
`149`	`148`	`// set status report context provider`
`150`	`149`	`certifyManager.SetStatusReporting(new Service.StatusHubReporting(statusHubContext));`
`151`	`150`
`@@ -170,7 +169,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)`
`170`	`169`	`#if DEBUG`
`171`	`170`	`endpoints.MapGet("/debug/routes", (IEnumerable<EndpointDataSource> endpointSources) =>`
`172`	`171`	`{`
`173`		`- var sb = new StringBuilder();`
	`172`	`+ var sb = new System.Text.StringBuilder();`
`174`	`173`	`var endpoints = endpointSources.SelectMany(es => es.Endpoints);`
`175`	`174`	`foreach (var endpoint in endpoints)`
`176`	`175`	`{`