From afec631cec76155339b01b7f37e1b46ab6594785 Mon Sep 17 00:00:00 2001
From: "Andy De George (adegeo)" <adegeo@microsoft.com>
Date: Thu, 8 May 2025 13:21:09 -0700
Subject: [PATCH 1/2] Update diagnostic URLs

---
 src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets                 | 4 ++--
 .../AppHostAnalyzer.Diagnostics.cs                        | 2 +-
 .../build/Aspire.Hosting.AppHost.in.targets               | 8 +++++---
 .../ContainerAppExtensions.cs                             | 2 +-
 .../AzureCosmosDBExtensions.cs                            | 4 ++--
 .../AzureEnvironmentResourceExtensions.cs                 | 6 +++---
 src/Aspire.Hosting.Azure/AzurePublisherOptions.cs         | 2 +-
 src/Aspire.Hosting.Azure/AzurePublishingContext.cs        | 2 +-
 src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs       | 2 +-
 src/Aspire.Hosting.Python/AssemblyInfo.cs                 | 2 +-
 .../ApplicationModel/ComputeEnvironmentAnnotation.cs      | 2 +-
 .../ApplicationModel/DeploymentTargetAnnotation.cs        | 4 ++--
 .../ApplicationModel/IComputeEnvironmentResource.cs       | 2 +-
 src/Aspire.Hosting/ApplicationModel/IComputeResource.cs   | 2 +-
 src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs | 2 +-
 .../ApplicationModel/ProxySupportAnnotation.cs            | 4 ++--
 src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs  | 2 +-
 .../PublisherDistributedApplicationBuilderExtensions.cs   | 2 +-
 .../Publishing/NullPublishingActivityProgressReporter.cs  | 2 +-
 .../Publishing/PublishingActivityProgressReporter.cs      | 6 +++---
 .../Publishing/ResourceContainerImageBuilder.cs           | 2 +-
 src/Aspire.Hosting/ResourceBuilderExtensions.cs           | 2 +-
 .../PublicApiTests/AppContainersPublicApiTests.cs         | 6 +++---
 .../PublicApiTests/CosmosDBPublicApiTests.cs              | 4 ++--
 24 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets b/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
index 391eb0b3135..2b5a8346b1c 100644
--- a/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
+++ b/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
@@ -36,11 +36,11 @@
   </ItemGroup>
 
   <Target Name="__WarnOnAspireCapabilityMissing" BeforeTargets="PrepareForBuild" Condition="!@(ProjectCapability->AnyHaveMetadataValue('Identity', 'Aspire'))">
-    <Warning Code="ASPIRE002" Text="$(MSBuildProjectName) is an Aspire AppHost project but necessary dependencies aren't present. Are you missing an Aspire.Hosting.AppHost PackageReference?" />
+    <Warning Code="ASPIRE002" Text="$(MSBuildProjectName) is an Aspire AppHost project but necessary dependencies aren't present. Are you missing an Aspire.Hosting.AppHost PackageReference?" HelpLink="https://aka.ms/aspire/diagnostic/aspire002" />
   </Target>
 
   <Target Name="__WarnOnMininumVsVersionMissing" BeforeTargets="PrepareForBuild" Condition="'$(BuildingInsideVisualStudio)' == 'true' and $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.10.0'))">
-    <Warning Code="ASPIRE003" Text="$(MSBuildProjectName) is a .NET Aspire AppHost project that requires Visual Studio version 17.10 or above to work correctly. You are using version $(MSBuildVersion)." />
+    <Warning Code="ASPIRE003" Text="$(MSBuildProjectName) is a .NET Aspire AppHost project that requires Visual Studio version 17.10 or above to work correctly. You are using version $(MSBuildVersion)." HelpLink="https://aka.ms/aspire/diagnostic/aspire003" />
   </Target>
 
   <PropertyGroup>
diff --git a/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs b/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
index 84c1dd24109..9a6617dc6be 100644
--- a/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
+++ b/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
@@ -18,7 +18,7 @@ internal static class Diagnostics
             category: "Design",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true,
