Updated to .NET Aspire 9.2 (#129)

Author: csharpfritz

complete/Api/Api.csproj

@@ -5,10 +5,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
+    <PackageReference Include="Aspire.StackExchange.Redis.OutputCaching" Version="9.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceDefaults\ServiceDefaults.csproj" />

complete/Api/Program.cs

@@ -1,8 +1,3 @@
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
-using Api.Data;
-using Microsoft.EntityFrameworkCore;
-
 var builder = WebApplication.CreateBuilder(args);
 
 builder.AddRedisOutputCache("cache");
@@ -19,16 +14,16 @@
 builder.Services.AddNwsManager();
 
 builder.Services.AddOpenTelemetry()
-    .WithMetrics(m => m.AddMeter("NwsManagerMetrics"))
-    .WithTracing(m => m.AddSource("NwsManager"));
+		.WithMetrics(m => m.AddMeter("NwsManagerMetrics"))
+		.WithTracing(m => m.AddSource("NwsManager"));
 
 var app = builder.Build();
 
 app.MapDefaultEndpoints();
 
 if (app.Environment.IsDevelopment())
 {
-    app.MapOpenApi();
+	app.MapOpenApi();
 }
 
 app.UseHttpsRedirection();

complete/AppHost/AppHost.csproj

@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <IsAspireHost>true</IsAspireHost>
     <UserSecretsId>23eb7bf1-476d-4f58-9d5c-f8369a94f289</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
-    <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.1.0" />
-    <PackageReference Include="Aspire.Hosting.Redis" Version="9.1.0" />
+    <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.2.0" />
+    <PackageReference Include="Aspire.Hosting.Redis" Version="9.2.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Api\Api.csproj" />

complete/AppHost/Program.cs

@@ -1,20 +1,20 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
 var cache = builder.AddRedis("cache")
-                   .WithRedisCommander();
+									 .WithRedisInsight();
 
-var api = builder.AddProject<Projects.Api>("api")
-                 .WithReference(cache);
+var api = builder.AddProject<Projects.Api>("api")//;
+.WithReference(cache);
 
 var postgres = builder.AddPostgres("postgres")
-                .WithDataVolume(isReadOnly: false);
+								.WithDataVolume(isReadOnly: false);
 
 var weatherDb = postgres.AddDatabase("weatherdb");
 
 var web = builder.AddProject<Projects.MyWeatherHub>("myweatherhub")
-                 .WithReference(api)
-                 .WithReference(weatherDb)
-                 .WaitFor(postgres)
-                 .WithExternalHttpEndpoints();
+								 .WithReference(api)
+								 .WithReference(weatherDb)
+								 .WaitFor(postgres)
+								 .WithExternalHttpEndpoints();
 
 builder.Build().Run();

complete/IntegrationTests/IntegrationTests.csproj

@@ -14,8 +14,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Aspire.Hosting.Testing" Version="9.1.0" />
-		<PackageReference Include="MSTest" Version="3.8.2" />
+		<PackageReference Include="Aspire.Hosting.Testing" Version="9.2.0" />
+		<PackageReference Include="MSTest" Version="3.8.3" />
 	</ItemGroup>
 
 	<ItemGroup>

complete/MyWeatherHub/MyWeatherHub.csproj

@@ -5,9 +5,9 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="9.0.2">
+    <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

complete/MyWeatherHub/Program.cs

@@ -6,12 +6,12 @@
 builder.AddServiceDefaults();
 builder.Services.AddHttpClient<NwsManager>(client =>
 {
-    client.BaseAddress = new("https+http://api");
+	client.BaseAddress = new("https+http://api");
 });
 
 // Add services to the container.
 builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
+		.AddInteractiveServerComponents();
 
 builder.Services.AddMemoryCache();
 
@@ -24,17 +24,15 @@
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
+	app.UseExceptionHandler("/Error", createScopeForErrors: true);
+	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+	app.UseHsts();
 }
-else 
+else
 {
-    using (var scope = app.Services.CreateScope())
-    {
-        var context = scope.ServiceProvider.GetRequiredService<MyWeatherContext>();
-        await context.Database.EnsureCreatedAsync();
-    }
+	using var scope = app.Services.CreateScope();
+	var context = scope.ServiceProvider.GetRequiredService<MyWeatherContext>();
+	await context.Database.EnsureCreatedAsync();
 }
 
 app.UseHttpsRedirection();
@@ -43,6 +41,6 @@
 app.UseAntiforgery();
 
 app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
+		.AddInteractiveServerRenderMode();
 
 app.Run();

complete/ServiceDefaults/ServiceDefaults.csproj

@@ -7,8 +7,8 @@
   </PropertyGroup>
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.2.0" />
 	<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.2" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.11.2" />

start/Api/Api.csproj

@@ -5,6 +5,6 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
   </ItemGroup>
 </Project>

start/MyWeatherHub/MyWeatherHub.csproj

@@ -5,8 +5,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="9.0.2">
+    <PackageReference Include="Microsoft.AspNetCore.Components.QuickGrid" Version="9.0.4" />
+    <PackageReference Include="Microsoft.Extensions.ApiDescription.Client" Version="9.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

workshop/1-setup.md

@@ -24,10 +24,10 @@ For the best experience, we recommend using Visual Studio 2022 with the .NET Asp
 
 ## Install Latest .NET Aspire Templates
 
-Run the following command to intall .NET Aspire 9.1 templates.
+Run the following command to intall .NET Aspire 9.2 templates.
 
 ```cli
-dotnet new install Aspire.ProjectTemplates::9.1.0 --force
+dotnet new install Aspire.ProjectTemplates::9.2.0 --force
 ```
 
 ## Test Installation

workshop/10-container-management.md

