Implement GetConnectionProperties for new connection string formatting

Directory.Build.props

@@ -11,14 +11,15 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <AspireMajorVersion>9</AspireMajorVersion>
-    <AspireVersion>$(AspireMajorVersion).5.0</AspireVersion>
+    <AspireMajorVersion>13</AspireMajorVersion>
+    <AspireVersion>$(AspireMajorVersion).0.0-preview.1.25521.5</AspireVersion>
     <AspireAppHostSdkVersion>$(AspireVersion)</AspireAppHostSdkVersion>
     <AspNetCoreVersion>9.0.0</AspNetCoreVersion>
-    <DotNetExtensionsVersion>9.0.9</DotNetExtensionsVersion>
+    <DotNetExtensionsVersion>9.0.10</DotNetExtensionsVersion>
     <OpenTelemetryVersion>1.12.0</OpenTelemetryVersion>
     <TestContainersVersion>4.7.0</TestContainersVersion>
     <MEAIVersion>9.9.0</MEAIVersion>
+    <ServiceDiscoveryVersion>10.0.0-preview.1.25520.3</ServiceDiscoveryVersion>
     <IsPackable>false</IsPackable>
 
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
@@ -37,8 +38,8 @@
 
   <!-- Versioning -->
   <PropertyGroup>
-    <ToolkitMinorVersion>8</ToolkitMinorVersion>
-    <ToolkitPatchVersion>1</ToolkitPatchVersion>
+    <ToolkitMinorVersion>0</ToolkitMinorVersion>
+    <ToolkitPatchVersion>0</ToolkitPatchVersion>
     <ToolkitPreviewVersion>preview.1</ToolkitPreviewVersion>
 
     <VersionPrefix>$(AspireMajorVersion).$(ToolkitMinorVersion).$(ToolkitPatchVersion)</VersionPrefix>

Directory.Packages.props

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

nuget.config

@@ -6,16 +6,22 @@
     <add key="nuget" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
+    <add key="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
   </packageSources>
   <packageSourceMapping>
+    <packageSource key="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json">
+      <package pattern="Aspire*" />
+      <package pattern="Microsoft.Extensions.ServiceDiscovery*" />
+    </packageSource>
     <packageSource key="dotnet-eng">
       <package pattern="Microsoft.DotNet.XUnitExtensions" />
     </packageSource>
     <packageSource key="dotnet9-transport">
       <package pattern="Microsoft.DotNet.GenAPI.Task" />
+      <package pattern="*" />
     </packageSource>
     <packageSource key="nuget">
       <package pattern="*" />
     </packageSource>
   </packageSourceMapping>
-</configuration>
+</configuration>

src/CommunityToolkit.Aspire.Hosting.ActiveMQ/ActiveMQServerResourceBase.cs

