refactor: Update project configuration files and package versions

foxminchan · Sep 19, 2024 · 18547d7 · 18547d7
1 parent 818d5dc
commit 18547d7
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -4,24 +4,18 @@
   "tools": {
     "aspirate": {
       "version": "8.0.7",
-      "commands": [
-        "aspirate"
-      ],
+      "commands": ["aspirate"],
       "rollForward": false
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.3.8",
-      "commands": [
-        "reportgenerator"
-      ],
+      "version": "5.3.9",
+      "commands": ["reportgenerator"],
       "rollForward": false
     },
     "husky": {
       "version": "0.7.1",
-      "commands": [
-        "husky"
-      ],
+      "commands": ["husky"],
       "rollForward": false
     }
   }
-}
+}
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -29,6 +29,7 @@
     <PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(AspireVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(AspireVersion)" />
     <!-- Aspirant -->
     <PackageVersion Include="Aspirant.Hosting" Version="$(AspirantVersion)" />
     <PackageVersion Include="Aspirant.Hosting.Testing" Version="$(AspirantVersion)" />
@@ -52,7 +53,7 @@
     <PackageVersion Include="EntityFrameworkCore.Exceptions.Common" Version="8.1.3" />
     <PackageVersion Include="EntityFrameworkCore.Exceptions.PostgreSQL" Version="8.1.3" />
     <!-- Semantic Kernel -->
-    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.19.0" />
+    <PackageVersion Include="Microsoft.SemanticKernel" Version="1.20.0" />
     <!-- Polly -->
     <PackageVersion Include="Polly" Version="$(PollyVersion)" />
     <PackageVersion Include="Polly.Extensions" Version="$(PollyVersion)" />
@@ -95,8 +96,8 @@
     <!-- Miscellaneous -->
     <PackageVersion Include="Scrutor" Version="4.2.2" />
     <PackageVersion Include="MediatR" Version="12.4.1" />
-    <PackageVersion Include="MongoDB.Bson" Version="2.28.0" />
-    <PackageVersion Include="Marten.AspNetCore" Version="7.27.0" />
+    <PackageVersion Include="MongoDB.Bson" Version="2.29.0" />
+    <PackageVersion Include="Marten.AspNetCore" Version="7.28.0" />
     <PackageVersion Include="FluentEmail.Mailtrap" Version="2.7.0" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.3" />
     <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.7.3" />

diff --git a/src/BookWorm.AppHost/Program.cs b/src/BookWorm.AppHost/Program.cs
@@ -71,10 +71,12 @@
     .WithEnvironment("AiOptions__OpenAi__EmbeddingName", "text-embedding-3-small");
 
 var orderingApi = builder.AddProject<BookWorm_Ordering>("ordering-api")
+    .WithReference(redis)
     .WithReference(rabbitMq)
     .WithReference(orderingDb)
     .WaitFor(rabbitMq)
     .WaitFor(orderingDb)
+    .WaitFor(redis)
     .WithEnvironment("Identity__Url", identityEndpoint);
 
 var ratingApi = builder.AddProject<BookWorm_Rating>("rating-api")

diff --git a/src/BookWorm.Catalog/GlobalUsings.cs b/src/BookWorm.Catalog/GlobalUsings.cs
@@ -32,6 +32,7 @@
 global using Azure;
 global using Azure.Storage.Blobs;
 global using Azure.Storage.Blobs.Models;
+global using BookWorm.Catalog.Extensions;
 global using BookWorm.Constants;
 global using Polly;
 global using Polly.Registry;
diff --git a/src/BookWorm.Catalog/Program.cs b/src/BookWorm.Catalog/Program.cs
@@ -1,5 +1,4 @@
-using BookWorm.Catalog.Extensions;
-using GrpcBookServer = BookWorm.Catalog.Grpc.BookService;
+using GrpcBookServer = BookWorm.Catalog.Grpc.BookService;
 
 var builder = WebApplication.CreateBuilder(args);
 

diff --git a/src/BookWorm.Gateway/BookWorm.Gateway.csproj b/src/BookWorm.Gateway/BookWorm.Gateway.csproj
@@ -2,6 +2,7 @@
 
   <ItemGroup>
     <PackageReference Include="Duende.BFF.Yarp" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery.Yarp" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/BookWorm.Gateway/Program.cs b/src/BookWorm.Gateway/Program.cs
@@ -10,6 +10,7 @@
 
 builder.Services.AddReverseProxy()
     .LoadFromConfig(builder.Configuration.GetSection("ReverseProxy"))
+    .AddServiceDiscoveryDestinationResolver()
     .AddBffExtensions();
 
 Configuration config = new();

diff --git a/src/BookWorm.Notification/GlobalUsings.cs b/src/BookWorm.Notification/GlobalUsings.cs
@@ -2,6 +2,7 @@
 global using Ardalis.GuardClauses;
 global using BookWorm.Constants;
 global using BookWorm.Core.SeedWork;
+global using BookWorm.Notification.Extensions;
 global using BookWorm.Notification.Infrastructure;
 global using BookWorm.Notification.Models;
 global using BookWorm.Notification.OpenTelemetry;

diff --git a/src/BookWorm.Notification/Program.cs b/src/BookWorm.Notification/Program.cs
@@ -1,6 +1,4 @@
-using BookWorm.Notification.Extensions;
-
-var builder = WebApplication.CreateBuilder(args);
+var builder = WebApplication.CreateBuilder(args);
 
 builder.AddApplicationServices();
 

diff --git a/src/BookWorm.ServiceDefaults/OpenApi.Extension.cs b/src/BookWorm.ServiceDefaults/OpenApi.Extension.cs
@@ -46,7 +46,7 @@ public static WebApplication UseOpenApi(this WebApplication app)
             options.EnableUntrustedSpec();
         });
 
-        if (!app.Environment.IsDevelopment())
+        if (app.Environment.IsDevelopment())
         {
             app.UseSwaggerUI(options =>
             {