-            helpLinkUri: $"https://aka.ms/dotnet/aspire/diagnostics#{ModelNameMustBeValidId}");
+            helpLinkUri: $"https://aka.ms/aspire/diagnostic/{ModelNameMustBeValidId}");
 
         public static readonly ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics = ImmutableArray.Create(
             s_modelNameMustBeValid
diff --git a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
index aab23a9d425..6f4fba468cb 100644
--- a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
+++ b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
@@ -109,7 +109,7 @@ namespace Projects%3B
   </Target>
 
   <Target Name="_WarnOnUnsupportedLanguage" Condition="'$(Language)' != 'C#'">
-    <Warning Code="ASPIRE001" Text="The '$(Language)' language isn't fully supported by Aspire - some code generation targets will not run, so will require manual authoring." />
+    <Warning Code="ASPIRE001" Text="The '$(Language)' language isn't fully supported by Aspire - some code generation targets will not run, so will require manual authoring." HelpLink="https://aka.ms/aspire/diagnostic/aspire001" />
   </Target>
 
   <!--
@@ -178,7 +178,8 @@ namespace Projects%3B
 
     <Warning Code="ASPIRE004"
              Condition="'@(_AspireNonExecutableProjectResource)' != ''"
-             Text="'%(_AspireNonExecutableProjectResource.OriginalItemSpec)' is referenced by an Aspire Host project, but it is not an executable. Did you mean to set IsAspireProjectResource=&quot;false&quot;?" />
+             Text="'%(_AspireNonExecutableProjectResource.OriginalItemSpec)' is referenced by an Aspire Host project, but it is not an executable. Did you mean to set IsAspireProjectResource=&quot;false&quot;?"
+             HelpLink="https://aka.ms/aspire/diagnostic/aspire004" />
   </Target>
 
   <PropertyGroup>
@@ -270,7 +271,8 @@ namespace Projects%3B
   Condition="'$(IsAspireHost)' == 'true' and ('$(AspireHostingSDKVersion)' == '' or $([MSBuild]::VersionLessThan('$(AspireHostingSDKVersion)', '9.0.0')))">
     <Error Code="ASPIRE007"
       Text="$(MSBuildProjectName) project requires a reference to &quot;Aspire.AppHost.Sdk&quot; with version &quot;9.0.0&quot; or greater to work correctly. Please add the following line after the Project declaration `&lt;Sdk Name=&quot;Aspire.AppHost.Sdk&quot; Version=&quot;9.0.0&quot; /&gt;`."
-      File="$(MSBuildProjectFullPath)" />
+      File="$(MSBuildProjectFullPath)"
+      HelpLink="https://aka.ms/aspire/diagnostic/aspire007" />
   </Target>
 
   <!-- Entrypoint to allow for generation of an aspire manifest to a given location -->
diff --git a/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs b/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
index 649d33c33e1..ded80b0e687 100644
--- a/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
+++ b/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
@@ -54,7 +54,7 @@ public static class ContainerAppExtensions
     /// </code>
     /// </example>
     /// </remarks>
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static void ConfigureCustomDomain(this ContainerApp app, IResourceBuilder<ParameterResource> customDomain, IResourceBuilder<ParameterResource> certificateName)
     {
         ArgumentNullException.ThrowIfNull(app);
diff --git a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
index fbfdef9dac7..287b5d59489 100644
--- a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
+++ b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
@@ -65,7 +65,7 @@ public static IResourceBuilder<AzureCosmosDBResource> RunAsEmulator(this IResour
     /// <remarks>
     /// This version of the package defaults to the <inheritdoc cref="CosmosDBEmulatorContainerImageTags.TagVNextPreview"/> tag of the <inheritdoc cref="CosmosDBEmulatorContainerImageTags.Registry"/>/<inheritdoc cref="CosmosDBEmulatorContainerImageTags.Image"/> container image.
     /// </remarks>
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<AzureCosmosDBResource> RunAsPreviewEmulator(this IResourceBuilder<AzureCosmosDBResource> builder, Action<IResourceBuilder<AzureCosmosDBEmulatorResource>>? configureContainer = null)
         => RunAsEmulator(builder, configureContainer, useVNextPreview: true);
 
@@ -289,7 +289,7 @@ public static IResourceBuilder<AzureCosmosDBContainerResource> AddContainer(this
     /// <remarks>
     /// The Data Explorer is only available with <see cref="RunAsPreviewEmulator"/>.
     /// </remarks>
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<AzureCosmosDBEmulatorResource> WithDataExplorer(this IResourceBuilder<AzureCosmosDBEmulatorResource> builder, int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
diff --git a/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs b/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
index 33bc05aef1a..940dd1d2f46 100644
--- a/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
+++ b/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
@@ -16,7 +16,7 @@ public static class AzureEnvironmentResourceExtensions
     /// </summary>
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
     /// <returns>The <see cref="IResourceBuilder{AzureEnvironmentResource}"/>.</returns>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> AddAzureEnvironment(this IDistributedApplicationBuilder builder)
     {
         if (builder.Resources.OfType<AzureEnvironmentResource>().SingleOrDefault() is { } existingResource)
@@ -56,7 +56,7 @@ public static IResourceBuilder<AzureEnvironmentResource> AddAzureEnvironment(thi
     /// This method is used to set the location of the Azure environment resource.
     /// The location is used to determine where the resources will be deployed.
     /// </remarks>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> WithLocation(
         this IResourceBuilder<AzureEnvironmentResource> builder,
         IResourceBuilder<ParameterResource> location)
@@ -79,7 +79,7 @@ public static IResourceBuilder<AzureEnvironmentResource> WithLocation(
     /// This method is used to set the resource group name of the Azure environment resource.
     /// The resource group name is used to determine where the resources will be deployed.
     /// </remarks>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> WithResourceGroup(
         this IResourceBuilder<AzureEnvironmentResource> builder,
         IResourceBuilder<ParameterResource> resourceGroup)
diff --git a/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs b/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
index ea78c03ddde..400ab9c1daf 100644
--- a/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
+++ b/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
@@ -9,7 +9,7 @@ namespace Aspire.Hosting.Azure;
 /// <summary>
 /// Options which control generation of artifacts for deploying to Azure.
 /// </summary>
-[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public sealed class AzurePublisherOptions : PublishingOptions
 {
 }
diff --git a/src/Aspire.Hosting.Azure/AzurePublishingContext.cs b/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
index bc6412fe40b..319e0937eac 100644
--- a/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
+++ b/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
@@ -19,7 +19,7 @@ namespace Aspire.Hosting.Azure;
 /// publisher options, and execution context. It handles resource configuration and ensures
 /// that the bicep template is created in the specified output path.
 /// </remarks>
-[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public sealed class AzurePublishingContext(
     AzurePublisherOptions publisherOptions,
     AzureProvisioningOptions provisioningOptions,
diff --git a/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs b/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
index 67c39334377..a17cc1a33cb 100644
--- a/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
+++ b/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
@@ -9,7 +9,7 @@ namespace Aspire.Hosting.Azure;
 /// <summary>
 /// Represents Azure Container Registry information for deployment targets.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IAzureContainerRegistry : IContainerRegistry
 {
     /// <summary>
diff --git a/src/Aspire.Hosting.Python/AssemblyInfo.cs b/src/Aspire.Hosting.Python/AssemblyInfo.cs
index d866cbca5db..3e745c47562 100644
--- a/src/Aspire.Hosting.Python/AssemblyInfo.cs
+++ b/src/Aspire.Hosting.Python/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: Experimental("ASPIREHOSTINGPYTHON001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+[assembly: Experimental("ASPIREHOSTINGPYTHON001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
diff --git a/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
index ad6e2f105c5..b3e536df629 100644
--- a/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
@@ -5,7 +5,7 @@
 
 namespace Aspire.Hosting.ApplicationModel;
 
-[Experimental("ASPIRECOMPUTE001")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 internal sealed class ComputeEnvironmentAnnotation(IComputeEnvironmentResource computeEnvironment) : IResourceAnnotation
 {
     public IComputeEnvironmentResource ComputeEnvironment { get; } = computeEnvironment;
diff --git a/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
index ecd130e1098..ceb667c6bf1 100644
--- a/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
@@ -19,12 +19,12 @@ public sealed class DeploymentTargetAnnotation(IResource target) : IResourceAnno
     /// Gets or sets the container registry information associated with
     /// the deployment target, if the deployment target is an image-based environment.
     /// </summary>
-    [Experimental("ASPIRECOMPUTE001")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public IContainerRegistry? ContainerRegistry { get; set; }
 
     /// <summary>
     /// Gets or sets the compute environment resource associated with the deployment target.
     /// </summary>
-    [Experimental("ASPIRECOMPUTE001")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public IComputeEnvironmentResource? ComputeEnvironment { get; set; }
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs b/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
index 9b2a6452978..da16947bf90 100644
--- a/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <summary>
 /// Represents a compute environment resource.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IComputeEnvironmentResource : IResource
 {
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs b/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
index 1ffd15b3c6f..195b1aebd87 100644
--- a/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
@@ -12,7 +12,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// A compute resource is a resource that can be hosted/executed on an <see cref="IComputeEnvironmentResource"/>. Examples
 /// include projects, containers, and other resources that can be executed on a compute environment.
 /// </remarks>
-[Experimental("ASPIRECOMPUTE001")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IComputeResource : IResource
 {
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs b/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
index 4798efa25e1..6d6cba78ea2 100644
--- a/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <summary>
 /// Represents container registry information for deployment targets.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IContainerRegistry
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
index 51bc876b095..f0fd37fa5fa 100644
--- a/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
@@ -15,7 +15,7 @@ public sealed class ProxySupportAnnotation : IResourceAnnotation
     /// <summary>
     /// Create a new instance of the <see cref="ProxySupportAnnotation"/> class.
     /// </summary>
-    [Experimental("ASPIREPROXYENDPOINTS001")]
+    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public ProxySupportAnnotation()
     {}
 
@@ -23,4 +23,4 @@ public ProxySupportAnnotation()
     /// Gets or sets the value indicating whether the proxy support is enabled for the resource.
     /// </summary>
     public required bool ProxyEnabled { get; set; }
-}
\ No newline at end of file
+}
diff --git a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
index 106b98c39d3..dd75893ca17 100644
--- a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
@@ -850,7 +850,7 @@ public static IResourceBuilder<T> WithContainerFiles<T>(this IResourceBuilder<T>
     /// The user needs to be careful to ensure that container endpoints are using unique ports when disabling proxy support as by default for proxy-less
     /// endpoints, Aspire will allocate the internal container port as the host port, which will increase the chance of port conflicts.
     /// </remarks>
-    [Experimental("ASPIREPROXYENDPOINTS001")]
+    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<T> WithEndpointProxySupport<T>(this IResourceBuilder<T> builder, bool proxyEnabled) where T : ContainerResource
     {
         ArgumentNullException.ThrowIfNull(builder);
diff --git a/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs b/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
index 18977f1fdf1..1d382466712 100644
--- a/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
+++ b/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
@@ -20,7 +20,7 @@ public static class PublisherDistributedApplicationBuilderExtensions
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>. </param>
     /// <param name="name">The name of the publisher.</param>
     /// <param name="configureOptions">Callback to configure options for the publisher.</param>
-    [Experimental("ASPIREPUBLISHERS001")]
+    [Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IDistributedApplicationBuilder AddPublisher<TPublisher, TPublisherOptions>(this IDistributedApplicationBuilder builder, string name, Action<TPublisherOptions>? configureOptions = null)
         where TPublisher : class, IDistributedApplicationPublisher
         where TPublisherOptions : class
diff --git a/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs b/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
index 5dc5c746399..d77c3aef64f 100644
--- a/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
+++ b/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Minimalistic reporter that does nothing.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public sealed class NullPublishingActivityProgressReporter : IPublishingActivityProgressReporter
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs b/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
index eaace05f507..34d3fc32cad 100644
--- a/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
+++ b/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
@@ -11,7 +11,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Represents a publishing activity.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public sealed class PublishingActivity
 {
     /// <summary>
@@ -44,7 +44,7 @@ public PublishingActivity(string id, bool isPrimary = false)
 /// <summary>
 /// Represents the status of a publishing activity.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public sealed record PublishingActivityStatus
 {
     /// <summary>
@@ -71,7 +71,7 @@ public sealed record PublishingActivityStatus
 /// <summary>
 /// Interface for reporting publishing activity progress.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IPublishingActivityProgressReporter
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs b/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
index 0ab76d76ce4..0ec0dfd2238 100644
--- a/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
+++ b/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
@@ -16,7 +16,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Provides a service to publishers for building containers that represent a resource.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
 public interface IResourceContainerImageBuilder
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
index 93bb4334ea0..7716a87b820 100644
--- a/src/Aspire.Hosting/ResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
@@ -1991,7 +1991,7 @@ public static IResourceBuilder<T> WithParentRelationship<T>(
     /// <remarks>
     /// This method allows associating a specific compute environment with the compute resource.
     /// </remarks>
-    [Experimental("ASPIRECOMPUTE001")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public static IResourceBuilder<T> WithComputeEnvironment<T>(this IResourceBuilder<T> builder, IResourceBuilder<IComputeEnvironmentResource> computeEnvironmentResource)
         where T : IComputeResource
     {
diff --git a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
index 2124e4047e8..9bc0df6cc55 100644
--- a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
@@ -113,7 +113,7 @@ public void PublishAsAzureContainerAppForProjectShouldThrowWhenConfigureIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenAppIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -128,7 +128,7 @@ public void ConfigureCustomDomainShouldThrowWhenAppIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenCustomDomainIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -143,7 +143,7 @@ public void ConfigureCustomDomainShouldThrowWhenCustomDomainIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenCertificateNameIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
diff --git a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
index d976b3817fd..8c2f038934c 100644
--- a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
@@ -212,7 +212,7 @@ public void RunAsEmulatorShouldThrowWhenBuilderIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public void RunAsPreviewEmulatorShouldThrowWhenBuilderIsNull()
     {
         IResourceBuilder<AzureCosmosDBResource> builder = null!;
@@ -371,7 +371,7 @@ public void AddContainerShouldThrowWhenPartitionKeyPathIsNullOrEmpty(bool isNull
     }
 
     [Fact]
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/dotnet/aspire/diagnostics#{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
     public void WithDataExplorerShouldThrowWhenBuilderIsNull()
     {
         IResourceBuilder<AzureCosmosDBEmulatorResource> builder = null!;

From 505c0c92ba84f8d862936d8a782599351e494da5 Mon Sep 17 00:00:00 2001
From: "Andy De George (adegeo)" <adegeo@microsoft.com>
Date: Fri, 9 May 2025 09:04:16 -0700
Subject: [PATCH 2/2] Adjust link

---
 src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets                   | 4 ++--
 src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs | 2 +-
 .../build/Aspire.Hosting.AppHost.in.targets                 | 6 +++---
 .../ContainerAppExtensions.cs                               | 2 +-
 .../AzureCosmosDBExtensions.cs                              | 4 ++--
 .../AzureEnvironmentResourceExtensions.cs                   | 6 +++---
 src/Aspire.Hosting.Azure/AzurePublisherOptions.cs           | 2 +-
 src/Aspire.Hosting.Azure/AzurePublishingContext.cs          | 2 +-
 src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs         | 2 +-
 src/Aspire.Hosting.Python/AssemblyInfo.cs                   | 2 +-
 .../ApplicationModel/ComputeEnvironmentAnnotation.cs        | 2 +-
 .../ApplicationModel/DeploymentTargetAnnotation.cs          | 4 ++--
 .../ApplicationModel/IComputeEnvironmentResource.cs         | 2 +-
 src/Aspire.Hosting/ApplicationModel/IComputeResource.cs     | 2 +-
 src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs   | 2 +-
 .../ApplicationModel/ProxySupportAnnotation.cs              | 2 +-
 src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs    | 2 +-
 .../PublisherDistributedApplicationBuilderExtensions.cs     | 2 +-
 .../Publishing/NullPublishingActivityProgressReporter.cs    | 2 +-
 .../Publishing/PublishingActivityProgressReporter.cs        | 6 +++---
 .../Publishing/ResourceContainerImageBuilder.cs             | 2 +-
 src/Aspire.Hosting/ResourceBuilderExtensions.cs             | 2 +-
 .../PublicApiTests/AppContainersPublicApiTests.cs           | 6 +++---
 .../PublicApiTests/CosmosDBPublicApiTests.cs                | 4 ++--
 24 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets b/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
index 2b5a8346b1c..683442a2b7c 100644
--- a/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
+++ b/src/Aspire.AppHost.Sdk/SDK/Sdk.in.targets
@@ -36,11 +36,11 @@
   </ItemGroup>
 
   <Target Name="__WarnOnAspireCapabilityMissing" BeforeTargets="PrepareForBuild" Condition="!@(ProjectCapability->AnyHaveMetadataValue('Identity', 'Aspire'))">
-    <Warning Code="ASPIRE002" Text="$(MSBuildProjectName) is an Aspire AppHost project but necessary dependencies aren't present. Are you missing an Aspire.Hosting.AppHost PackageReference?" HelpLink="https://aka.ms/aspire/diagnostic/aspire002" />
+    <Warning Code="ASPIRE002" Text="$(MSBuildProjectName) is an Aspire AppHost project but necessary dependencies aren't present. Are you missing an Aspire.Hosting.AppHost PackageReference?" HelpLink="https://aka.ms/aspire/diagnostics/aspire002" />
   </Target>
 
   <Target Name="__WarnOnMininumVsVersionMissing" BeforeTargets="PrepareForBuild" Condition="'$(BuildingInsideVisualStudio)' == 'true' and $([MSBuild]::VersionLessThan('$(MSBuildVersion)', '17.10.0'))">
-    <Warning Code="ASPIRE003" Text="$(MSBuildProjectName) is a .NET Aspire AppHost project that requires Visual Studio version 17.10 or above to work correctly. You are using version $(MSBuildVersion)." HelpLink="https://aka.ms/aspire/diagnostic/aspire003" />
+    <Warning Code="ASPIRE003" Text="$(MSBuildProjectName) is a .NET Aspire AppHost project that requires Visual Studio version 17.10 or above to work correctly. You are using version $(MSBuildVersion)." HelpLink="https://aka.ms/aspire/diagnostics/aspire003" />
   </Target>
 
   <PropertyGroup>
diff --git a/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs b/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
index 9a6617dc6be..c45a1a21455 100644
--- a/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
+++ b/src/Aspire.Hosting.Analyzers/AppHostAnalyzer.Diagnostics.cs
@@ -18,7 +18,7 @@ internal static class Diagnostics
             category: "Design",
             DiagnosticSeverity.Error,
             isEnabledByDefault: true,
-            helpLinkUri: $"https://aka.ms/aspire/diagnostic/{ModelNameMustBeValidId}");
+            helpLinkUri: $"https://aka.ms/aspire/diagnostics/{ModelNameMustBeValidId}");
 
         public static readonly ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics = ImmutableArray.Create(
             s_modelNameMustBeValid
diff --git a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
index 6f4fba468cb..bb35d9abd41 100644
--- a/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
+++ b/src/Aspire.Hosting.AppHost/build/Aspire.Hosting.AppHost.in.targets
@@ -109,7 +109,7 @@ namespace Projects%3B
   </Target>
 
   <Target Name="_WarnOnUnsupportedLanguage" Condition="'$(Language)' != 'C#'">
-    <Warning Code="ASPIRE001" Text="The '$(Language)' language isn't fully supported by Aspire - some code generation targets will not run, so will require manual authoring." HelpLink="https://aka.ms/aspire/diagnostic/aspire001" />
+    <Warning Code="ASPIRE001" Text="The '$(Language)' language isn't fully supported by Aspire - some code generation targets will not run, so will require manual authoring." HelpLink="https://aka.ms/aspire/diagnostics/aspire001" />
   </Target>
 
   <!--
@@ -179,7 +179,7 @@ namespace Projects%3B
     <Warning Code="ASPIRE004"
              Condition="'@(_AspireNonExecutableProjectResource)' != ''"
              Text="'%(_AspireNonExecutableProjectResource.OriginalItemSpec)' is referenced by an Aspire Host project, but it is not an executable. Did you mean to set IsAspireProjectResource=&quot;false&quot;?"
-             HelpLink="https://aka.ms/aspire/diagnostic/aspire004" />
+             HelpLink="https://aka.ms/aspire/diagnostics/aspire004" />
   </Target>
 
   <PropertyGroup>
@@ -272,7 +272,7 @@ namespace Projects%3B
     <Error Code="ASPIRE007"
       Text="$(MSBuildProjectName) project requires a reference to &quot;Aspire.AppHost.Sdk&quot; with version &quot;9.0.0&quot; or greater to work correctly. Please add the following line after the Project declaration `&lt;Sdk Name=&quot;Aspire.AppHost.Sdk&quot; Version=&quot;9.0.0&quot; /&gt;`."
       File="$(MSBuildProjectFullPath)"
-      HelpLink="https://aka.ms/aspire/diagnostic/aspire007" />
+      HelpLink="https://aka.ms/aspire/diagnostics/aspire007" />
   </Target>
 
   <!-- Entrypoint to allow for generation of an aspire manifest to a given location -->
diff --git a/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs b/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
index ded80b0e687..6737ae61cd3 100644
--- a/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
+++ b/src/Aspire.Hosting.Azure.AppContainers/ContainerAppExtensions.cs
@@ -54,7 +54,7 @@ public static class ContainerAppExtensions
     /// </code>
     /// </example>
     /// </remarks>
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static void ConfigureCustomDomain(this ContainerApp app, IResourceBuilder<ParameterResource> customDomain, IResourceBuilder<ParameterResource> certificateName)
     {
         ArgumentNullException.ThrowIfNull(app);
diff --git a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
index 287b5d59489..ce6673f634d 100644
--- a/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
+++ b/src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
@@ -65,7 +65,7 @@ public static IResourceBuilder<AzureCosmosDBResource> RunAsEmulator(this IResour
     /// <remarks>
     /// This version of the package defaults to the <inheritdoc cref="CosmosDBEmulatorContainerImageTags.TagVNextPreview"/> tag of the <inheritdoc cref="CosmosDBEmulatorContainerImageTags.Registry"/>/<inheritdoc cref="CosmosDBEmulatorContainerImageTags.Image"/> container image.
     /// </remarks>
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<AzureCosmosDBResource> RunAsPreviewEmulator(this IResourceBuilder<AzureCosmosDBResource> builder, Action<IResourceBuilder<AzureCosmosDBEmulatorResource>>? configureContainer = null)
         => RunAsEmulator(builder, configureContainer, useVNextPreview: true);
 
@@ -289,7 +289,7 @@ public static IResourceBuilder<AzureCosmosDBContainerResource> AddContainer(this
     /// <remarks>
     /// The Data Explorer is only available with <see cref="RunAsPreviewEmulator"/>.
     /// </remarks>
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<AzureCosmosDBEmulatorResource> WithDataExplorer(this IResourceBuilder<AzureCosmosDBEmulatorResource> builder, int? port = null)
     {
         ArgumentNullException.ThrowIfNull(builder);
diff --git a/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs b/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
index 940dd1d2f46..e8c8ef76fd2 100644
--- a/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
+++ b/src/Aspire.Hosting.Azure/AzureEnvironmentResourceExtensions.cs
@@ -16,7 +16,7 @@ public static class AzureEnvironmentResourceExtensions
     /// </summary>
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
     /// <returns>The <see cref="IResourceBuilder{AzureEnvironmentResource}"/>.</returns>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> AddAzureEnvironment(this IDistributedApplicationBuilder builder)
     {
         if (builder.Resources.OfType<AzureEnvironmentResource>().SingleOrDefault() is { } existingResource)
@@ -56,7 +56,7 @@ public static IResourceBuilder<AzureEnvironmentResource> AddAzureEnvironment(thi
     /// This method is used to set the location of the Azure environment resource.
     /// The location is used to determine where the resources will be deployed.
     /// </remarks>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> WithLocation(
         this IResourceBuilder<AzureEnvironmentResource> builder,
         IResourceBuilder<ParameterResource> location)
@@ -79,7 +79,7 @@ public static IResourceBuilder<AzureEnvironmentResource> WithLocation(
     /// This method is used to set the resource group name of the Azure environment resource.
     /// The resource group name is used to determine where the resources will be deployed.
     /// </remarks>
-    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<AzureEnvironmentResource> WithResourceGroup(
         this IResourceBuilder<AzureEnvironmentResource> builder,
         IResourceBuilder<ParameterResource> resourceGroup)
diff --git a/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs b/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
index 400ab9c1daf..b8c421173a7 100644
--- a/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
+++ b/src/Aspire.Hosting.Azure/AzurePublisherOptions.cs
@@ -9,7 +9,7 @@ namespace Aspire.Hosting.Azure;
 /// <summary>
 /// Options which control generation of artifacts for deploying to Azure.
 /// </summary>
-[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed class AzurePublisherOptions : PublishingOptions
 {
 }
diff --git a/src/Aspire.Hosting.Azure/AzurePublishingContext.cs b/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
index 319e0937eac..7d807ff7d6f 100644
--- a/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
+++ b/src/Aspire.Hosting.Azure/AzurePublishingContext.cs
@@ -19,7 +19,7 @@ namespace Aspire.Hosting.Azure;
 /// publisher options, and execution context. It handles resource configuration and ensures
 /// that the bicep template is created in the specified output path.
 /// </remarks>
-[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREAZURE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed class AzurePublishingContext(
     AzurePublisherOptions publisherOptions,
     AzureProvisioningOptions provisioningOptions,
diff --git a/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs b/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
index a17cc1a33cb..e90c9847e47 100644
--- a/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
+++ b/src/Aspire.Hosting.Azure/IAzureContainerRegistry.cs
@@ -9,7 +9,7 @@ namespace Aspire.Hosting.Azure;
 /// <summary>
 /// Represents Azure Container Registry information for deployment targets.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IAzureContainerRegistry : IContainerRegistry
 {
     /// <summary>
diff --git a/src/Aspire.Hosting.Python/AssemblyInfo.cs b/src/Aspire.Hosting.Python/AssemblyInfo.cs
index 3e745c47562..0a7b871b07b 100644
--- a/src/Aspire.Hosting.Python/AssemblyInfo.cs
+++ b/src/Aspire.Hosting.Python/AssemblyInfo.cs
@@ -3,4 +3,4 @@
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: Experimental("ASPIREHOSTINGPYTHON001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[assembly: Experimental("ASPIREHOSTINGPYTHON001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
diff --git a/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
index b3e536df629..25a71033530 100644
--- a/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/ComputeEnvironmentAnnotation.cs
@@ -5,7 +5,7 @@
 
 namespace Aspire.Hosting.ApplicationModel;
 
-[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 internal sealed class ComputeEnvironmentAnnotation(IComputeEnvironmentResource computeEnvironment) : IResourceAnnotation
 {
     public IComputeEnvironmentResource ComputeEnvironment { get; } = computeEnvironment;
diff --git a/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
index ceb667c6bf1..c93ceb8a4ab 100644
--- a/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/DeploymentTargetAnnotation.cs
@@ -19,12 +19,12 @@ public sealed class DeploymentTargetAnnotation(IResource target) : IResourceAnno
     /// Gets or sets the container registry information associated with
     /// the deployment target, if the deployment target is an image-based environment.
     /// </summary>
-    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public IContainerRegistry? ContainerRegistry { get; set; }
 
     /// <summary>
     /// Gets or sets the compute environment resource associated with the deployment target.
     /// </summary>
-    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public IComputeEnvironmentResource? ComputeEnvironment { get; set; }
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs b/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
index da16947bf90..754d321d524 100644
--- a/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IComputeEnvironmentResource.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <summary>
 /// Represents a compute environment resource.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IComputeEnvironmentResource : IResource
 {
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs b/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
index 195b1aebd87..9c50771e335 100644
--- a/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IComputeResource.cs
@@ -12,7 +12,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// A compute resource is a resource that can be hosted/executed on an <see cref="IComputeEnvironmentResource"/>. Examples
 /// include projects, containers, and other resources that can be executed on a compute environment.
 /// </remarks>
-[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IComputeResource : IResource
 {
 }
diff --git a/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs b/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
index 6d6cba78ea2..a65e5c84ba9 100644
--- a/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
+++ b/src/Aspire.Hosting/ApplicationModel/IContainerRegistry.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.ApplicationModel;
 /// <summary>
 /// Represents container registry information for deployment targets.
 /// </summary>
-[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IContainerRegistry
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs b/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
index f0fd37fa5fa..ab1f1a1da86 100644
--- a/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
+++ b/src/Aspire.Hosting/ApplicationModel/ProxySupportAnnotation.cs
@@ -15,7 +15,7 @@ public sealed class ProxySupportAnnotation : IResourceAnnotation
     /// <summary>
     /// Create a new instance of the <see cref="ProxySupportAnnotation"/> class.
     /// </summary>
-    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public ProxySupportAnnotation()
     {}
 
diff --git a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
index dd75893ca17..36d20e5fb5a 100644
--- a/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ContainerResourceBuilderExtensions.cs
@@ -850,7 +850,7 @@ public static IResourceBuilder<T> WithContainerFiles<T>(this IResourceBuilder<T>
     /// The user needs to be careful to ensure that container endpoints are using unique ports when disabling proxy support as by default for proxy-less
     /// endpoints, Aspire will allocate the internal container port as the host port, which will increase the chance of port conflicts.
     /// </remarks>
-    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREPROXYENDPOINTS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<T> WithEndpointProxySupport<T>(this IResourceBuilder<T> builder, bool proxyEnabled) where T : ContainerResource
     {
         ArgumentNullException.ThrowIfNull(builder);
diff --git a/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs b/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
index 1d382466712..bd05a1cc379 100644
--- a/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
+++ b/src/Aspire.Hosting/PublisherDistributedApplicationBuilderExtensions.cs
@@ -20,7 +20,7 @@ public static class PublisherDistributedApplicationBuilderExtensions
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>. </param>
     /// <param name="name">The name of the publisher.</param>
     /// <param name="configureOptions">Callback to configure options for the publisher.</param>
-    [Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IDistributedApplicationBuilder AddPublisher<TPublisher, TPublisherOptions>(this IDistributedApplicationBuilder builder, string name, Action<TPublisherOptions>? configureOptions = null)
         where TPublisher : class, IDistributedApplicationPublisher
         where TPublisherOptions : class
diff --git a/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs b/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
index d77c3aef64f..d5e1752b72b 100644
--- a/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
+++ b/src/Aspire.Hosting/Publishing/NullPublishingActivityProgressReporter.cs
@@ -8,7 +8,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Minimalistic reporter that does nothing.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed class NullPublishingActivityProgressReporter : IPublishingActivityProgressReporter
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs b/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
index 34d3fc32cad..3621b1cbab0 100644
--- a/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
+++ b/src/Aspire.Hosting/Publishing/PublishingActivityProgressReporter.cs
@@ -11,7 +11,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Represents a publishing activity.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed class PublishingActivity
 {
     /// <summary>
@@ -44,7 +44,7 @@ public PublishingActivity(string id, bool isPrimary = false)
 /// <summary>
 /// Represents the status of a publishing activity.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed record PublishingActivityStatus
 {
     /// <summary>
@@ -71,7 +71,7 @@ public sealed record PublishingActivityStatus
 /// <summary>
 /// Interface for reporting publishing activity progress.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IPublishingActivityProgressReporter
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs b/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
index 0ec0dfd2238..e7f09328dda 100644
--- a/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
+++ b/src/Aspire.Hosting/Publishing/ResourceContainerImageBuilder.cs
@@ -16,7 +16,7 @@ namespace Aspire.Hosting.Publishing;
 /// <summary>
 /// Provides a service to publishers for building containers that represent a resource.
 /// </summary>
-[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+[Experimental("ASPIREPUBLISHERS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public interface IResourceContainerImageBuilder
 {
     /// <summary>
diff --git a/src/Aspire.Hosting/ResourceBuilderExtensions.cs b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
index 7716a87b820..b69dfc79f1c 100644
--- a/src/Aspire.Hosting/ResourceBuilderExtensions.cs
+++ b/src/Aspire.Hosting/ResourceBuilderExtensions.cs
@@ -1991,7 +1991,7 @@ public static IResourceBuilder<T> WithParentRelationship<T>(
     /// <remarks>
     /// This method allows associating a specific compute environment with the compute resource.
     /// </remarks>
-    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOMPUTE001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public static IResourceBuilder<T> WithComputeEnvironment<T>(this IResourceBuilder<T> builder, IResourceBuilder<IComputeEnvironmentResource> computeEnvironmentResource)
         where T : IComputeResource
     {
diff --git a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
index 9bc0df6cc55..ede4f4801a4 100644
--- a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/AppContainersPublicApiTests.cs
@@ -113,7 +113,7 @@ public void PublishAsAzureContainerAppForProjectShouldThrowWhenConfigureIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenAppIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -128,7 +128,7 @@ public void ConfigureCustomDomainShouldThrowWhenAppIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenCustomDomainIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
@@ -143,7 +143,7 @@ public void ConfigureCustomDomainShouldThrowWhenCustomDomainIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIREACADOMAINS001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public void ConfigureCustomDomainShouldThrowWhenCertificateNameIsNull()
     {
         using var builder = TestDistributedApplicationBuilder.Create();
diff --git a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
index 8c2f038934c..08be60f827f 100644
--- a/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
+++ b/tests/Aspire.Hosting.Azure.Tests/PublicApiTests/CosmosDBPublicApiTests.cs
@@ -212,7 +212,7 @@ public void RunAsEmulatorShouldThrowWhenBuilderIsNull()
     }
 
     [Fact]
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public void RunAsPreviewEmulatorShouldThrowWhenBuilderIsNull()
     {
         IResourceBuilder<AzureCosmosDBResource> builder = null!;
@@ -371,7 +371,7 @@ public void AddContainerShouldThrowWhenPartitionKeyPathIsNullOrEmpty(bool isNull
     }
 
     [Fact]
-    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostic/{0}")]
+    [Experimental("ASPIRECOSMOSDB001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
     public void WithDataExplorerShouldThrowWhenBuilderIsNull()
     {
         IResourceBuilder<AzureCosmosDBEmulatorResource> builder = null!;