Release 9.2 (#475)

* Preparing the 9.2 release by testing Aspire 9.1 - Updated to the 9.1 preview packages - Removed the old VolumeNameGenerator since it's not provided by Aspire.Hosting (Fixes #354) * Moving to 9.1.0 release of Aspire and deleting references that aren't needed * Removing ArgumentEvaluator and using native method instead * Adding missing launchSettings.json that VS really wants * Disabling the nightly feed * Removing VolumeNameGenerator now it's in the Aspire.Hosting package * Some version fixes * Dropping the Dapr.AzureRedis package from release due to publishing bugs * I can spellz goodz * Working around dotnet/aspire#7779 * Fixing some failing tests * Fixing the dependency handling In 9.1 this was causing a circular dependency chain, so the SqlProjectResource doesn't need to wait until the SQL database is ready, since that's the call site anyway * Disabling test * Setting release version
CommunityToolkit · Feb 26, 2025 · f99d342 · f99d342
1 parent 3cda817
commit f99d342
Show file tree

Hide file tree

Showing 48 changed files with 144 additions and 253 deletions.
diff --git a/CommunityToolkit.Aspire.sln b/CommunityToolkit.Aspire.sln
@@ -357,6 +357,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hos
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.Tests", "tests\CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.Tests\CommunityToolkit.Aspire.Hosting.SqlServer.Extensions.Tests.csproj", "{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SdkProject", "examples\sql-database-projects\SdkProject\SdkProject.csproj", "{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -939,6 +941,10 @@ Global
 		{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1118,6 +1124,7 @@ Global
 		{A4E81DCC-B13D-4513-8933-E7E405439AE9} = {8519CC01-1370-47C8-AD94-B0F326B1563F}
 		{C38B5A72-F717-4C7F-AB4C-54039A439D4D} = {A4E81DCC-B13D-4513-8933-E7E405439AE9}
 		{B98C88E3-2AEE-4B9F-8736-4A7E746AE28B} = {899F0713-7FC6-4750-BAFC-AC650B35B453}
+		{00D019B1-445D-F7A5-70C9-7BAD0D81E4DE} = {4AE83D68-EA10-473D-BD26-19C5928A8620}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {08B1D4B8-D2C5-4A64-BB8B-E1A2B29525F0}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,10 +14,10 @@
     <Nullable>enable</Nullable>
 
     <AspireMajorVersion>9</AspireMajorVersion>
-    <AspireVersion>$(AspireMajorVersion).0.0</AspireVersion>
+    <AspireVersion>$(AspireMajorVersion).1.0</AspireVersion>
     <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
     <AspNetCoreVersion>9.0.0</AspNetCoreVersion>
-    <DotNetExtensionsVersion>9.0.0</DotNetExtensionsVersion>
+    <DotNetExtensionsVersion>9.0.2</DotNetExtensionsVersion>
     <OpenTelemetryVersion>1.11.0</OpenTelemetryVersion>
     <TestContainersVersion>4.2.0</TestContainersVersion>
     <MEAIVersion>9.3.0-preview.1.25114.11</MEAIVersion>
@@ -40,8 +40,8 @@
 
   <!-- Versioning -->
   <PropertyGroup>
-    <ToolkitMinorVersion>1</ToolkitMinorVersion>
-    <ToolkitPatchVersion>1</ToolkitPatchVersion>
+    <ToolkitMinorVersion>2</ToolkitMinorVersion>
+    <ToolkitPatchVersion>0</ToolkitPatchVersion>
 
     <VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>
   </PropertyGroup>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Label="Aspire Packages">
     <!-- Aspire packages -->
     <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
@@ -15,6 +15,8 @@
     <PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.MongoDB" Version="$(AspireVersion)" />
     <PackageVersion Include="Aspire.Hosting.SqlServer" Version="$(AspireVersion)" />
+  </ItemGroup>
+  <ItemGroup Label="Core Packages">
     <!-- AspNetCore packages -->
     <PackageVersion Include="AspNetCore.HealthChecks.EventStore.gRPC" Version="9.0.0" />
     <PackageVersion Include="AspNetCore.HealthChecks.Rabbitmq" Version="9.0.0" />
@@ -25,19 +27,19 @@
     <PackageVersion Include="Dapr.Client" Version="1.14.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.QuickGrid" Version="$(AspNetCoreVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.12" />
+    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageVersion>
     <PackageVersion Include="Microsoft.Extensions.AI" Version="$(MEAIVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="$(DotNetExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetExtensionsVersion)" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <!-- .NET packages -->
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(DotNetExtensionsVersion)" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(DotNetExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.1.0" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(DotNetExtensionsVersion)" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="$(DotNetExtensionsVersion)" />
@@ -48,24 +50,20 @@
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryVersion)" />
-    <!-- Testing packages -->
-    <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.5.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.2" />
-    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version=" 9.0.0-beta.24568.1" />
-    <PackageVersion Include="mod_spatialite" Version="4.3.0.1" />
-    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
-    <!-- External packages -->
+  </ItemGroup>
+
+  <ItemGroup Label="Build Dependencies">
+    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+  </ItemGroup>
+
+  <ItemGroup Label="Integration Packages">
     <PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.0.0" />
     <PackageVersion Include="JsonSchema.Net" Version="7.3.3" />
     <PackageVersion Include="OllamaSharp" Version="5.1.2" />
     <PackageVersion Include="OpenFeature.Contrib.GOFeatureFlag" Version="0.2.0" />
     <PackageVersion Include="MassTransit" Version="8.3.6" />
-    <PackageVersion Include="MassTransit.ActiveMQ" Version="8.3.1" />
+    <PackageVersion Include="MassTransit.ActiveMQ" Version="8.3.6" />
+    <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.6" />
     <PackageVersion Include="MeiliSearch" Version="0.16.0" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.1" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
@@ -75,15 +73,30 @@
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.7.8" />
     <PackageVersion Include="EventStore.Client.Extensions.OpenTelemetry" Version="23.3.8" />
     <PackageVersion Include="EventStore.Client.Grpc.Streams" Version="23.3.8" />
-    <PackageVersion Include="MassTransit.RabbitMQ" Version="8.3.2" />
     <PackageVersion Include="ErikEJ.Dacpac.Chinook" Version="1.0.0" />
     <PackageVersion Include="RavenDB.Client" Version="6.2.1" />
     <PackageVersion Include="RavenDB.TestDriver" Version="6.2.1" />
     <PackageVersion Include="AspNetCore.HealthChecks.RavenDB" Version="9.0.0" />
-    <!-- Build dependencies -->
-    <PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.3.4" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.2.0" />
+  </ItemGroup>
+
+  <ItemGroup Label="Testing">
+    <!-- Testing packages -->
+    <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
+    <PackageVersion Include="MartinCostello.Logging.XUnit" Version="0.5.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.9.3" />
+    <PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24568.1" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
     <!-- Testcontainers packages -->
     <PackageVersion Include="Testcontainers" Version="$(TestContainersVersion)" />
     <PackageVersion Include="Testcontainers.MsSql" Version="$(TestContainersVersion)" />
   </ItemGroup>
+
+  <ItemGroup Label=".NET 9 Overrides" Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageVersion Update="Microsoft.Extensions.Logging.Abstractions" Version="9.0.2" />
+  </ItemGroup>
 </Project>
diff --git a/...t.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj b/...t.Aspire.Hosting.ActiveMQ.AppHost/CommunityToolkit.Aspire.Hosting.ActiveMQ.AppHost.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting" />
     <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 

diff --git a/...rviceDefaults/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.ServiceDefaults.csproj b/...rviceDefaults/CommunityToolkit.Aspire.Hosting.Azure.DataApiBuilder.ServiceDefaults.csproj
@@ -7,6 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />

diff --git a/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/Program.cs b/examples/java/CommunityToolkit.Aspire.Hosting.Java.AppHost/Program.cs
@@ -17,12 +17,12 @@
                                OtelAgentPath = "../../../agents",
                            })
                            .WithMavenBuild()
-                           .PublishAsDockerFile(
-                           [
-                               new DockerBuildArg("JAR_NAME", "spring-maven-0.0.1-SNAPSHOT.jar"),
-                               new DockerBuildArg("AGENT_PATH", "/agents"),
-                               new DockerBuildArg("SERVER_PORT", "8085"),
-                           ]);
+                           .PublishAsDockerFile(c =>
+                           {
+                               c.WithBuildArg("JAR_NAME", "spring-maven-0.0.1-SNAPSHOT.jar")
+                                .WithBuildArg("AGENT_PATH", "/agents")
+                                .WithBuildArg("SERVER_PORT", "8085");
+                           });
 
 var webapp = builder.AddProject<Projects.CommunityToolkit_Aspire_Hosting_Java_WebApp>("webapp")
                     .WithExternalHttpEndpoints()

diff --git a/...kit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj b/...kit.Aspire.Hosting.LavinMQ.AppHost/CommunityToolkit.Aspire.Hosting.LavinMQ.AppHost.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting" />
     <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 

diff --git a/...kit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj b/...kit.Aspire.Hosting.MailPit.AppHost/CommunityToolkit.Aspire.Hosting.MailPit.AppHost.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting" />
     <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 

diff --git a/...ailpit/CommunityToolkit.Aspire.Hosting.MailPit.SendMailApi/Properties/launchSettings.json b/...ailpit/CommunityToolkit.Aspire.Hosting.MailPit.SendMailApi/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "CommunityToolkit.Aspire.Hosting.MailPit.SendMailApi": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:64858;http://localhost:64859"
+    }
+  }
+}
diff --git a/....Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj b/....Hosting.PapercutSmtp.AppHost/CommunityToolkit.Aspire.Hosting.PapercutSmtp.AppHost.csproj
@@ -11,7 +11,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting" />
     <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 