@@ -29,6 +29,16 @@ public abstract class ActiveMQServerResourceBase(string name, ParameterResource?
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new EndpointReference(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the parameter that contains the ActiveMQ server username.
     /// </summary>
@@ -49,6 +59,23 @@ public abstract class ActiveMQServerResourceBase(string name, ParameterResource?
         UserNameParameter is not null ?
             ReferenceExpression.Create($"{UserNameParameter}") :
             ReferenceExpression.Create($"{DefaultUserName}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the ActiveMQ server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>{scheme}://{user}:{password}@{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Username", UserNameReference);
+        yield return new("Password", ReferenceExpression.Create($"{PasswordParameter}"));
+        yield return new("Uri", UriExpression);
+    }
 
     private static T ThrowIfNull<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
         => argument ?? throw new ArgumentNullException(paramName);

src/CommunityToolkit.Aspire.Hosting.EventStore/EventStoreResource.cs

@@ -19,10 +19,35 @@ public class EventStoreResource(string name) : ContainerResource(name), IResourc
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, HttpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string for the EventStore server.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create(
             $"esdb://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}?tls=false");
+
+    /// <summary>
+    /// Gets the connection URI expression for the EventStore server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>esdb://{host}:{port}?tls=false</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.Flagd/FlagdResource.cs

@@ -24,6 +24,16 @@ public class FlagdResource(string name) : ContainerResource(name), IResourceWith
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpointReference ??= new(this, HttpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the health check HTTP endpoint for the flagd server.
     /// </summary>
@@ -41,4 +51,19 @@ public class FlagdResource(string name) : ContainerResource(name), IResourceWith
         ReferenceExpression.Create(
             $"{PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}"
         );
+
+    /// <summary>
+    /// Gets the connection URI expression for the flagd server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ConnectionStringExpression;
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.GoFeatureFlag/GoFeatureFlagResource.cs

@@ -18,9 +18,34 @@ public class GoFeatureFlagResource(string name) : ContainerResource(name), IReso
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string expression for the GO Feature Flag instance.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"Endpoint=http://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the GO Feature Flag instance.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"http://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.MailPit/MailPitContainerResource.cs

@@ -15,9 +15,34 @@ public class MailPitContainerResource(string name) : ContainerResource(name), IR
     private EndpointReference? _smtpEndpoint;
     private EndpointReference SmtpEndpoint => _smtpEndpoint ??= new EndpointReference(this, SmtpEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for the SMTP endpoint.
+    /// </summary>
+    public EndpointReferenceExpression Host => SmtpEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for the SMTP endpoint.
+    /// </summary>
+    public EndpointReferenceExpression Port => SmtpEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// ConnectionString for MailPit smtp endpoint in the form of smtp://host:port.
     /// </summary>
     public ReferenceExpression ConnectionStringExpression => ReferenceExpression.Create(
         $"Endpoint={SmtpEndpoint.Scheme}://{SmtpEndpoint.Property(EndpointProperty.Host)}:{SmtpEndpoint.Property(EndpointProperty.Port)}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the MailPit SMTP endpoint.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>smtp://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"{SmtpEndpoint.Scheme}://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }

src/CommunityToolkit.Aspire.Hosting.Meilisearch/MeilisearchResource.cs

@@ -22,6 +22,16 @@ public MeilisearchResource(string name, ParameterResource masterKey) : base(name
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpoint ??= new(this, PrimaryEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the parameter that contains the Meilisearch superuser password.
     /// </summary>
@@ -32,5 +42,21 @@ public MeilisearchResource(string name, ParameterResource masterKey) : base(name
     /// </summary>
     public ReferenceExpression ConnectionStringExpression =>
         ReferenceExpression.Create($"Endpoint=http://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)};MasterKey={MasterKeyParameter}");
+
+    /// <summary>
+    /// Gets the connection URI expression for the Meilisearch server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"http://{Host}:{Port}");
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("MasterKey", ReferenceExpression.Create($"{MasterKeyParameter}"));
+        yield return new("Uri", UriExpression);
+    }
 }
 

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaModelResource.cs

@@ -26,6 +26,11 @@ public class OllamaModelResource(string name, string modelName, OllamaResource p
     /// </summary>
     public string ModelName { get; } = ThrowIfNull(modelName);
 
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
+        Parent.CombineProperties([
+            new("Model", ReferenceExpression.Create($"{ModelName}"))
+        ]);
+
     private static T ThrowIfNull<T>([NotNull] T? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)
         => argument ?? throw new ArgumentNullException(paramName);
 }

src/CommunityToolkit.Aspire.Hosting.Ollama/OllamaResource.cs

@@ -27,6 +27,16 @@ public class OllamaResource(string name) : ContainerResource(name), IResourceWit
     /// </summary>
     public EndpointReference PrimaryEndpoint => _primaryEndpointReference ??= new(this, OllamaEndpointName);
 
+    /// <summary>
+    /// Gets the host endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Host => PrimaryEndpoint.Property(EndpointProperty.Host);
+
+    /// <summary>
+    /// Gets the port endpoint reference for this resource.
+    /// </summary>
+    public EndpointReferenceExpression Port => PrimaryEndpoint.Property(EndpointProperty.Port);
+
     /// <summary>
     /// Gets the connection string expression for the Ollama server.
     /// </summary>
@@ -35,6 +45,14 @@ public class OllamaResource(string name) : ContainerResource(name), IResourceWit
         $"Endpoint={PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{PrimaryEndpoint.Property(EndpointProperty.Host)}:{PrimaryEndpoint.Property(EndpointProperty.Port)}"
       );
 
+    /// <summary>
+    /// Gets the connection URI expression for the Ollama server.
+    /// </summary>
+    /// <remarks>
+    /// Format: <c>http://{host}:{port}</c>.
+    /// </remarks>
+    public ReferenceExpression UriExpression => ReferenceExpression.Create($"{PrimaryEndpoint.Property(EndpointProperty.Scheme)}://{Host}:{Port}");
+
     /// <summary>
     ///     Adds a model to the list of models to download on initial startup.
     /// </summary>
@@ -47,4 +65,11 @@ public void AddModel(string modelName)
             _models.Add(modelName);
         }
     }
+
+    IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties()
+    {
+        yield return new("Host", ReferenceExpression.Create($"{Host}"));
+        yield return new("Port", ReferenceExpression.Create($"{Port}"));
+        yield return new("Uri", UriExpression);
+    }
 }