diff --git a/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs b/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs index ac3a0704f90..8879bc897cf 100644 --- a/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs +++ b/src/Aspire.Hosting.Azure.AppConfiguration/AzureAppConfigurationExtensions.cs @@ -82,6 +82,7 @@ public static IResourceBuilder AddAzureAppConfigu var resource = new AzureAppConfigurationResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("Settings") .WithDefaultRoleAssignments(AppConfigurationBuiltInRole.GetBuiltInRoleName, AppConfigurationBuiltInRole.AppConfigurationDataOwner); } diff --git a/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs b/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs index 163d20cea44..1da423ae442 100644 --- a/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs +++ b/src/Aspire.Hosting.Azure.AppContainers/AzureContainerAppExtensions.cs @@ -1200,7 +1200,7 @@ private static AzureContainerRegistryResource CreateDefaultAzureContainerRegistr var resource = new AzureContainerRegistryResource(name, configureInfrastructure); if (builder.ExecutionContext.IsPublishMode) { - builder.AddResource(resource); + builder.AddResource(resource).WithIconName("Archive"); } return resource; } diff --git a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs index 1da59c8a021..8b7aec9859c 100644 --- a/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs +++ b/src/Aspire.Hosting.Azure.AppService/AzureAppServiceEnvironmentExtensions.cs @@ -298,7 +298,7 @@ public static IResourceBuilder AddAzureAppSe // Create the resource builder first, then attach the registry to avoid recreating builders var appServiceEnvBuilder = builder.ExecutionContext.IsPublishMode - ? builder.AddResource(resource) + ? builder.AddResource(resource).WithIconName("Globe") : builder.CreateResourceBuilder(resource); appServiceEnvBuilder.WithCrossScopeAcrPullIdentity( @@ -551,7 +551,7 @@ private static AzureContainerRegistryResource CreateDefaultAzureContainerRegistr var resource = new AzureContainerRegistryResource(name, ContainerRegistryInfrastructure.ConfigureContainerRegistry); if (builder.ExecutionContext.IsPublishMode) { - builder.AddResource(resource); + builder.AddResource(resource).WithIconName("Archive"); } return resource; } diff --git a/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs b/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs index a2720b3c356..db897653ad9 100644 --- a/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs +++ b/src/Aspire.Hosting.Azure.ApplicationInsights/AzureApplicationInsightsExtensions.cs @@ -114,7 +114,8 @@ public static IResourceBuilder AddAzureApplica var resource = new AzureApplicationInsightsResource(name, configureInfrastructure); - var rb = builder.AddResource(resource); + var rb = builder.AddResource(resource) + .WithIconName("ChartMultiple"); if (logAnalyticsWorkspace != null) { diff --git a/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs b/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs index 3c232837965..b763e4f1799 100644 --- a/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs +++ b/src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIExtensions.cs @@ -116,6 +116,7 @@ public static IResourceBuilder AddAzureOpenAI(this IDistrib var resource = new AzureOpenAIResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("BrainCircuit") .WithDefaultRoleAssignments(CognitiveServicesBuiltInRole.GetBuiltInRoleName, CognitiveServicesBuiltInRole.CognitiveServicesOpenAIUser); } @@ -197,7 +198,8 @@ public static IResourceBuilder AddDeployment(this var deployment = new AzureOpenAIDeploymentResource(name, modelName, modelVersion, builder.Resource); builder.Resource.AddDeployment(deployment); - return builder.ApplicationBuilder.AddResource(deployment); + return builder.ApplicationBuilder.AddResource(deployment) + .WithIconName("BrainCircuit"); } /// diff --git a/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs b/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs index 1f18f61a61e..32958a71bf5 100644 --- a/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs +++ b/src/Aspire.Hosting.Azure.ContainerRegistry/AzureContainerRegistryExtensions.cs @@ -49,6 +49,7 @@ public static IResourceBuilder AddAzureContainer else { resourceBuilder = builder.AddResource(resource) + .WithIconName("Archive") .WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet())); } diff --git a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs index ec958e3a438..64da8f145e6 100644 --- a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs +++ b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs @@ -43,6 +43,7 @@ public static IResourceBuilder AddAzureCosmosDB(this IDis var resource = new AzureCosmosDBResource(name, ConfigureCosmosDBInfrastructure); return builder.AddResource(resource) + .WithIconName("DatabaseMultiple") .WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet())); } @@ -354,7 +355,8 @@ public static IResourceBuilder AddCosmosDatabase( var database = new AzureCosmosDBDatabaseResource(name, databaseName, builder.Resource); builder.Resource.Databases.Add(database); - return builder.ApplicationBuilder.AddResource(database); + return builder.ApplicationBuilder.AddResource(database) + .WithIconName("Database"); } /// @@ -378,7 +380,8 @@ public static IResourceBuilder AddContainer(this var container = new AzureCosmosDBContainerResource(name, containerName, partitionKeyPath, builder.Resource); builder.Resource.Containers.Add(container); - return builder.ApplicationBuilder.AddResource(container); + return builder.ApplicationBuilder.AddResource(container) + .WithIconName("Box"); } /// @@ -435,7 +438,8 @@ public static IResourceBuilder AddContainer(this builder.Resource.Containers.Add(container); - return builder.ApplicationBuilder.AddResource(container); + return builder.ApplicationBuilder.AddResource(container) + .WithIconName("Box"); } /// diff --git a/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs b/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs index 38cae6c5e62..8900e8e8b88 100644 --- a/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs +++ b/src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs @@ -127,6 +127,7 @@ public static IResourceBuilder AddAzureEventHubs( var resource = new AzureEventHubsResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("MailMultiple") .WithDefaultRoleAssignments(EventHubsBuiltInRole.GetBuiltInRoleName, EventHubsBuiltInRole.AzureEventHubsDataOwner); } @@ -168,7 +169,8 @@ public static IResourceBuilder AddHub(this IResourceBuild var hub = new AzureEventHubResource(name, hubName, builder.Resource); builder.Resource.Hubs.Add(hub); - return builder.ApplicationBuilder.AddResource(hub); + return builder.ApplicationBuilder.AddResource(hub) + .WithIconName("Mail"); } /// @@ -212,7 +214,8 @@ public static IResourceBuilder AddConsumerGr var consumerGroup = new AzureEventHubConsumerGroupResource(name, groupName, builder.Resource); builder.Resource.ConsumerGroups.Add(consumerGroup); - return builder.ApplicationBuilder.AddResource(consumerGroup); + return builder.ApplicationBuilder.AddResource(consumerGroup) + .WithIconName("Mail"); } /// diff --git a/src/Aspire.Hosting.Azure.FrontDoor/AzureFrontDoorExtensions.cs b/src/Aspire.Hosting.Azure.FrontDoor/AzureFrontDoorExtensions.cs index 73e557b2926..5ffa4d2bd1e 100644 --- a/src/Aspire.Hosting.Azure.FrontDoor/AzureFrontDoorExtensions.cs +++ b/src/Aspire.Hosting.Azure.FrontDoor/AzureFrontDoorExtensions.cs @@ -155,7 +155,7 @@ public static IResourceBuilder AddAzureFrontDoor( var resource = new AzureFrontDoorResource(name, configureInfrastructure); return builder.ExecutionContext.IsPublishMode - ? builder.AddResource(resource) + ? builder.AddResource(resource).WithIconName("GlobeArrowForward") : builder.CreateResourceBuilder(resource); } diff --git a/src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs b/src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs index dbaf7308dc3..810a5148b94 100644 --- a/src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs +++ b/src/Aspire.Hosting.Azure.Functions/AzureFunctionsProjectResourceExtensions.cs @@ -187,6 +187,7 @@ private static IResourceBuilder AddAzureFunctions #pragma warning disable ASPIREEXTENSION001 // WithDebugSupport is experimental var functionsBuilder = builder.AddResource(resource) + .WithIconName("Flash") .WithAnnotation(projectMetadata) .WithAnnotation(new AzureFunctionsAnnotation()) .WithDebugSupport(mode => new AzureFunctionsLaunchConfiguration { ProjectPath = projectMetadata.ProjectPath, Mode = mode }, "azure-functions"); diff --git a/src/Aspire.Hosting.Azure.Functions/DurableTask/DurableTaskResourceExtensions.cs b/src/Aspire.Hosting.Azure.Functions/DurableTask/DurableTaskResourceExtensions.cs index 212d5d2ed1b..6673c30e68a 100644 --- a/src/Aspire.Hosting.Azure.Functions/DurableTask/DurableTaskResourceExtensions.cs +++ b/src/Aspire.Hosting.Azure.Functions/DurableTask/DurableTaskResourceExtensions.cs @@ -35,7 +35,8 @@ public static IResourceBuilder AddDurableTaskSched scheduler.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore); - return builder.AddResource(scheduler); + return builder.AddResource(scheduler) + .WithIconName("CalendarClock"); } /// @@ -220,7 +221,8 @@ public static IResourceBuilder AddTaskHub(this IResource hub.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore); - var hubBuilder = builder.ApplicationBuilder.AddResource(hub); + var hubBuilder = builder.ApplicationBuilder.AddResource(hub) + .WithIconName("CalendarClock"); hubBuilder.OnResourceReady( async (r, e, ct) => diff --git a/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs b/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs index 2079d770958..42c7610f3fb 100644 --- a/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs +++ b/src/Aspire.Hosting.Azure.KeyVault/AzureKeyVaultResourceExtensions.cs @@ -143,6 +143,7 @@ public static IResourceBuilder AddAzureKeyVault(this IDis var resource = new AzureKeyVaultResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("Vault") .WithDefaultRoleAssignments(KeyVaultBuiltInRole.GetBuiltInRoleName, KeyVaultBuiltInRole.KeyVaultSecretsUser); } @@ -297,7 +298,7 @@ public static IResourceBuilder AddSecret(this IReso var secret = new AzureKeyVaultSecretResource(name, name, builder.Resource, parameterResource); builder.Resource.Secrets.Add(secret); - return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest(); + return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest(); } /// @@ -318,7 +319,7 @@ public static IResourceBuilder AddSecret(this IReso var secret = new AzureKeyVaultSecretResource(name, name, builder.Resource, value); builder.Resource.Secrets.Add(secret); - return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest(); + return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest(); } /// @@ -357,7 +358,7 @@ public static IResourceBuilder AddSecret(this IReso var secret = new AzureKeyVaultSecretResource(name, secretName, builder.Resource, parameterResource); builder.Resource.Secrets.Add(secret); - return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest(); + return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest(); } /// @@ -379,7 +380,7 @@ public static IResourceBuilder AddSecret(this IReso var secret = new AzureKeyVaultSecretResource(name, secretName, builder.Resource, value); builder.Resource.Secrets.Add(secret); - return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest(); + return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest(); } private static void ValidateSecretName(string secretName) diff --git a/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentExtensions.cs b/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentExtensions.cs index c475750f688..19ce4a6c4ca 100644 --- a/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentExtensions.cs +++ b/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentExtensions.cs @@ -131,7 +131,8 @@ public static IResourceBuilder AddAzureKuber } })); - return builder.AddResource(resource); + return builder.AddResource(resource) + .WithIconName("ServerMultiple"); } /// @@ -185,6 +186,7 @@ public static IResourceBuilder AddNodePool( } return builder.ApplicationBuilder.AddResource(nodePool) + .WithIconName("Cpu") .ExcludeFromManifest(); } @@ -476,6 +478,7 @@ existingDelegation is not null } return builder.ApplicationBuilder.AddResource(lb) + .WithIconName("GlobeArrowForward") .ExcludeFromManifest(); } diff --git a/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentResource.AksPipeline.cs b/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentResource.AksPipeline.cs index 15781036db5..9e5b3f38302 100644 --- a/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentResource.AksPipeline.cs +++ b/src/Aspire.Hosting.Azure.Kubernetes/AzureKubernetesEnvironmentResource.AksPipeline.cs @@ -161,6 +161,7 @@ private Task PrepareAksEnvironmentAsync(PipelineStepContext context) var defaultPool = new AksNodePoolResource("workload", defaultConfig, environment); defaultPool.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore); + defaultPool.Annotations.Add(new ResourceIconAnnotation("Cpu")); appModel.Resources.Add(defaultPool); return defaultPool; } @@ -188,6 +189,7 @@ private static AksNodePoolResource FindNodePoolResource( var config = environment.NodePools.First(p => p.Name == poolName); var pool = new AksNodePoolResource(poolName, config, environment); pool.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore); + pool.Annotations.Add(new ResourceIconAnnotation("Cpu")); appModel.Resources.Add(pool); return pool; } diff --git a/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs b/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs index 5ac450c841c..e7374eedae6 100644 --- a/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs +++ b/src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs @@ -88,7 +88,8 @@ public static IResourceBuilder AddAzureKustoCluster(t }; var resource = new AzureKustoClusterResource(name, configureInfrastructure); - var resourceBuilder = builder.AddResource(resource); + var resourceBuilder = builder.AddResource(resource) + .WithIconName("DatabaseMultiple"); AddKustoHealthChecksAndLifecycleManagement(resourceBuilder); AddKustoCustomCommands(resourceBuilder); @@ -116,7 +117,8 @@ public static IResourceBuilder AddReadWrite var kustoDatabase = new AzureKustoReadWriteDatabaseResource(name, databaseName, builder.Resource); builder.Resource.Databases.Add(kustoDatabase); - var resourceBuilder = builder.ApplicationBuilder.AddResource(kustoDatabase); + var resourceBuilder = builder.ApplicationBuilder.AddResource(kustoDatabase) + .WithIconName("Database"); // Register a health check that will be used to verify database is available KustoConnectionStringBuilder? kcsb = null; diff --git a/src/Aspire.Hosting.Azure.Network/AzureNetworkSecurityGroupExtensions.cs b/src/Aspire.Hosting.Azure.Network/AzureNetworkSecurityGroupExtensions.cs index 1d6b95f22d6..c8a9a42420b 100644 --- a/src/Aspire.Hosting.Azure.Network/AzureNetworkSecurityGroupExtensions.cs +++ b/src/Aspire.Hosting.Azure.Network/AzureNetworkSecurityGroupExtensions.cs @@ -52,7 +52,8 @@ public static IResourceBuilder AddNetworkSecu return builder.CreateResourceBuilder(resource); } - return builder.AddResource(resource); + return builder.AddResource(resource) + .WithIconName("ShieldLock"); } /// diff --git a/src/Aspire.Hosting.Azure.Network/AzureVirtualNetworkExtensions.cs b/src/Aspire.Hosting.Azure.Network/AzureVirtualNetworkExtensions.cs index a76d72761b2..1bc48abd1a0 100644 --- a/src/Aspire.Hosting.Azure.Network/AzureVirtualNetworkExtensions.cs +++ b/src/Aspire.Hosting.Azure.Network/AzureVirtualNetworkExtensions.cs @@ -106,7 +106,8 @@ private static IResourceBuilder AddAzureVirtualNetw return builder.CreateResourceBuilder(resource); } - return builder.AddResource(resource); + return builder.AddResource(resource) + .WithIconName("Router"); } private static void ConfigureVirtualNetwork(AzureResourceInfrastructure infra) @@ -274,6 +275,7 @@ private static IResourceBuilder AddSubnetCore( } return builder.ApplicationBuilder.AddResource(subnet) + .WithIconName("Router") .ExcludeFromManifest(); } diff --git a/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs b/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs index 7e066eb8e61..833f7e68b6f 100644 --- a/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs +++ b/src/Aspire.Hosting.Azure.OperationalInsights/AzureLogAnalyticsWorkspaceExtensions.cs @@ -59,6 +59,7 @@ public static IResourceBuilder AddAzureLogAn }; var resource = new AzureLogAnalyticsWorkspaceResource(name, configureInfrastructure); - return builder.AddResource(resource); + return builder.AddResource(resource) + .WithIconName("ChartMultiple"); } } diff --git a/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs b/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs index f30f5765f58..1398aad504a 100644 --- a/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs +++ b/src/Aspire.Hosting.Azure.Redis/AzureManagedRedisExtensions.cs @@ -57,6 +57,7 @@ public static IResourceBuilder AddAzureManagedRedis( var resource = new AzureManagedRedisResource(name, ConfigureRedisInfrastructure); return builder.AddResource(resource) + .WithIconName("Database") .WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet())); } diff --git a/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs b/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs index 2f8492d3dcb..3377694ceea 100644 --- a/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs +++ b/src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs @@ -123,6 +123,7 @@ public static IResourceBuilder AddAzureRedis( var resource = new AzureRedisCacheResource(name, ConfigureRedisInfrastructure); return builder.AddResource(resource) + .WithIconName("Database") .WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet())); } diff --git a/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs b/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs index 96921cf8fdb..248250b2d6b 100644 --- a/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs +++ b/src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs @@ -42,6 +42,7 @@ public static IResourceBuilder AddAzureSearch(this IDistrib AzureSearchResource resource = new(name, ConfigureSearch); return builder.AddResource(resource) + .WithIconName("Search") .WithDefaultRoleAssignments(SearchBuiltInRole.GetBuiltInRoleName, SearchBuiltInRole.SearchIndexDataContributor, SearchBuiltInRole.SearchServiceContributor); diff --git a/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs b/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs index 6868ccef3ac..22e2e5a7a55 100644 --- a/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs +++ b/src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs @@ -139,6 +139,7 @@ public static IResourceBuilder AddAzureServiceBus(this var resource = new AzureServiceBusResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("MailMultiple") .WithDefaultRoleAssignments(ServiceBusBuiltInRole.GetBuiltInRoleName, ServiceBusBuiltInRole.AzureServiceBusDataOwner); } @@ -182,7 +183,8 @@ public static IResourceBuilder AddServiceBusQueue( var queue = new AzureServiceBusQueueResource(name, queueName, builder.Resource); builder.Resource.Queues.Add(queue); - return builder.ApplicationBuilder.AddResource(queue); + return builder.ApplicationBuilder.AddResource(queue) + .WithIconName("Mail"); } /// @@ -267,7 +269,8 @@ public static IResourceBuilder AddServiceBusTopic( var topic = new AzureServiceBusTopicResource(name, topicName, builder.Resource); builder.Resource.Topics.Add(topic); - return builder.ApplicationBuilder.AddResource(topic); + return builder.ApplicationBuilder.AddResource(topic) + .WithIconName("Mail"); } /// @@ -339,7 +342,8 @@ public static IResourceBuilder AddServiceBu var subscription = new AzureServiceBusSubscriptionResource(name, subscriptionName, builder.Resource); builder.Resource.Subscriptions.Add(subscription); - return builder.ApplicationBuilder.AddResource(subscription); + return builder.ApplicationBuilder.AddResource(subscription) + .WithIconName("Mail"); } /// diff --git a/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs b/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs index e4b3587b356..cdc922dc774 100644 --- a/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs +++ b/src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs @@ -124,6 +124,7 @@ public static IResourceBuilder AddAzureSignalR(this IDistr var resource = new AzureSignalRResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("MailMultiple") .WithDefaultRoleAssignments(SignalRBuiltInRole.GetBuiltInRoleName, defaultRoles.ToArray()); } diff --git a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs index f82e102fbae..b8ef963507a 100644 --- a/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs +++ b/src/Aspire.Hosting.Azure.Storage/AzureStorageExtensions.cs @@ -160,6 +160,7 @@ public static IResourceBuilder AddAzureStorage(this IDistr var resource = new AzureStorageResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("HardDrive") .WithDefaultRoleAssignments(StorageBuiltInRole.GetBuiltInRoleName, StorageBuiltInRole.StorageBlobDataContributor, StorageBuiltInRole.StorageTableDataContributor, @@ -495,6 +496,7 @@ public static IResourceBuilder AddBlobContain return builder.ApplicationBuilder .AddResource(resource) + .WithIconName("FolderOpen") .WithHealthCheck(healthCheckKey) .OnConnectionStringAvailable(async (containerResource, @event, ct) => { @@ -525,7 +527,8 @@ public static IResourceBuilder AddDataLa builder.Resource.DataLakeFileSystems.Add(resource); return builder.ApplicationBuilder - .AddResource(resource); + .AddResource(resource) + .WithIconName("FolderOpen"); } /// @@ -561,7 +564,7 @@ public static IResourceBuilder AddBlobContain name: healthCheckKey); return builder.ApplicationBuilder - .AddResource(resource).WithHealthCheck(healthCheckKey); + .AddResource(resource).WithIconName("FolderOpen").WithHealthCheck(healthCheckKey); } /// @@ -651,6 +654,7 @@ public static IResourceBuilder AddQueue(this IRe return builder.ApplicationBuilder .AddResource(resource) + .WithIconName("Mail") .WithHealthCheck(healthCheckKey) .OnConnectionStringAvailable(async (containerResource, @event, ct) => { @@ -792,6 +796,7 @@ private static IResourceBuilder CreateBlobService(IRes return builder.ApplicationBuilder .AddResource(resource) + .WithIconName("DocumentMultiple") .WithHealthCheck(healthCheckKey) .OnConnectionStringAvailable(async (blobs, @event, ct) => { @@ -804,13 +809,15 @@ private static IResourceBuilder CreateDataLakeServ var resource = new AzureDataLakeStorageResource(name, builder.Resource); return builder.ApplicationBuilder - .AddResource(resource); + .AddResource(resource) + .WithIconName("HardDrive"); } private static IResourceBuilder CreateTableService(IResourceBuilder builder, string name) { var resource = new AzureTableStorageResource(name, builder.Resource); - return builder.ApplicationBuilder.AddResource(resource); + return builder.ApplicationBuilder.AddResource(resource) + .WithIconName("TableSimple"); } private static IResourceBuilder CreateQueueService(IResourceBuilder builder, string name) @@ -831,6 +838,7 @@ private static IResourceBuilder CreateQueueService(IR return builder.ApplicationBuilder .AddResource(resource) + .WithIconName("Mail") .WithHealthCheck(healthCheckKey) .OnConnectionStringAvailable(async (queues, @event, ct) => { diff --git a/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs b/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs index 251c8ba2382..1aa9ad200d9 100644 --- a/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs +++ b/src/Aspire.Hosting.Azure.WebPubSub/AzureWebPubSubExtensions.cs @@ -149,6 +149,7 @@ public static IResourceBuilder AddAzureWebPubSub(this ID var resource = new AzureWebPubSubResource(name, configureInfrastructure); return builder.AddResource(resource) + .WithIconName("MailMultiple") .WithDefaultRoleAssignments(WebPubSubBuiltInRole.GetBuiltInRoleName, WebPubSubBuiltInRole.WebPubSubServiceOwner); } diff --git a/src/Aspire.Hosting.Docker/DockerComposeEnvironmentExtensions.cs b/src/Aspire.Hosting.Docker/DockerComposeEnvironmentExtensions.cs index 4356d56e448..e8da2d3e64b 100644 --- a/src/Aspire.Hosting.Docker/DockerComposeEnvironmentExtensions.cs +++ b/src/Aspire.Hosting.Docker/DockerComposeEnvironmentExtensions.cs @@ -97,7 +97,8 @@ public static IResourceBuilder AddDockerCompos return builder.CreateResourceBuilder(resource); } - return builder.AddResource(resource); + return builder.AddResource(resource) + .WithIconName("BoxMultiple"); } /// diff --git a/src/Aspire.Hosting.Dotnet/DotnetProjectHostingExtensions.cs b/src/Aspire.Hosting.Dotnet/DotnetProjectHostingExtensions.cs index 887279ea726..412281a10bd 100644 --- a/src/Aspire.Hosting.Dotnet/DotnetProjectHostingExtensions.cs +++ b/src/Aspire.Hosting.Dotnet/DotnetProjectHostingExtensions.cs @@ -124,6 +124,7 @@ public static IResourceBuilder AddDotnetProject(this IDis var resource = builder.AddResource(app) .WithAnnotation(projectMetadata) + .WithIconName("CodeCsRectangle") .WithProjectDefaults(options); // Build the `dotnet run` command line for a non-debug launch of a DotnetProjectResource: diff --git a/src/Aspire.Hosting.Foundry/Project/ProjectBuilderExtension.cs b/src/Aspire.Hosting.Foundry/Project/ProjectBuilderExtension.cs index 457ed9b6239..a078a3477f4 100644 --- a/src/Aspire.Hosting.Foundry/Project/ProjectBuilderExtension.cs +++ b/src/Aspire.Hosting.Foundry/Project/ProjectBuilderExtension.cs @@ -707,7 +707,7 @@ internal static void ConfigureInfrastructure(AzureResourceInfrastructure infra) private static AzureContainerRegistryResource CreateDefaultRegistry(IDistributedApplicationBuilder builder, string name) { var resource = new AzureContainerRegistryResource(name, ContainerRegistryInfrastructure.ConfigureContainerRegistry); - builder.AddResource(resource); + builder.AddResource(resource).WithIconName("Archive"); return resource; } diff --git a/src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs b/src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs index 1981d302b8f..46c4ed85100 100644 --- a/src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs +++ b/src/Aspire.Hosting.Garnet/GarnetBuilderExtensions.cs @@ -130,6 +130,7 @@ public static IResourceBuilder AddGarnet(this IDistributedApplic .WithEndpoint(port: port, targetPort: 6379, name: GarnetResource.PrimaryEndpointName) .WithImage(GarnetContainerImageTags.Image, GarnetContainerImageTags.Tag) .WithImageRegistry(GarnetContainerImageTags.Registry) + .WithIconName("Database") .WithHealthCheck(healthCheckKey) // see https://github.com/microsoft/aspire/issues/3838 for why the password is passed this way .WithEntrypoint("/bin/sh") diff --git a/src/Aspire.Hosting.GitHub.Models/GitHubModelsExtensions.cs b/src/Aspire.Hosting.GitHub.Models/GitHubModelsExtensions.cs index 0f6896126ef..8a659efb4e9 100644 --- a/src/Aspire.Hosting.GitHub.Models/GitHubModelsExtensions.cs +++ b/src/Aspire.Hosting.GitHub.Models/GitHubModelsExtensions.cs @@ -51,6 +51,7 @@ The API key used to authenticate requests to the GitHub Models API. defaultApiKeyParameter.WithParentRelationship(resource); return builder.AddResource(resource) + .WithIconName("BrainCircuit") .WithInitialState(new() { ResourceType = "GitHubModel", diff --git a/src/Aspire.Hosting.Go/GoHostingExtensions.cs b/src/Aspire.Hosting.Go/GoHostingExtensions.cs index 2d28d110636..5068a9a1982 100644 --- a/src/Aspire.Hosting.Go/GoHostingExtensions.cs +++ b/src/Aspire.Hosting.Go/GoHostingExtensions.cs @@ -88,6 +88,7 @@ public static IResourceBuilder AddGoApp( var resource = new GoAppResource(name, appDirectory); var rb = builder.AddResource(resource) + .WithIconName("Code") .WithArgs(ctx => { var programArgs = ctx.Resource.TryGetLastAnnotation(out var argsAnnotation) diff --git a/src/Aspire.Hosting.Kafka/KafkaBuilderExtensions.cs b/src/Aspire.Hosting.Kafka/KafkaBuilderExtensions.cs index 83b336317f4..bc7cdd75ad6 100644 --- a/src/Aspire.Hosting.Kafka/KafkaBuilderExtensions.cs +++ b/src/Aspire.Hosting.Kafka/KafkaBuilderExtensions.cs @@ -76,6 +76,7 @@ public static IResourceBuilder AddKafka(this IDistributedAp .WithEndpoint(targetPort: KafkaInternalBrokerPort, name: KafkaServerResource.InternalEndpointName) .WithImage(KafkaContainerImageTags.Image, KafkaContainerImageTags.Tag) .WithImageRegistry(KafkaContainerImageTags.Registry) + .WithIconName("MailMultiple") .WithEnvironment(context => ConfigureKafkaContainer(context, kafka)) .WithHealthCheck(healthCheckKey); } @@ -110,6 +111,7 @@ public static IResourceBuilder WithKafkaUI(this IResourceBu var kafkaUiBuilder = builder.ApplicationBuilder.AddResource(kafkaUi) .WithImage(KafkaContainerImageTags.KafkaUiImage, KafkaContainerImageTags.KafkaUiTag) .WithImageRegistry(KafkaContainerImageTags.Registry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: KafkaUIPort) .ExcludeFromManifest(); diff --git a/src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs b/src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs index 90b4fed8db6..50e8a868bcb 100644 --- a/src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs +++ b/src/Aspire.Hosting.Keycloak/KeycloakResourceBuilderExtensions.cs @@ -70,6 +70,7 @@ public static IResourceBuilder AddKeycloak( .WithImage(KeycloakContainerImageTags.Image) .WithImageRegistry(KeycloakContainerImageTags.Registry) .WithImageTag(KeycloakContainerImageTags.Tag) + .WithIconName("PersonLock") .WithHttpEndpoint(port: port, targetPort: DefaultContainerPort) .WithHttpEndpoint(targetPort: ManagementInterfaceContainerPort, name: ManagementEndpointName) .WithEndpoint(ManagementEndpointName, e => e.ExcludeReferenceEndpoint = true) diff --git a/src/Aspire.Hosting.Kubernetes/CertManagerExtensions.cs b/src/Aspire.Hosting.Kubernetes/CertManagerExtensions.cs index 295850f4405..52a30bff98d 100644 --- a/src/Aspire.Hosting.Kubernetes/CertManagerExtensions.cs +++ b/src/Aspire.Hosting.Kubernetes/CertManagerExtensions.cs @@ -125,7 +125,7 @@ public static IResourceBuilder AddCertManager( return builder.ApplicationBuilder.CreateResourceBuilder(resource); } - var resourceBuilder = builder.ApplicationBuilder.AddResource(resource).ExcludeFromManifest(); + var resourceBuilder = builder.ApplicationBuilder.AddResource(resource).WithIconName("Certificate").ExcludeFromManifest(); // Emit one kubectl-apply step per ClusterIssuer at deploy time, plus one kubectl-delete // step per ClusterIssuer at destroy time. The annotation factory closures capture the @@ -167,7 +167,7 @@ public static IResourceBuilder AddIssuer( return builder.ApplicationBuilder.CreateResourceBuilder(issuer); } - return builder.ApplicationBuilder.AddResource(issuer).ExcludeFromManifest(); + return builder.ApplicationBuilder.AddResource(issuer).WithIconName("ContactCard").ExcludeFromManifest(); } /// diff --git a/src/Aspire.Hosting.Kubernetes/KubernetesEnvironmentExtensions.cs b/src/Aspire.Hosting.Kubernetes/KubernetesEnvironmentExtensions.cs index d70f40cb791..31d177232a1 100644 --- a/src/Aspire.Hosting.Kubernetes/KubernetesEnvironmentExtensions.cs +++ b/src/Aspire.Hosting.Kubernetes/KubernetesEnvironmentExtensions.cs @@ -102,7 +102,8 @@ public static IResourceBuilder AddKubernetesEnvir } - var resourceBuilder = builder.AddResource(resource); + var resourceBuilder = builder.AddResource(resource) + .WithIconName("ServerMultiple"); // Default to Helm deployment engine if not already configured EnsureDefaultHelmEngine(resourceBuilder); @@ -254,6 +255,7 @@ public static IResourceBuilder AddNodePool( } return builder.ApplicationBuilder.AddResource(nodePool) + .WithIconName("ServerMultiple") .ExcludeFromManifest(); } diff --git a/src/Aspire.Hosting.Kubernetes/KubernetesGatewayExtensions.cs b/src/Aspire.Hosting.Kubernetes/KubernetesGatewayExtensions.cs index a5d338a5168..4e1853361e4 100644 --- a/src/Aspire.Hosting.Kubernetes/KubernetesGatewayExtensions.cs +++ b/src/Aspire.Hosting.Kubernetes/KubernetesGatewayExtensions.cs @@ -46,6 +46,7 @@ public static IResourceBuilder AddGateway( } return builder.ApplicationBuilder.AddResource(gateway) + .WithIconName("GlobeArrowForward") .ExcludeFromManifest(); } diff --git a/src/Aspire.Hosting.Kubernetes/KubernetesHelmChartExtensions.cs b/src/Aspire.Hosting.Kubernetes/KubernetesHelmChartExtensions.cs index 702d4de5470..7607f2ebcd6 100644 --- a/src/Aspire.Hosting.Kubernetes/KubernetesHelmChartExtensions.cs +++ b/src/Aspire.Hosting.Kubernetes/KubernetesHelmChartExtensions.cs @@ -83,7 +83,8 @@ public static IResourceBuilder AddHelmChart( return builder.ApplicationBuilder.CreateResourceBuilder(resource); } - var chartBuilder = builder.ApplicationBuilder.AddResource(resource); + var chartBuilder = builder.ApplicationBuilder.AddResource(resource) + .WithIconName("Archive"); chartBuilder.WithAnnotation(new PipelineStepAnnotation(_ => { diff --git a/src/Aspire.Hosting.Kubernetes/KubernetesIngressExtensions.cs b/src/Aspire.Hosting.Kubernetes/KubernetesIngressExtensions.cs index 9d14107f770..092ad05c59e 100644 --- a/src/Aspire.Hosting.Kubernetes/KubernetesIngressExtensions.cs +++ b/src/Aspire.Hosting.Kubernetes/KubernetesIngressExtensions.cs @@ -54,6 +54,7 @@ public static IResourceBuilder AddIngress( } return builder.ApplicationBuilder.AddResource(ingress) + .WithIconName("GlobeArrowForward") .ExcludeFromManifest(); } diff --git a/src/Aspire.Hosting.Maui/MauiAndroidExtensions.cs b/src/Aspire.Hosting.Maui/MauiAndroidExtensions.cs index 569d93825b6..239579f3924 100644 --- a/src/Aspire.Hosting.Maui/MauiAndroidExtensions.cs +++ b/src/Aspire.Hosting.Maui/MauiAndroidExtensions.cs @@ -196,7 +196,7 @@ public static IResourceBuilder AddAndroidDevice( "Android", "net10.0-android", () => true, // Allow on all platforms, validation happens at dotnet run time - "PhoneTablet", + "PhoneLaptop", additionalArgs.ToArray()); resourceBuilder.WithMauiIdeLaunchConfiguration( @@ -401,7 +401,7 @@ public static IResourceBuilder AddAndroidEmulator( "Android", "net10.0-android", () => true, // Allow on all platforms, validation happens at dotnet run time - "PhoneTablet", + "PhoneLaptop", additionalArgs.ToArray()); resourceBuilder.WithMauiIdeLaunchConfiguration( diff --git a/src/Aspire.Hosting.Maui/MauiiOSExtensions.cs b/src/Aspire.Hosting.Maui/MauiiOSExtensions.cs index e426e7f55b0..b73a0aeaddd 100644 --- a/src/Aspire.Hosting.Maui/MauiiOSExtensions.cs +++ b/src/Aspire.Hosting.Maui/MauiiOSExtensions.cs @@ -205,7 +205,7 @@ public static IResourceBuilder AddiOSDevice( "iOS", "net10.0-ios", OperatingSystem.IsMacOS, // iOS development requires macOS - "PhoneTablet", + "PhoneLaptop", additionalArgs.ToArray()); resourceBuilder.WithMauiIdeLaunchConfiguration( @@ -408,7 +408,7 @@ public static IResourceBuilder AddiOSSimulator( "iOS", "net10.0-ios", OperatingSystem.IsMacOS, // iOS development requires macOS - "PhoneTablet", + "PhoneLaptop", additionalArgs.ToArray()); resourceBuilder.WithMauiIdeLaunchConfiguration( diff --git a/src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs b/src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs index 5c872f3cb16..6cb5fbd3cbe 100644 --- a/src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs +++ b/src/Aspire.Hosting.Milvus/MilvusBuilderExtensions.cs @@ -56,6 +56,7 @@ public static IResourceBuilder AddMilvus(this IDistributed return builder.AddResource(milvus) .WithImage(MilvusContainerImageTags.Image, MilvusContainerImageTags.Tag) .WithImageRegistry(MilvusContainerImageTags.Registry) + .WithIconName("DatabaseMultiple") .WithHttpEndpoint(port: grpcPort, targetPort: MilvusPortGrpc, name: MilvusServerResource.PrimaryEndpointName) .WithEndpoint(MilvusServerResource.PrimaryEndpointName, endpoint => { @@ -108,7 +109,8 @@ public static IResourceBuilder AddDatabase(this IResourc builder.Resource.AddDatabase(name, databaseName); var milvusDatabaseResource = new MilvusDatabaseResource(name, databaseName, builder.Resource); - return builder.ApplicationBuilder.AddResource(milvusDatabaseResource); + return builder.ApplicationBuilder.AddResource(milvusDatabaseResource) + .WithIconName("Database"); } /// @@ -147,6 +149,7 @@ public static IResourceBuilder WithAttu(this IResourceBuilder builder, var resourceBuilder = builder.ApplicationBuilder.AddResource(attuContainer) .WithImage(MilvusContainerImageTags.AttuImage, MilvusContainerImageTags.AttuTag) .WithImageRegistry(MilvusContainerImageTags.Registry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: 3000, name: "http") .WithEnvironment(context => ConfigureAttuContainer(context, builder.Resource)) .ExcludeFromManifest(); diff --git a/src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs b/src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs index 67e89f37f09..4a8647842f2 100644 --- a/src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs +++ b/src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs @@ -87,6 +87,7 @@ public static IResourceBuilder AddMongoDB(this IDistribut .WithEndpoint(port: port, targetPort: DefaultContainerPort, name: MongoDBServerResource.PrimaryEndpointName) .WithImage(MongoDBContainerImageTags.Image, MongoDBContainerImageTags.Tag) .WithImageRegistry(MongoDBContainerImageTags.Registry) + .WithIconName("DatabaseMultiple") .WithEnvironment(context => { context.EnvironmentVariables[UserEnvVarName] = mongoDBContainer.UserNameReference; @@ -139,6 +140,7 @@ public static IResourceBuilder AddDatabase(this IResour return builder.ApplicationBuilder .AddResource(mongoDBDatabase) + .WithIconName("Database") .WithHealthCheck(healthCheckKey); } @@ -165,6 +167,7 @@ public static IResourceBuilder WithMongoExpress(this IResourceBuilder b var resourceBuilder = builder.ApplicationBuilder.AddResource(mongoExpressContainer) .WithImage(MongoDBContainerImageTags.MongoExpressImage, MongoDBContainerImageTags.MongoExpressTag) .WithImageRegistry(MongoDBContainerImageTags.MongoExpressRegistry) + .WithIconName("WindowDatabase") .WithEnvironment(context => ConfigureMongoExpressContainer(context, builder.Resource)) .WithHttpEndpoint(targetPort: 8081, name: "http") .WithParentRelationship(builder) diff --git a/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs b/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs index 580ef8f0f2c..dfdef48b68c 100644 --- a/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs +++ b/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs @@ -142,6 +142,7 @@ public static IResourceBuilder AddDatabase(this IResource return builder.ApplicationBuilder .AddResource(mySqlDatabase) + .WithIconName("Database") .WithHealthCheck(healthCheckKey); } diff --git a/src/Aspire.Hosting.Nats/NatsBuilderExtensions.cs b/src/Aspire.Hosting.Nats/NatsBuilderExtensions.cs index 4ea9e9c788b..e25d939323f 100644 --- a/src/Aspire.Hosting.Nats/NatsBuilderExtensions.cs +++ b/src/Aspire.Hosting.Nats/NatsBuilderExtensions.cs @@ -97,6 +97,7 @@ public static IResourceBuilder AddNats(this IDistributedAppl .WithEndpoint(targetPort: 4222, port: port, name: NatsServerResource.PrimaryEndpointName) .WithImage(NatsContainerImageTags.Image, NatsContainerImageTags.Tag) .WithImageRegistry(NatsContainerImageTags.Registry) + .WithIconName("MailMultiple") .WithHealthCheck(healthCheckKey) .WithArgs(context => { diff --git a/src/Aspire.Hosting.OpenAI/OpenAIExtensions.cs b/src/Aspire.Hosting.OpenAI/OpenAIExtensions.cs index 9ef73bde2b5..41d858a282b 100644 --- a/src/Aspire.Hosting.OpenAI/OpenAIExtensions.cs +++ b/src/Aspire.Hosting.OpenAI/OpenAIExtensions.cs @@ -62,6 +62,7 @@ You can obtain an API key from the [OpenAI API Keys page](https://platform.opena tags: ["openai", "healthcheck"])); return builder.AddResource(resource) + .WithIconName("BrainCircuit") .WithInitialState(new() { ResourceType = "OpenAI", @@ -110,6 +111,7 @@ public static IResourceBuilder AddModel(this IResourceBuild var resource = new OpenAIModelResource(name, model, builder.Resource); return builder.ApplicationBuilder.AddResource(resource) + .WithIconName("BrainCircuit") .WithInitialState(new() { ResourceType = "OpenAI Model", diff --git a/src/Aspire.Hosting.Oracle/OracleDatabaseBuilderExtensions.cs b/src/Aspire.Hosting.Oracle/OracleDatabaseBuilderExtensions.cs index 2d0504e3a50..4f1d13f63d3 100644 --- a/src/Aspire.Hosting.Oracle/OracleDatabaseBuilderExtensions.cs +++ b/src/Aspire.Hosting.Oracle/OracleDatabaseBuilderExtensions.cs @@ -90,7 +90,8 @@ public static IResourceBuilder AddDatabase( builder.Resource.AddDatabase(name, databaseName); var oracleDatabase = new OracleDatabaseResource(name, databaseName, builder.Resource); - return builder.ApplicationBuilder.AddResource(oracleDatabase); + return builder.ApplicationBuilder.AddResource(oracleDatabase) + .WithIconName("Database"); } /// diff --git a/src/Aspire.Hosting.PostgreSQL/PostgresBuilderExtensions.cs b/src/Aspire.Hosting.PostgreSQL/PostgresBuilderExtensions.cs index 5f39c03d5c8..bb1ec22703a 100644 --- a/src/Aspire.Hosting.PostgreSQL/PostgresBuilderExtensions.cs +++ b/src/Aspire.Hosting.PostgreSQL/PostgresBuilderExtensions.cs @@ -174,6 +174,7 @@ public static IResourceBuilder AddDatabase(this IResou return builder.ApplicationBuilder .AddResource(postgresDatabase) + .WithIconName("Database") .WithHealthCheck(healthCheckKey); } @@ -208,6 +209,7 @@ public static IResourceBuilder WithPgAdmin(this IResourceBuilder builde var pgAdminContainerBuilder = builder.ApplicationBuilder.AddResource(pgAdminContainer) .WithImage(PostgresContainerImageTags.PgAdminImage, PostgresContainerImageTags.PgAdminTag) .WithImageRegistry(PostgresContainerImageTags.PgAdminRegistry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: 80, name: "http") .WithEnvironment(SetPgAdminEnvironmentVariables) .WithHttpHealthCheck("/browser") @@ -318,6 +320,7 @@ public static IResourceBuilder WithPgWeb(this IResourceB var pgwebContainerBuilder = builder.ApplicationBuilder.AddResource(pgwebContainer) .WithImage(PostgresContainerImageTags.PgWebImage, PostgresContainerImageTags.PgWebTag) .WithImageRegistry(PostgresContainerImageTags.PgWebRegistry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: 8081, name: "http") .WithArgs("--bookmarks-dir=/.pgweb/bookmarks") .WithArgs("--sessions") diff --git a/src/Aspire.Hosting.Qdrant/QdrantBuilderExtensions.cs b/src/Aspire.Hosting.Qdrant/QdrantBuilderExtensions.cs index 777d8742dd2..4ae6b303cc8 100644 --- a/src/Aspire.Hosting.Qdrant/QdrantBuilderExtensions.cs +++ b/src/Aspire.Hosting.Qdrant/QdrantBuilderExtensions.cs @@ -71,6 +71,7 @@ public static IResourceBuilder AddQdrant(this IDistributed return builder.AddResource(qdrant) .WithImage(QdrantContainerImageTags.Image, QdrantContainerImageTags.Tag) .WithImageRegistry(QdrantContainerImageTags.Registry) + .WithIconName("DatabaseSearch") .WithHttpEndpoint(port: grpcPort, targetPort: QdrantPortGrpc, name: QdrantServerResource.PrimaryEndpointName) .WithEndpoint(QdrantServerResource.PrimaryEndpointName, endpoint => { diff --git a/src/Aspire.Hosting.RabbitMQ/RabbitMQBuilderExtensions.cs b/src/Aspire.Hosting.RabbitMQ/RabbitMQBuilderExtensions.cs index 32398ce798b..4382e5e2966 100644 --- a/src/Aspire.Hosting.RabbitMQ/RabbitMQBuilderExtensions.cs +++ b/src/Aspire.Hosting.RabbitMQ/RabbitMQBuilderExtensions.cs @@ -76,6 +76,7 @@ static Task CreateConnection(string connectionString) var rabbitmq = builder.AddResource(rabbitMq) .WithImage(RabbitMQContainerImageTags.Image, RabbitMQContainerImageTags.Tag) .WithImageRegistry(RabbitMQContainerImageTags.Registry) + .WithIconName("MailMultiple") .WithEndpoint(port: port, targetPort: 5672, name: RabbitMQServerResource.PrimaryEndpointName) .WithEnvironment(context => { diff --git a/src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs b/src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs index d21ef0fab11..d45d1c8a9a4 100644 --- a/src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs +++ b/src/Aspire.Hosting.Redis/RedisBuilderExtensions.cs @@ -96,6 +96,7 @@ public static IResourceBuilder AddRedis( .WithEndpoint(port: port, targetPort: 6379, name: RedisResource.PrimaryEndpointName, scheme: RedisResource.StandardRedisScheme) .WithImage(RedisContainerImageTags.Image, RedisContainerImageTags.Tag) .WithImageRegistry(RedisContainerImageTags.Registry) + .WithIconName("Database") .WithHealthCheck(healthCheckKey) // see https://github.com/microsoft/aspire/issues/3838 for why the password is passed this way .WithEntrypoint("/bin/sh") @@ -240,6 +241,7 @@ public static IResourceBuilder WithRedisCommander(this IResourceB var resourceBuilder = builder.ApplicationBuilder.AddResource(resource) .WithImage(RedisContainerImageTags.RedisCommanderImage, RedisContainerImageTags.RedisCommanderTag) .WithImageRegistry(RedisContainerImageTags.RedisCommanderRegistry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: 8081, name: "http") .ExcludeFromManifest(); @@ -319,6 +321,7 @@ public static IResourceBuilder WithRedisInsight(this IResourceBui var resourceBuilder = builder.ApplicationBuilder.AddResource(resource) .WithImage(RedisContainerImageTags.RedisInsightImage, RedisContainerImageTags.RedisInsightTag) .WithImageRegistry(RedisContainerImageTags.RedisInsightRegistry) + .WithIconName("WindowDatabase") .WithHttpEndpoint(targetPort: 5540, name: "http") .WithEnvironment(context => { diff --git a/src/Aspire.Hosting.Seq/SeqBuilderExtensions.cs b/src/Aspire.Hosting.Seq/SeqBuilderExtensions.cs index 3972ee69d97..43e2b714acd 100644 --- a/src/Aspire.Hosting.Seq/SeqBuilderExtensions.cs +++ b/src/Aspire.Hosting.Seq/SeqBuilderExtensions.cs @@ -57,6 +57,7 @@ public static IResourceBuilder AddSeq( .WithHttpEndpoint(port: port, targetPort: 80, name: SeqResource.PrimaryEndpointName) .WithImage(SeqContainerImageTags.Image, SeqContainerImageTags.Tag) .WithImageRegistry(SeqContainerImageTags.Registry) + .WithIconName("ClipboardPulse") .WithEnvironment("ACCEPT_EULA", "Y") .WithHttpHealthCheck("/health"); // Add health check for Seq's /health endpoint diff --git a/src/Aspire.Hosting.SqlServer/SqlServerBuilderExtensions.cs b/src/Aspire.Hosting.SqlServer/SqlServerBuilderExtensions.cs index 55836bc327f..1961a8ddffa 100644 --- a/src/Aspire.Hosting.SqlServer/SqlServerBuilderExtensions.cs +++ b/src/Aspire.Hosting.SqlServer/SqlServerBuilderExtensions.cs @@ -135,6 +135,7 @@ public static IResourceBuilder AddDatabase(this IReso return builder.ApplicationBuilder .AddResource(sqlServerDatabase) + .WithIconName("Database") .WithHealthCheck(healthCheckKey) .OnConnectionStringAvailable(async (sqlServerDatabase, @event, ct) => { diff --git a/src/Aspire.Hosting.Valkey/ValkeyBuilderExtensions.cs b/src/Aspire.Hosting.Valkey/ValkeyBuilderExtensions.cs index e8f093cff91..e20a2b3b1b0 100644 --- a/src/Aspire.Hosting.Valkey/ValkeyBuilderExtensions.cs +++ b/src/Aspire.Hosting.Valkey/ValkeyBuilderExtensions.cs @@ -145,6 +145,7 @@ public static IResourceBuilder AddValkey( .WithEndpoint(port: port, targetPort: 6379, name: ValkeyResource.PrimaryEndpointName) .WithImage(ValkeyContainerImageTags.Image, ValkeyContainerImageTags.Tag) .WithImageRegistry(ValkeyContainerImageTags.Registry) + .WithIconName("Database") .WithHealthCheck(healthCheckKey) // see https://github.com/microsoft/aspire/issues/3838 for why the password is passed this way .WithEntrypoint("/bin/sh") diff --git a/src/Aspire.Hosting.Yarp/YarpResourceExtensions.cs b/src/Aspire.Hosting.Yarp/YarpResourceExtensions.cs index c6e345dc213..2690af605d6 100644 --- a/src/Aspire.Hosting.Yarp/YarpResourceExtensions.cs +++ b/src/Aspire.Hosting.Yarp/YarpResourceExtensions.cs @@ -39,6 +39,7 @@ public static IResourceBuilder AddYarp( .WithImage(YarpContainerImageTags.Image) .WithImageRegistry(YarpContainerImageTags.Registry) .WithImageTag(YarpContainerImageTags.Tag) + .WithIconName("GlobeArrowForward") .WithEnvironment("ASPNETCORE_ENVIRONMENT", builder.Environment.EnvironmentName) .WithEntrypoint("dotnet") .WithArgs("/app/yarp.dll") diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs index 8fa3bbc128a..2e9b250ec05 100644 --- a/src/Aspire.Hosting/ResourceBuilderExtensions.cs +++ b/src/Aspire.Hosting/ResourceBuilderExtensions.cs @@ -4732,7 +4732,7 @@ public static IResourceBuilder WithIconName(this IResourceBuilder build ArgumentNullException.ThrowIfNull(builder); ArgumentException.ThrowIfNullOrWhiteSpace(iconName); - return builder.WithAnnotation(new ResourceIconAnnotation(iconName, iconVariant)); + return builder.WithAnnotation(new ResourceIconAnnotation(iconName, iconVariant), ResourceAnnotationMutationBehavior.Replace); } /// diff --git a/tests/Aspire.Hosting.Tests/WithIconNameTests.cs b/tests/Aspire.Hosting.Tests/WithIconNameTests.cs index 63e4b423f3a..b54361e5f31 100644 --- a/tests/Aspire.Hosting.Tests/WithIconNameTests.cs +++ b/tests/Aspire.Hosting.Tests/WithIconNameTests.cs @@ -87,16 +87,15 @@ public void WithIconName_OverridesExistingIconAnnotation() .WithIconName("Database") .WithIconName("CloudArrowUp", IconVariant.Regular); - // Should have both annotations (WithIconName adds, doesn't replace) + // Should replace the first annotation — only one should exist var iconAnnotations = container.Resource.Annotations.OfType().ToList(); - Assert.Equal(2, iconAnnotations.Count); - - // Get the latest one - this is what ResourceNotificationService should use - var latestAnnotation = iconAnnotations.Last(); - Assert.Equal("CloudArrowUp", latestAnnotation.IconName); - Assert.Equal(IconVariant.Regular, latestAnnotation.IconVariant); - - // Verify that TryGetLastAnnotation returns the correct one + Assert.Single(iconAnnotations); + + var annotation = iconAnnotations[0]; + Assert.Equal("CloudArrowUp", annotation.IconName); + Assert.Equal(IconVariant.Regular, annotation.IconVariant); + + // TryGetLastAnnotation should return the same result Assert.True(container.Resource.TryGetLastAnnotation(out var lastAnnotation)); Assert.Equal("CloudArrowUp", lastAnnotation.IconName); Assert.Equal(IconVariant.Regular, lastAnnotation.IconVariant);