remove old-style sln and run cleanup

jbarden · jbarden · commit 0115c209c0e5 · 2025-09-02T22:02:02.000+01:00
diff --git a/.editorconfig b/.editorconfig
diff --git a/AStar.Dev.Api.Usage.Sdk.sln b/AStar.Dev.Api.Usage.Sdk.sln
diff --git a/AStar.Dev.Api.Usage.Sdk.slnx b/AStar.Dev.Api.Usage.Sdk.slnx
@@ -1,14 +1,14 @@
 <Solution>
-  <Folder Name="/.github/">
-    <File Path=".github\dependabot.yml" />
-  </Folder>
-  <Folder Name="/.github/workflows/">
-    <File Path=".github\workflows\dotnet.yml" />
-    <File Path=".github\workflows\publish.yml" />
-  </Folder>
-  <Folder Name="/Solution Items/" />
-  <Folder Name="/src/">
-    <Project Path="src\AStar.Dev.Api.Usage.Sdk\AStar.Dev.Api.Usage.Sdk.csproj" Type="Classic C#" />
-  </Folder>
-  <Folder Name="/test/" />
-</Solution>
+    <Folder Name="/.github/">
+        <File Path=".github\dependabot.yml"/>
+    </Folder>
+    <Folder Name="/.github/workflows/">
+        <File Path=".github\workflows\dotnet.yml"/>
+        <File Path=".github\workflows\publish.yml"/>
+    </Folder>
+    <Folder Name="/Solution Items/"/>
+    <Folder Name="/src/">
+        <Project Path="src\AStar.Dev.Api.Usage.Sdk\AStar.Dev.Api.Usage.Sdk.csproj" Type="Classic C#"/>
+    </Folder>
+    <Folder Name="/test/"/>
+</Solution>
diff --git a/src/AStar.Dev.Api.Usage.Sdk/AStar.Dev.Api.Usage.Sdk.csproj b/src/AStar.Dev.Api.Usage.Sdk/AStar.Dev.Api.Usage.Sdk.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-		<AnalysisLevel>latest-recommended</AnalysisLevel>
+        <AnalysisLevel>latest-recommended</AnalysisLevel>
         <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
     </PropertyGroup>
 
@@ -41,11 +41,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AStar.Dev.Logging.Extensions" Version="0.6.2" />
+        <PackageReference Include="AStar.Dev.Logging.Extensions" Version="0.6.2"/>
         <PackageReference Include="AStar.Dev.Utilities" Version="1.6.2"/>
         <PackageReference Include="AStar.Dev.Technical.Debt.Reporting" Version="0.2.1"/>
     </ItemGroup>
-	
+
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.8"/>
         <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8"/>
diff --git a/src/AStar.Dev.Api.Usage.Sdk/AStar.Dev.Api.Usage.Sdk.xml b/src/AStar.Dev.Api.Usage.Sdk/AStar.Dev.Api.Usage.Sdk.xml
diff --git a/src/AStar.Dev.Api.Usage.Sdk/ApiUsageConfiguration.cs b/src/AStar.Dev.Api.Usage.Sdk/ApiUsageConfiguration.cs
@@ -19,4 +19,4 @@ public sealed class ApiUsageConfiguration
 
     /// <summary></summary>
     public required string QueueName { get; init; }
-}
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/ApiUsageEvent.cs b/src/AStar.Dev.Api.Usage.Sdk/ApiUsageEvent.cs
@@ -16,4 +16,4 @@ public record ApiUsageEvent(string ApiName, string ApiEndpoint, string HttpMetho
     /// <summary>
     /// </summary>
     public DateTime Timestamp { get; init; } = DateTime.UtcNow;
-}
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/Metrics/IEndpointName.cs b/src/AStar.Dev.Api.Usage.Sdk/Metrics/IEndpointName.cs
@@ -14,4 +14,4 @@ public interface IEndpointName
     ///     Gets the HTTP Method type of the Endpoint.
     /// </summary>
     string HttpMethod { get; }
-}
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/Metrics/UsageMetricHandler.cs b/src/AStar.Dev.Api.Usage.Sdk/Metrics/UsageMetricHandler.cs
@@ -38,7 +38,7 @@ public async Task InvokeAsync(HttpContext context)
         catch(Exception ex)
         {
             // nameof(UsageMetricHandler) - feels pointless
-            LogMessage.LogException(logger, nameof(UsageMetricHandler), ex.GetType().Name, ex.GetBaseException().Message, ex.StackTrace?? string.Empty);
+            LogMessage.LogException(logger, nameof(UsageMetricHandler), ex.GetType().Name, ex.GetBaseException().Message, ex.StackTrace ?? string.Empty);
         }
     }
 