@@ -38,14 +38,14 @@ Ready to make your Redis container stick around? Let's update our App Host:
 
    ```csharp
    var cache = builder.AddRedis("cache")
-       .WithRedisCommander();
+       .WithRedisInsight();
    ```
 
 3. Add the magical `.WithLifetime` method:
 
    ```csharp
    var cache = builder.AddRedis("cache")
-       .WithRedisCommander()
+       .WithRedisInsight()
        .WithLifetime(ContainerLifetime.Persistent);
    ```
 
@@ -81,7 +81,7 @@ Named volumes are the simplest way to persist data. They're managed by Docker bu
 
 ```csharp
 var cache = builder.AddRedis("cache")
-    .WithRedisCommander()
+    .WithRedisInsight()
     .WithLifetime(ContainerLifetime.Persistent)
     .WithDataVolume("my-redis-data");
 ```
@@ -94,7 +94,7 @@ Sometimes you want to see and modify your container's files directly. That's whe
 
 ```csharp
 var cache = builder.AddRedis("cache")
-    .WithRedisCommander()
+    .WithRedisInsight()
     .WithLifetime(ContainerLifetime.Persistent)
     .WithDataBindMount(@"C:\Redis\Data");
 ```
@@ -107,7 +107,7 @@ Redis has its own data persistence mechanisms. We can configure Redis to save sn
 
 ```csharp
 var cache = builder.AddRedis("cache")
-    .WithRedisCommander()
+    .WithRedisInsight()
     .WithLifetime(ContainerLifetime.Persistent)
     .WithDataVolume("my-redis-data")
     .WithPersistence(interval: TimeSpan.FromMinutes(5), keysChangedThreshold: 100);
@@ -137,10 +137,10 @@ This is an amazing way to test resilience without restarting your entire debug s
 Time to see all this in action:
 
 1. Start the App Host project
-2. When the dashboard opens, open Redis Commander and create a test key
+2. When the dashboard opens, open Redis Insight and create a test key
 3. Stop the App Host completely
 4. Start the App Host again - notice how much faster Redis starts up?
-5. Check Redis Commander - your test key should still be there!
+5. Check Redis Insight - your test key should still be there!
 6. Try stopping just the Redis container using the dashboard controls
 7. Watch how your application handles the Redis outage
 8. Start Redis again and see your application recover

workshop/3-dashboard-apphost.md

@@ -99,4 +99,12 @@ Before continuing, consider some common terminology used in .NET Aspire:
 
 1. Click on the `Trace` or the `Details` to see the error message and stack trace.
 
+## The Dashboard Resource Graph
+
+We saw the table of resources in the .NET Aspire dashboard and that's a nice list of our resources, and we'll see that grow as our application system starts to utilize more resources.  Additionally, there is a **Graph** view of resources available by clicking the **Graph** text just above the table.
+
+![.NET Aspire Dashboard Resource Graph](./media/dashboard-graph.png)
+
+This graph is generated based on the references and relationships you configure for your application.
+
 **Next**: [Module #4: Service Discovery](./4-servicediscovery.md)

workshop/5-integrations.md

@@ -29,11 +29,11 @@ With the NuGet package installed, we can add Redis to our App Host:
                      .WithReference(cache);
     ```
 
-1. Additionally, we could configure [Redis Commander](https://joeferner.github.io/redis-commander/), a Redis management tool. As part of the `Aspire.Hosting.Redis` package,  Redis Commander is available in the same integration. To add Redis Commander, update the code adding the Redis resource to call the `WithRedisCommander()` method on the returned builder:
+1. Additionally, we could configure [Redis Insight](https://github.com/RedisInsight/RedisInsight), a Redis management tool from the Redis team. As part of the `Aspire.Hosting.Redis` package,  Redis Insight is available in the same integration. To add Redis Insight, update the code adding the Redis resource to call the `WithRedisInsight()` method on the returned builder:
 
     ```csharp
     var cache = builder.AddRedis("cache")
-                       .WithRedisCommander();
+                       .WithRedisInsight();
     ```
 
 ## Run the application
@@ -88,11 +88,11 @@ We will add the _Output caching_ Redis client integration to our `Api` project.
 
     ![Output caching in action](./media/output-caching.png)
 
-1. You can also see the cached response in Redis Commander. Open Redis Commander by clicking on the `cache-commander` endpoint in the dashboard. Under stats you will see connections and commands processed.
+1. You can also see the cached response in Redis Insight. Open Redis Insight by clicking on the `cache-insight` endpoint in the dashboard. Under stats you will see connections and commands processed.
 
-    ![Redis Commander](./media/redis-commander.png)
+    ![Redis Insight](./media/redis-insight.png)
 
-1. In addition, you can see logs for the Redis cache and Redis Commander in the `Console` tab.
+1. In addition, you can see logs for the Redis cache and Redis Insight in the `Console` tab.
 
     ![Redis logs](./media/redis-logs.png)
 
@@ -119,7 +119,7 @@ var cache = builder.AddRedis("cache")
 
 ## Summary
 
-In this section, we added a Redis hosting integration to the App Host and Redis output caching client integration in the API. We saw how the response was cached in the Redis cache and how the second and subsequent requests were much faster than the first one. We also saw how to use Redis Commander to manage the Redis cache.
+In this section, we added a Redis hosting integration to the App Host and Redis output caching client integration in the API. We saw how the response was cached in the Redis cache and how the second and subsequent requests were much faster than the first one. We also saw how to use Redis Insight to manage the Redis cache.
 
 There are many more Aspire integrations available that you can use to integrate with your services. You can find the list of available integrations [in the .NET Aspire documentation](https://learn.microsoft.com/dotnet/aspire/fundamentals/integrations-overview?tabs=dotnet-cli#available-integrations).