Update Aspire version to 9.2.0 (#627)

* Update Aspire version

* Updating the version of the CT

* Fixing ollama tests

* Fixing test to match the updated Bicep output

* Update ResourceCreationTests.cs

Update tests to remove principal information

* Populate redis password in dbgate

* Fix redis-password tests

* Fix test

---------

Co-authored-by: Aaron Powell <[email protected]>
Co-authored-by: Brett Smith <[email protected]>
Co-authored-by: Alireza Baloochi <[email protected]>

Author: 4 people

Directory.Build.props

@@ -12,7 +12,7 @@
     <Nullable>enable</Nullable>
 
     <AspireMajorVersion>9</AspireMajorVersion>
-    <AspireVersion>$(AspireMajorVersion).1.0</AspireVersion>
+    <AspireVersion>$(AspireMajorVersion).2.0</AspireVersion>
     <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
     <AspNetCoreVersion>9.0.0</AspNetCoreVersion>
     <DotNetExtensionsVersion>9.0.4</DotNetExtensionsVersion>
@@ -37,8 +37,8 @@
 
   <!-- Versioning -->
   <PropertyGroup>
-    <ToolkitMinorVersion>3</ToolkitMinorVersion>
-    <ToolkitPatchVersion>1</ToolkitPatchVersion>
+    <ToolkitMinorVersion>4</ToolkitMinorVersion>
+    <ToolkitPatchVersion>0</ToolkitPatchVersion>
     <ToolkitPreviewVersion>preview.1</ToolkitPreviewVersion>
 
     <VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>

src/CommunityToolkit.Aspire.Hosting.Java/JavaAppHostingExtension.Executable.cs

@@ -107,16 +107,18 @@ public static IResourceBuilder<JavaAppExecutableResource> WithMavenBuild(
                 await BuildWithMaven(builder.Resource, context.ServiceProvider, context.CancellationToken, false).ConfigureAwait(false) ?
                     new ExecuteCommandResult { Success = true } :
                     new ExecuteCommandResult { Success = false, ErrorMessage = "Failed to build with Maven" },
-            (context) => context.ResourceSnapshot.State switch
+            new CommandOptions()
             {
-                { Text: "Stopped" } or
-                { Text: "Exited" } or
-                { Text: "Finished" } or
-                { Text: "FailedToStart" } => ResourceCommandState.Enabled,
-                _ => ResourceCommandState.Disabled
-            },
-            iconName: "build"
-        );
+                IconName = "build",
+                UpdateState = (context) => context.ResourceSnapshot.State switch
+                {
+                    { Text: "Stopped" } or
+                    { Text: "Exited" } or
+                    { Text: "Finished" } or
+                    { Text: "FailedToStart" } => ResourceCommandState.Enabled,
+                    _ => ResourceCommandState.Disabled
+                },
+            });
 
         return builder;
 

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResourceBuilderExtensions.Model.cs

@@ -145,10 +145,6 @@ private static IResourceBuilder<OllamaModelResource> AddModelResourceCommand(
             builder.WithCommand(
                 name: name,
                 displayName: displayName,
-                updateState: context =>
-                    context.ResourceSnapshot.State?.Text == KnownResourceStates.Running ?
-                        ResourceCommandState.Enabled :
-                        ResourceCommandState.Disabled,
                 executeCommand: async context =>
                 {
                     var modelResource = builder.Resource;
@@ -165,13 +161,19 @@ private static IResourceBuilder<OllamaModelResource> AddModelResourceCommand(
 
                     return await executeCommand(modelResource, ollamaClient, logger, notificationService, context.CancellationToken);
                 },
-                displayDescription: displayDescription,
-                parameter: parameter,
-                confirmationMessage: confirmationMessage,
-                iconName: iconName,
-                iconVariant: iconVariant,
-                isHighlighted: isHighlighted
-            );
+                commandOptions: new()
+                {
+                    Description = displayDescription,
+                    Parameter = parameter,
+                    ConfirmationMessage = confirmationMessage,
+                    IconName = iconName,
+                    IconVariant = iconVariant,
+                    IsHighlighted = isHighlighted,
+                    UpdateState = context =>
+                    context.ResourceSnapshot.State?.Text == KnownResourceStates.Running ?
+                        ResourceCommandState.Enabled :
+                        ResourceCommandState.Disabled,
+                });
 
     private static IResourceBuilder<OllamaModelResource> WithModelDownload(this IResourceBuilder<OllamaModelResource> builder)
     {

src/CommunityToolkit.Aspire.Hosting.Redis.Extensions/RedisBuilderExtensions.cs

@@ -64,9 +64,11 @@ private static void ConfigureDbGateContainer(EnvironmentCallbackContext context,
         {
 
             // DbGate assumes Redis is being accessed over a default Aspire container network and hardcodes the resource address
-            // This will need to be refactored once updated service discovery APIs are available
+            var redisUrl = redisResource.PasswordParameter is not null ?
+                $"redis://:{redisResource.PasswordParameter.Value}@{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}" : $"redis://{redisResource.Name}:{redisResource.PrimaryEndpoint.TargetPort}";
+
             context.EnvironmentVariables.Add($"LABEL_redis{counter}", redisResource.Name);
-            context.EnvironmentVariables.Add($"URL_redis{counter}", redisResource.ConnectionStringExpression);
+            context.EnvironmentVariables.Add($"URL_redis{counter}", redisUrl);
             context.EnvironmentVariables.Add($"ENGINE_redis{counter}", "redis@dbgate-plugin-redis");
 
             counter++;

src/CommunityToolkit.Aspire.Hosting.SqlDatabaseProjects/SqlProjectBuilderExtensions.cs

@@ -215,11 +215,14 @@ internal static IResourceBuilder<TResource> InternalWithReference<TResource>(thi
             var service = context.ServiceProvider.GetRequiredService<SqlProjectPublishService>();
             await service.PublishSqlProject(builder.Resource, target.Resource, targetDatabaseName, context.CancellationToken);
             return new ExecuteCommandResult { Success = true };
-        }, updateState: (context) => context.ResourceSnapshot?.State?.Text == KnownResourceStates.Finished ? ResourceCommandState.Enabled : ResourceCommandState.Disabled,
-           displayDescription: "Redeploys the SQL Server Database Project to the target database.",
-           iconName: "ArrowReset",
-           iconVariant: IconVariant.Filled,
-           isHighlighted: true);
+        }, new CommandOptions()
+        {
+            Description = "Redeploys the SQL Server Database Project to the target database.",
+            IconName = "ArrowReset",
+            IconVariant = IconVariant.Filled,
+            IsHighlighted = true,
+            UpdateState = (context) => context.ResourceSnapshot?.State?.Text == KnownResourceStates.Finished ? ResourceCommandState.Enabled : ResourceCommandState.Disabled,
+        });
 
         return builder;
     }