@@ -49,9 +49,11 @@ private string UpdateApiNameIfRequired(string apiName)
             return apiName;
         }
 
-        logger.LogDebug("Updating host.docker.internal - doubt this ever happens as 99.999999% sure this is a long gone requirement. I'm just not in the mood to dig now...");
+        LogMessage.Debug(logger, "Need to revisit this to see if it is required",
+                         "Updating host.docker.internal - doubt this ever happens as 99.999999% sure this is a long gone requirement. I'm just not in the mood to dig now...");
+
         apiName = "astar.dev.images.api";
 
         return apiName;
     }
-}
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/Metrics/UsageMetricHandlerExtensions.cs b/src/AStar.Dev.Api.Usage.Sdk/Metrics/UsageMetricHandlerExtensions.cs
@@ -10,6 +10,6 @@ public static class UsageMetricHandlerExtensions
     /// </summary>
     /// <param name="builder"></param>
     /// <returns></returns>
-    public static void UseMetrics(this IApplicationBuilder builder) =>
-        builder.UseMiddleware<UsageMetricHandler>();
-}
+    public static void UseMetrics(this IApplicationBuilder builder)
+        => builder.UseMiddleware<UsageMetricHandler>();
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/Send.cs b/src/AStar.Dev.Api.Usage.Sdk/Send.cs
@@ -35,4 +35,4 @@ public async Task SendUsageEventAsync(ApiUsageEvent usageEvent, CancellationToke
             LogMessage.LogException(logger, nameof(Send), ex.GetType().Name, ex.GetBaseException().Message, ex.StackTrace ?? string.Empty);
         }
     }
-}
+}
diff --git a/src/AStar.Dev.Api.Usage.Sdk/ServiceCollectionExtensions.cs b/src/AStar.Dev.Api.Usage.Sdk/ServiceCollectionExtensions.cs
@@ -14,20 +14,24 @@ public static class ServiceCollectionExtensions
     /// <param name="configurationManager"></param>
     /// <param name="executingAssembly"></param>
     /// <returns></returns>
+
+    // ReSharper disable once UnusedParameter.Global
+#pragma warning disable IDE0060
     public static IServiceCollection AddUsageServices(this IServiceCollection services, ConfigurationManager configurationManager, Assembly executingAssembly)
+#pragma warning restore IDE0060
     {
         // services.AddMediatR(cfg =>
         //           {
         //     cfg.RegisterServicesFromAssembly(executingAssembly)
         //        .AddOpenBehavior(typeof(UsageMetricHandler<,>));
         //           });
 
-        services.AddSingleton<Send>();
+        _ = services.AddSingleton<Send>();
 
-        services
+        _ = services
             .AddOptions<ApiUsageConfiguration>()
             .Bind(configurationManager.GetSection(ApiUsageConfiguration.ConfigurationSectionName));
 
         return services;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public async Task InvokeAsync(HttpContext context)`
`38`	`38`	`catch(Exception ex)`
`39`	`39`	`{`
`40`	`40`	`// nameof(UsageMetricHandler) - feels pointless`
`41`		`- LogMessage.LogException(logger, nameof(UsageMetricHandler), ex.GetType().Name, ex.GetBaseException().Message, ex.StackTrace?? string.Empty);`
	`41`	`+ LogMessage.LogException(logger, nameof(UsageMetricHandler), ex.GetType().Name, ex.GetBaseException().Message, ex.StackTrace ?? string.Empty);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -49,9 +49,11 @@ private string UpdateApiNameIfRequired(string apiName)`
`49`	`49`	`return apiName;`
`50`	`50`	`}`
`51`	`51`
`52`		`- logger.LogDebug("Updating host.docker.internal - doubt this ever happens as 99.999999% sure this is a long gone requirement. I'm just not in the mood to dig now...");`
	`52`	`+ LogMessage.Debug(logger, "Need to revisit this to see if it is required",`
	`53`	`+ "Updating host.docker.internal - doubt this ever happens as 99.999999% sure this is a long gone requirement. I'm just not in the mood to dig now...");`
	`54`	`+`
`53`	`55`	`apiName = "astar.dev.images.api";`
`54`	`56`
`55`	`57`	`return apiName;`
`56`	`58`	`}`
`57`		`-}`
	`59`	`+}`