From 5728475c961525daad6c76fb86ff7b30c9fd480c Mon Sep 17 00:00:00 2001 From: Srihari Sridharan Date: Sat, 23 May 2026 18:04:40 +0530 Subject: [PATCH 1/3] Fixed vulnerable assemblies. --- .gitignore | 2 ++ .../OnlineShop.ServiceDefaults.csproj | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ce89292..ae9b107 100644 --- a/.gitignore +++ b/.gitignore @@ -416,3 +416,5 @@ FodyWeavers.xsd *.msix *.msm *.msp +**/.idea/ +**/.DS_Store diff --git a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/OnlineShop.ServiceDefaults.csproj b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/OnlineShop.ServiceDefaults.csproj index 0eaff94..76f8639 100644 --- a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/OnlineShop.ServiceDefaults.csproj +++ b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/OnlineShop.ServiceDefaults.csproj @@ -12,7 +12,7 @@ - + From 49a89d99c05ba2780f2d642666f9a5374105b9ab Mon Sep 17 00:00:00 2001 From: Srihari Sridharan Date: Sat, 23 May 2026 18:39:15 +0530 Subject: [PATCH 2/3] Refactoring for readability --- .../OnlineShop/OnlineShop.ApiService/Program.cs | 2 ++ .../OnlineShop.ServiceDefaults/Extensions.cs | 12 ++++++------ BaselineApp/OnlineShop/OnlineShop.Web/Program.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs b/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs index 570ff49..cd1ff2a 100644 --- a/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs +++ b/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs @@ -1,3 +1,5 @@ +using OnlineShop.ServiceDefaults; + var builder = WebApplication.CreateBuilder(args); // Add service defaults & Aspire client integrations. diff --git a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs index b72c875..cb67bfb 100644 --- a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs +++ b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs @@ -2,13 +2,13 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics.HealthChecks; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Diagnostics.HealthChecks; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.ServiceDiscovery; using OpenTelemetry; using OpenTelemetry.Metrics; using OpenTelemetry.Trace; -namespace Microsoft.Extensions.Hosting; +namespace OnlineShop.ServiceDefaults; // Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry. // This project should be referenced by each service project in your solution. @@ -59,12 +59,12 @@ public static class Extensions .AddHttpClientInstrumentation() .AddRuntimeInstrumentation(); }) - .WithTracing(tracing => + .WithTracing(tracerProviderBuilder => { - tracing.AddSource(builder.Environment.ApplicationName) - .AddAspNetCoreInstrumentation(tracing => + tracerProviderBuilder.AddSource(builder.Environment.ApplicationName) + .AddAspNetCoreInstrumentation(traceInstrumentationOptions => // Exclude health check requests from tracing - tracing.Filter = context => + traceInstrumentationOptions.Filter = context => !context.Request.Path.StartsWithSegments(HealthEndpointPath) && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath) ) diff --git a/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs b/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs index 3e6891c..1ccac32 100644 --- a/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs +++ b/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs @@ -1,3 +1,4 @@ +using OnlineShop.ServiceDefaults; using OnlineShop.Web; using OnlineShop.Web.Components; From ca096e267e5c56e6bac1f13833f8da3c5c5c701a Mon Sep 17 00:00:00 2001 From: Srihari Sridharan Date: Sat, 23 May 2026 18:47:24 +0530 Subject: [PATCH 3/3] Fixed code analysis suggestions. --- .../OnlineShop.ServiceDefaults/Extensions.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs index cb67bfb..fb02fe2 100644 --- a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs +++ b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs @@ -44,7 +44,7 @@ public static class Extensions return builder; } - public static TBuilder ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder + private static void ConfigureOpenTelemetry(this TBuilder builder) where TBuilder : IHostApplicationBuilder { builder.Logging.AddOpenTelemetry(logging => { @@ -74,11 +74,9 @@ public static class Extensions }); builder.AddOpenTelemetryExporters(); - - return builder; } - private static TBuilder AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder + private static void AddOpenTelemetryExporters(this TBuilder builder) where TBuilder : IHostApplicationBuilder { var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]); @@ -93,17 +91,13 @@ public static class Extensions // builder.Services.AddOpenTelemetry() // .UseAzureMonitor(); //} - - return builder; } - public static TBuilder AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder + private static void AddDefaultHealthChecks(this TBuilder builder) where TBuilder : IHostApplicationBuilder { builder.Services.AddHealthChecks() // Add a default liveness check to ensure app is responsive .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]); - - return builder; } public static WebApplication MapDefaultEndpoints(this WebApplication app)