diff --git a/...t/CommunityToolkit.Aspire.Hosting.PapercutSmtp.SendMailApi/Properties/launchSettings.json b/...t/CommunityToolkit.Aspire.Hosting.PapercutSmtp.SendMailApi/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "CommunityToolkit.Aspire.Hosting.PapercutSmtp.SendMailApi": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:54626;http://localhost:54627"
+    }
+  }
+}
diff --git a/nuget.config b/nuget.config
@@ -5,8 +5,14 @@
     <clear />
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <!-- <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" /> -->
   </packageSources>
   <packageSourceMapping>
+    <!-- <packageSource key="dotnet9">
+      <package pattern="Aspire.*" />
+      <package pattern="Microsoft.Extensions.ServiceDiscovery*" />
+      <package pattern="Microsoft.Extensions.Http.Resilience" />
+    </packageSource> -->
     <packageSource key="dotnet-eng">
       <package pattern="Microsoft.DotNet.XUnitExtensions" />
     </packageSource>

diff --git a/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQBuilderExtensions.cs
@@ -36,9 +36,10 @@ public static IResourceBuilder<ActiveMQServerResource> AddActiveMQ(this IDistrib
         string scheme = "tcp",
         int? webPort = null)
     {
+        ArgumentNullException.ThrowIfNull(builder, nameof(builder));
         ArgumentNullException.ThrowIfNull(name, nameof(name));
         ArgumentNullException.ThrowIfNull(scheme, nameof(scheme));
-        
+
         // don't use special characters in the password, since it goes into a URI
         ParameterResource passwordParameter = password?.Resource
                                               ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password", special: false);
@@ -71,7 +72,7 @@ public static IResourceBuilder<ActiveMQArtemisServerResource> AddActiveMQArtemis
     {
         ArgumentNullException.ThrowIfNull(name, nameof(name));
         ArgumentNullException.ThrowIfNull(scheme, nameof(scheme));
-        
+
         // don't use special characters in the password, since it goes into a URI
         ParameterResource passwordParameter = password?.Resource
                                               ?? ParameterResourceBuilderExtensions.CreateDefaultPasswordParameter(builder, $"{name}-password", special: false);
@@ -106,9 +107,7 @@ private static IResourceBuilder<T> Build<T>(this IDistributedApplicationBuilder
     public static IResourceBuilder<T> WithDataVolume<T>(this IResourceBuilder<T> builder, string? name = null, bool isReadOnly = false)
         where T : ActiveMQServerResourceBase =>
         builder
-#pragma warning disable CTASPIRE001
-            .WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"),
-#pragma warning restore CTASPIRE001
+            .WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"),
                 builder.Resource.ActiveMqSettings.DataPath,
                 isReadOnly);
 
@@ -122,9 +121,7 @@ public static IResourceBuilder<T> WithDataVolume<T>(this IResourceBuilder<T> bui
     public static IResourceBuilder<T> WithConfVolume<T>(this IResourceBuilder<T> builder, string? name = null, bool isReadOnly = false)
         where T : ActiveMQServerResourceBase =>
         builder
-#pragma warning disable CTASPIRE001
-            .WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "conf"),
-#pragma warning restore CTASPIRE001
+            .WithVolume(name ?? VolumeNameGenerator.Generate(builder, "conf"),
                 builder.Resource.ActiveMqSettings.ConfPath,
                 isReadOnly);
 
@@ -135,7 +132,7 @@ public static IResourceBuilder<T> WithConfVolume<T>(this IResourceBuilder<T> bui
     /// <param name="source">The source directory on the host to mount into the container.</param>
     /// <param name="isReadOnly">A flag that indicates if this is a read-only mount.</param>
     /// <returns>The <see cref="IResourceBuilder{T}"/>.</returns>
-    public static IResourceBuilder<T> WithDataBindMount<T>(this IResourceBuilder<T> builder, string source, bool isReadOnly = false) 
+    public static IResourceBuilder<T> WithDataBindMount<T>(this IResourceBuilder<T> builder, string source, bool isReadOnly = false)
         where T : ActiveMQServerResourceBase =>
         builder.WithBindMount(source, builder.Resource.ActiveMqSettings.DataPath, isReadOnly);
 
@@ -149,7 +146,7 @@ public static IResourceBuilder<T> WithDataBindMount<T>(this IResourceBuilder<T>
     public static IResourceBuilder<T> WithConfBindMount<T>(this IResourceBuilder<T> builder, string source, bool isReadOnly = false)
         where T : ActiveMQServerResourceBase =>
         builder.WithBindMount(source, builder.Resource.ActiveMqSettings.ConfPath, isReadOnly);
-    
+
     private static IResourceBuilder<T> WithJolokiaHealthCheck<T>(
         this IResourceBuilder<T> builder)
     where T : ActiveMQServerResourceBase

diff --git a/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/CommunityToolkit.Aspire.Hosting.ActiveMQ.csproj b/src/CommunityToolkit.Aspire.Hosting.ActiveMQ/CommunityToolkit.Aspire.Hosting.ActiveMQ.csproj
@@ -5,10 +5,6 @@
     <Description>A .NET Aspire hosting package for hosting ActiveMQ.</Description>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="$(SharedDir)\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Aspire.Hosting" />
   </ItemGroup>

diff --git a/...kit.Aspire.Hosting.Dapr.AzureRedis/CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.csproj b/...kit.Aspire.Hosting.Dapr.AzureRedis/CommunityToolkit.Aspire.Hosting.Dapr.AzureRedis.csproj
@@ -23,4 +23,8 @@
     <ProjectReference Include="../CommunityToolkit.Aspire.Hosting.Dapr/CommunityToolkit.Aspire.Hosting.Dapr.csproj" />
   </ItemGroup>
 
+  <PropertyGroup>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/CommunityToolkit.Aspire.Hosting.DbGate/CommunityToolkit.Aspire.Hosting.DbGate.csproj b/src/CommunityToolkit.Aspire.Hosting.DbGate/CommunityToolkit.Aspire.Hosting.DbGate.csproj
@@ -9,8 +9,4 @@
     <PackageReference Include="Aspire.Hosting" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="$(SharedDir)\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/CommunityToolkit.Aspire.Hosting.DbGate/DbGateBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.DbGate/DbGateBuilderExtensions.cs
@@ -35,10 +35,7 @@ public static IResourceBuilder<DbGateContainerResource> WithDataVolume(this IRes
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-#pragma warning disable CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        return builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"),
-            "/root/.dbgate", isReadOnly);
-#pragma warning restore CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), "/root/.dbgate", isReadOnly);
     }
 
     /// <summary>

diff --git a/...munityToolkit.Aspire.Hosting.EventStore/CommunityToolkit.Aspire.Hosting.EventStore.csproj b/...munityToolkit.Aspire.Hosting.EventStore/CommunityToolkit.Aspire.Hosting.EventStore.csproj
@@ -5,10 +5,6 @@
     <Description>EventStore support for .NET Aspire.</Description>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="$(SharedDir)\VolumeNameGenerator.cs" Link="Utils\VolumeNameGenerator.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.EventStore.gRPC" />
     <PackageReference Include="Aspire.Hosting" />

diff --git a/src/CommunityToolkit.Aspire.Hosting.EventStore/EventStoreBuilderExtensions.cs b/src/CommunityToolkit.Aspire.Hosting.EventStore/EventStoreBuilderExtensions.cs
@@ -100,9 +100,7 @@ public static IResourceBuilder<EventStoreResource> WithDataVolume(this IResource
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-#pragma warning disable CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        return builder.WithVolume(name ?? VolumeNameGenerator.CreateVolumeName(builder, "data"), DataTargetFolder);
-#pragma warning restore CTASPIRE001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"), DataTargetFolder);
     }
 
     /// <summary>