Updating to 9.5 pre-release

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
   "name": ".NET Aspire Community Toolkit",
-  "image": "mcr.microsoft.com/devcontainers/dotnet:8.0-jammy",
+  "image": "mcr.microsoft.com/devcontainers/dotnet:8.0-noble",
   "features": {
     "ghcr.io/azure/azure-dev/azd:latest": {},
     "ghcr.io/devcontainers/features/dotnet:latest": {

Directory.Build.props

@@ -12,7 +12,7 @@
     <Nullable>enable</Nullable>
 
     <AspireMajorVersion>9</AspireMajorVersion>
-    <AspireVersion>$(AspireMajorVersion).4.1</AspireVersion>
+    <AspireVersion>$(AspireMajorVersion).5.0</AspireVersion>
     <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
     <AspNetCoreVersion>9.0.0</AspNetCoreVersion>
     <DotNetExtensionsVersion>9.0.4</DotNetExtensionsVersion>

Directory.Packages.props

@@ -45,7 +45,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
     <!-- .NET packages -->
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.4.0" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(DotNetExtensionsVersion)" />
@@ -110,7 +110,7 @@
     <PackageVersion Include="Testcontainers.MsSql" Version="$(TestContainersVersion)" />
   </ItemGroup>
   <ItemGroup Label=".NET 9 Overrides" Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.7" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.7" />
+    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
   </ItemGroup>
 </Project>

nuget.config

@@ -1,19 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
-    <!-- <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" /> -->
+    <add key="aspire9-5-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-48a11dae/nuget/v3/index.json" /> 
   </packageSources>
   <packageSourceMapping>
-    <!-- <packageSource key="dotnet9">
-      <package pattern="Aspire.*" />
-      <package pattern="Microsoft.Extensions.ServiceDiscovery*" />
-      <package pattern="Microsoft.Extensions.Http.Resilience" />
-    </packageSource> -->
+    <packageSource key="aspire9-5-public"> 
+      <package pattern="Aspire.*" /> 
+      <package pattern="Microsoft.Extensions.ServiceDiscovery*" /> 
+    </packageSource> 
     <packageSource key="dotnet-eng">
       <package pattern="Microsoft.DotNet.XUnitExtensions" />
     </packageSource>

tests/CommunityToolkit.Aspire.Hosting.Azure.Dapr.Redis.Tests/ResourceCreationTests.cs

@@ -33,11 +33,11 @@ public void WithReference_WhenAADDisabled_UsesPasswordSecret()
 
         // First check if there are any resources with the annotation
         Assert.NotEmpty(resourcesWithAnnotation);
-        
+
         // Now check for a specific resource
-        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(), 
+        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(),
             r => r.Name == "statestore");
-            
+
         // Check there's an annotation on it
         Assert.Contains(daprStateStore.Annotations, a => a is AzureDaprComponentPublishingAnnotation);
 
@@ -96,15 +96,15 @@ param redisstate_kv_outputs_name string
         // Get the actual bicep template and rearrange the ordering if needed
         var actualLines = redisBicep.Split(Environment.NewLine);
         var expectedLines = expectedRedisBicep.Split(Environment.NewLine);
-        
+
         // Compare the Redis resource configuration which is what we actually care about
-        var redisResourceSection = string.Join(Environment.NewLine, 
-            actualLines.Where(line => line.Contains("resource redisState") || 
-                                    line.Contains("name:") || 
-                                    line.Contains("sku:") || 
-                                    line.Contains("family:") || 
+        var redisResourceSection = string.Join(Environment.NewLine,
+            actualLines.Where(line => line.Contains("resource redisState") ||
+                                    line.Contains("name:") ||
+                                    line.Contains("sku:") ||
+                                    line.Contains("family:") ||
                                     line.Contains("capacity:")));
-                                    
+
         Assert.Contains("'Microsoft.Cache/redis@2024-11-01'", redisResourceSection);
 
         // Verify that resources with Dapr publishing annotations exist
@@ -133,11 +133,11 @@ public void WithReference_WhenAADEnabled_SkipsPasswordSecret()
 
         // First check if there are any resources with the annotation
         Assert.NotEmpty(resourcesWithAnnotation);
-        
+
         // Now check for a specific resource
-        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(), 
+        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(),
             r => r.Name == "statestore");
-            
+
         // Check there's an annotation on it
         Assert.Contains(daprStateStore.Annotations, a => a is AzureDaprComponentPublishingAnnotation);
 
@@ -174,6 +174,8 @@ public void WithReference_WhenAADEnabled_SkipsPasswordSecret()
 
             output name string = redisState.name
 
+            output hostName string = redisState.properties.hostName
+
             output daprConnectionString string = '${redisState.properties.hostName}:${redisState.properties.sslPort}'
             """;
 
@@ -210,11 +212,11 @@ public void WithReference_WhenTLSDisabled_UsesNonSslPort()
 
         // First check if there are any resources with the annotation
         Assert.NotEmpty(resourcesWithAnnotation);
-        
+
         // Now check for a specific resource
-        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(), 
+        var daprStateStore = Assert.Single(appModel.Resources.OfType<IDaprComponentResource>(),
             r => r.Name == "statestore");
-            
+
         // Check there's an annotation on it
         Assert.Contains(daprStateStore.Annotations, a => a is AzureDaprComponentPublishingAnnotation);
 
@@ -252,6 +254,8 @@ public void WithReference_WhenTLSDisabled_UsesNonSslPort()
 
             output name string = redisState.name
 
+            output hostName string = redisState.properties.hostName
+
             output daprConnectionString string = '${redisState.properties.hostName}:${redisState.properties.port}'
             """;
 
@@ -271,32 +275,34 @@ public void WithReference_WhenNonStateType_ThrowsException()
         using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
 
         var redisState = builder.AddAzureRedis("redisState").RunAsContainer();
-        
+
         // The Redis connection should only be used with state store components
-        var unknownComponent = builder.AddDaprComponent("unknown","component");
-        
+        var unknownComponent = builder.AddDaprComponent("unknown", "component");
+
         // Create an app with a sidecar that references the unknown component
         var appBuilder = builder.AddContainer("myapp", "image")
-            .WithDaprSidecar(sidecar => {
+            .WithDaprSidecar(sidecar =>
+            {
                 // Reference the unknown component first
                 sidecar.WithReference(unknownComponent);
             });
-            
+
         // Attempting to create a non-state store reference to Redis should throw
-        var exception = Assert.Throws<InvalidOperationException>(() => {
+        var exception = Assert.Throws<InvalidOperationException>(() =>
+        {
             unknownComponent.WithReference(redisState);
         });
-        
+
         // Verify the exception message contains information about the unsupported component type
         Assert.Contains("Unsupported Dapr component", exception.Message, StringComparison.OrdinalIgnoreCase);
-        
+
         // Demonstrate the correct way to reference Redis
         var stateStore = builder.AddDaprStateStore("statestore");
         stateStore.WithReference(redisState); // This should work correctly
-        
+
         using var app = builder.Build();
     }
-    
+
     [Fact]
     public void PreferredPattern_ReferencingRedisStateComponent()
     {
@@ -306,31 +312,32 @@ public void PreferredPattern_ReferencingRedisStateComponent()
         // Add the Redis state and Dapr state store
         var redisState = builder.AddAzureRedis("redisState").RunAsContainer();
         var daprState = builder.AddDaprStateStore("statestore");
-        
+
         // Add an app with a sidecar
         builder.AddContainer("myapp", "image")
-            .WithDaprSidecar(sidecar => {
+            .WithDaprSidecar(sidecar =>
+            {
                 // Reference both components through the sidecar
                 sidecar.WithReference(daprState);
                 // We can't directly reference Redis from the sidecar due to interface incompatibilities
                 // This line would fail with a compile error: sidecar.WithReference(redisState);
-                
+
                 // We need to first create a Dapr component that references Redis
                 var anotherState = builder.AddDaprStateStore("anotherstate");
                 anotherState.WithReference(redisState);
                 sidecar.WithReference(anotherState);
             });
-            
+
         using var app = builder.Build();
-        
+
         var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();
         var sidecarResource = Assert.Single(appModel.Resources.OfType<IDaprSidecarResource>());
-        
+
         // Check for component reference annotations
         var referenceAnnotations = sidecarResource.Annotations
             .OfType<DaprComponentReferenceAnnotation>()
             .ToList();
-        
+
         Assert.Equal(2, referenceAnnotations.Count);
     }
 }