Add connection property suffix

src/Aspire.Hosting.Azure.AIFoundry/AzureAIFoundryDeploymentResource.cs

@@ -99,7 +99,7 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
     {
         var model = Parent.IsEmulator ? ModelId ?? ModelName : DeploymentName;
         return Parent.CombineProperties([
-            new("Model", ReferenceExpression.Create($"{model}")),
+            new("ModelName", ReferenceExpression.Create($"{model}")),
             new("Format", ReferenceExpression.Create($"{Format}")),
             new("Version", ReferenceExpression.Create($"{ModelVersion}")),
         ]);

src/Aspire.Hosting.Azure.AIFoundry/README.md

@@ -98,11 +98,11 @@ The Azure AI Foundry deployment resource inherits all properties from its parent
 
 | Property Name | Description |
 |---------------|-------------|
-| `Model`       | The deployment name when targeting Azure or model identifier when running Foundry Local, e.g., `Phi-4`, `my-chat` |
+| `ModelName`       | The deployment name when targeting Azure or model identifier when running Foundry Local, e.g., `Phi-4`, `my-chat` |
 | `Format`      | The deployment format, .e.g., `OpenAI`, `Microsoft`, `xAi`, `Deepseek` |
 | `Version`     | The deployment version, e.g., `1`, `2025-08-07` |
 
-Note: The property named `Model` refers to the deployment name when targeting Azure AI Foundry, but to the model identifier when running Foundry Local.
+Note: The property named `ModelName` refers to the deployment name when targeting Azure AI Foundry, but to the model identifier when running Foundry Local.
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `chat` becomes `CHAT_URI`.
 

src/Aspire.Hosting.Azure.CognitiveServices/AzureOpenAIDeploymentResource.cs

@@ -110,7 +110,7 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
             yield return property;
         }
 
-        yield return new("Model", ReferenceExpression.Create($"{DeploymentName}"));
+        yield return new("ModelName", ReferenceExpression.Create($"{DeploymentName}"));
     }
 
     private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgumentExpression(nameof(argument))] string? paramName = null)

src/Aspire.Hosting.Azure.CognitiveServices/README.md

@@ -71,7 +71,7 @@ The Azure OpenAI deployment resource inherits all properties from its parent Azu
 
 | Property Name | Description |
 |---------------|-------------|
-| `Model`  | The name of the Azure OpenAI deployment, e.g., `chat` |
+| `ModelName`  | The name of the Azure OpenAI deployment, e.g., `chat` |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `chat` becomes `CHAT_URI`.
 

src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBDatabaseResource.cs

@@ -65,6 +65,6 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
             yield return property;
         }
 
-        yield return new("Database", ReferenceExpression.Create($"{DatabaseName}"));
+        yield return new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}"));
     }
 }

src/Aspire.Hosting.Azure.CosmosDB/README.md

@@ -89,7 +89,7 @@ The Cosmos DB database resource inherits all properties from its parent Cosmos D
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The name of the database |
+| `DatabaseName` | The name of the database |
 
 ### Cosmos DB container
 

src/Aspire.Hosting.Azure.EventHubs/AzureEventHubConsumerGroupResource.cs

@@ -74,6 +74,6 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
             yield return property;
         }
 
-        yield return new("ConsumerGroup", ReferenceExpression.Create($"{ConsumerGroupName}"));
+        yield return new("ConsumerGroupName", ReferenceExpression.Create($"{ConsumerGroupName}"));
     }
 }

src/Aspire.Hosting.Azure.EventHubs/README.md

@@ -82,7 +82,7 @@ The Event Hub consumer group resource inherits all properties from its parent Ev
 
 | Property Name | Description |
 |---------------|-------------|
-| `ConsumerGroup` | The name of the consumer group |
+| `ConsumerGroupName` | The name of the consumer group |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.Azure.Kusto/AzureKustoReadWriteDatabaseResource.cs

@@ -75,6 +75,6 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
             yield return property;
         }
 
-        yield return new("Database", ReferenceExpression.Create($"{DatabaseName}"));
+        yield return new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}"));
     }
-}
+}

src/Aspire.Hosting.Azure.Kusto/README.md

@@ -40,7 +40,7 @@ When you reference Azure Kusto resources using `WithReference`, the following co
 | Property Name | Description |
 |---------------|-------------|
 | `Uri`         | The cluster endpoint URI (inherited from parent cluster) |
-| `Database`    | The name of the database |
+| `DatabaseName`    | The name of the database |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `mydb` becomes `MYDB_URI`, and the `Database` property becomes `MYDB_DATABASE`.
 

src/Aspire.Hosting.Azure.PostgreSQL/AzurePostgresFlexibleServerDatabaseResource.cs

@@ -88,7 +88,7 @@ internal void SetInnerResource(PostgresDatabaseResource innerResource)
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
             new("JdbcConnectionString", JdbcConnectionString),
     ]);

src/Aspire.Hosting.Azure.PostgreSQL/README.md

@@ -77,9 +77,9 @@ The Azure PostgreSQL database resource inherits all properties from its parent s
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The name of the database |
-| `Uri` | The database-specific connection URI, with the format `postgresql://{Username}:{Password}@{Host}/{Database}` (credentials omitted when not applicable) |
-| `JdbcConnectionString` | JDBC-format connection string for the database, with the format `jdbc:postgresql://{Host}/{Database}?sslmode=require&authenticationPluginClassName=com.azure.identity.extensions.jdbc.postgresql.AzurePostgresqlAuthenticationPlugin` |
+| `DatabaseName` | The name of the database |
+| `Uri` | The database-specific connection URI, with the format `postgresql://{Username}:{Password}@{Host}/{DatabaseName}` (credentials omitted when not applicable) |
+| `JdbcConnectionString` | JDBC-format connection string for the database, with the format `jdbc:postgresql://{Host}/{DatabaseName}?sslmode=require&authenticationPluginClassName=com.azure.identity.extensions.jdbc.postgresql.AzurePostgresqlAuthenticationPlugin` |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.Azure.Sql/AzureSqlDatabaseResource.cs

@@ -101,7 +101,7 @@ internal void SetInnerResource(SqlServerDatabaseResource innerResource)
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties(
             [
-                new ("Database", ReferenceExpression.Create($"{DatabaseName}")),
+                new ("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
                 new ("Uri", UriExpression),
                 new ("JdbcConnectionString", JdbcConnectionString),
             ]);

src/Aspire.Hosting.Azure.Sql/README.md

@@ -75,7 +75,7 @@ The Azure SQL database resource inherits all properties from its parent Azure SQ
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The name of the database |
+| `DatabaseName` | The name of the database |
 | `Uri` | The connection URI, with the format `mssql://{Host}:{Port}/{DatabaseName}` |
 | `JdbcConnectionString` | JDBC connection string with the format `jdbc:sqlserver://{Host}:{Port};database={DatabaseName};encrypt=true;trustServerCertificate=false`; |
 

src/Aspire.Hosting.GitHub.Models/GitHubModelResource.cs

@@ -86,11 +86,11 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
     {
         yield return new("Uri", UriExpression);
         yield return new("Key", ReferenceExpression.Create($"{Key}"));
-        yield return new("Model", ReferenceExpression.Create($"{Model}"));
+        yield return new("ModelName", ReferenceExpression.Create($"{Model}"));
 
         if (Organization is not null)
         {
-            yield return new("Organization", ReferenceExpression.Create($"{Organization}"));
+            yield return new("OrganizationName", ReferenceExpression.Create($"{Organization}"));
         }
     }
 }

src/Aspire.Hosting.GitHub.Models/README.md

@@ -90,8 +90,8 @@ The GitHub Model resource exposes the following connection properties:
 |---------------|-------------|
 | `Uri` | The GitHub Models inference endpoint URI, with the format `https://models.github.ai/inference` |
 | `Key` | The API key (PAT or GitHub App token) for authentication |
-| `Model` | The model identifier for inference requests, for instance `openai/gpt-4o-mini` |
-| `Organization` | The organization attributed to the request (available when configured) |
+| `ModelName` | The model identifier for inference requests, for instance `openai/gpt-4o-mini` |
+| `OrganizationName` | The organization attributed to the request (available when configured) |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `chat` becomes `CHAT_URI`.
 

src/Aspire.Hosting.Milvus/MilvusDatabaseResource.cs

@@ -42,6 +42,6 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}"))
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}"))
         ]);
 }

src/Aspire.Hosting.Milvus/README.md

@@ -44,7 +44,7 @@ The Milvus database resource combines the server properties above and adds the f
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The Milvus database name |
+| `DatabaseName` | The Milvus database name |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.MongoDB/MongoDBDatabaseResource.cs

@@ -46,7 +46,7 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
         ]);
 }

src/Aspire.Hosting.MongoDB/MongoDBServerResource.cs

@@ -137,7 +137,7 @@ IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionSt
         if (PasswordParameter is not null)
         {
             yield return new("Password", ReferenceExpression.Create($"{PasswordParameter}"));
-            yield return new("AuthenticationDatabase", AuthenticationDatabaseReference);
+            yield return new("AuthenticationDatabaseName", AuthenticationDatabaseReference);
             yield return new("AuthenticationMechanism", AuthenticationMechanismReference);
         }
 

src/Aspire.Hosting.MongoDB/README.md

@@ -37,17 +37,17 @@ The MongoDB server resource exposes the following connection properties:
 | `Port` | The port number the MongoDB server is listening on |
 | `Username` | The username for authentication |
 | `Password` | The password for authentication (available when a password parameter is configured) |
-| `AuthenticationDatabase` | The authentication database (available when a password parameter is configured) |
+| `AuthenticationDatabaseName` | The authentication database (available when a password parameter is configured) |
 | `AuthenticationMechanism` | The authentication mechanism (available when a password parameter is configured) |
-| `Uri` | The connection URI, with the format `mongodb://{Username}:{Password}@{Host}:{Port}/?authSource={AuthenticationDatabase}&authMechanism={AuthenticationMechanism}` |
+| `Uri` | The connection URI, with the format `mongodb://{Username}:{Password}@{Host}:{Port}/?authSource={AuthenticationDatabaseName}&authMechanism={AuthenticationMechanism}` |
 
 ### MongoDB database
 
 The MongoDB database resource combines the server properties above and adds the following connection property:
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The MongoDB database name |
+| `DatabaseName` | The MongoDB database name |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.MySql/MySqlDatabaseResource.cs

@@ -67,7 +67,7 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
             new("JdbcConnectionString", JdbcConnectionString),
         ]);

src/Aspire.Hosting.MySql/README.md

@@ -46,9 +46,9 @@ The MySQL database resource combines the server properties above and adds the fo
 
 | Property Name | Description |
 |---------------|-------------|
-| `Database` | The MySQL database name |
-| `Uri` | The database-specific URI, with the format `mysql://root:{Password}@{Host}:{Port}/{Database}` |
-| `JdbcConnectionString` | The database-specific JDBC connection string, with the format `jdbc:mysql://{Host}:{Port}/{Database}`. User and password credentials are provided as separate `Username` and `Password` properties. |
+| `DatabaseName` | The MySQL database name |
+| `Uri` | The database-specific URI, with the format `mysql://root:{Password}@{Host}:{Port}/{DatabaseName}` |
+| `JdbcConnectionString` | The database-specific JDBC connection string, with the format `jdbc:mysql://{Host}:{Port}/{DatabaseName}`. User and password credentials are provided as separate `Username` and `Password` properties. |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.OpenAI/OpenAIModelResource.cs

@@ -42,6 +42,6 @@ public OpenAIModelResource(string name, string model, OpenAIResource parent) : b
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Model", ReferenceExpression.Create($"{Model}")),
+            new("ModelName", ReferenceExpression.Create($"{Model}")),
         ]);
 }

src/Aspire.Hosting.OpenAI/README.md

@@ -138,7 +138,7 @@ The OpenAI model resource combines the parent properties above and adds the foll
 
 | Property Name | Description |
 |---------------|-------------|
-| `Model` | The model identifier for inference requests, for instance `gpt-4o-mini` |
+| `ModelName` | The model identifier for inference requests, for instance `gpt-4o-mini` |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `chat` becomes `CHAT_URI`.
 

src/Aspire.Hosting.Oracle/OracleDatabaseResource.cs

@@ -56,7 +56,7 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
             new("JdbcConnectionString", JdbcConnectionString),
         ]);

src/Aspire.Hosting.Oracle/README.md

@@ -48,7 +48,7 @@ The Oracle database resource inherits all properties from its parent `OracleData
 |---------------|-------------|
 | `Uri` | The connection URI in oracle:// format, with the format `oracle://{Username}:{Password}@{Host}:{Port}/{DatabaseName}` |
 | `JdbcConnectionString` | JDBC connection string with database name, with the format `jdbc:oracle:thin:@//{Host}:{Port}/{DatabaseName}`. User and password credentials are provided as separate `Username` and `Password` properties. |
-| `Database` | The name of the database |
+| `DatabaseName` | The name of the database |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.PostgreSQL/PostgresDatabaseResource.cs

@@ -66,7 +66,7 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
             new("JdbcConnectionString", JdbcConnectionString),
         ]);

src/Aspire.Hosting.PostgreSQL/README.md

@@ -48,7 +48,7 @@ The PostgreSQL database resource inherits all properties from its parent `Postgr
 |---------------|-------------|
 | `Uri` | The connection URI with the database name, with the format `postgresql://{Username}:{Password}@{Host}:{Port}/{DatabaseName}` |
 | `JdbcConnectionString` | JDBC connection string with database name, with the format `jdbc:postgresql://{Host}:{Port}/{DatabaseName}`. User and password credentials are provided as separate `Username` and `Password` properties. |
-| `Database` | The name of the database |
+| `DatabaseName` | The name of the database |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.SqlServer/README.md

@@ -48,7 +48,7 @@ The SQL Server database resource inherits all properties from its parent `SqlSer
 |---------------|-------------|
 | `Uri` | The connection URI in mssql:// format, with the format `mssql://{Username}:{Password}@{Host}:{Port}/{DatabaseName}` |
 | `JdbcConnectionString` | JDBC connection string with database name, with the format `jdbc:sqlserver://{Host}:{Port};trustServerCertificate=true;databaseName={DatabaseName}`. User and password credentials are provided as separate `Username` and `Password` properties. |
-| `Database` | The name of the database |
+| `DatabaseName` | The name of the database |
 
 Aspire exposes each property as an environment variable named `[RESOURCE]_[PROPERTY]`. For instance, the `Uri` property of a resource called `db1` becomes `DB1_URI`.
 

src/Aspire.Hosting.SqlServer/SqlServerDatabaseResource.cs

@@ -68,7 +68,7 @@ private static string ThrowIfNullOrEmpty([NotNull] string? argument, [CallerArgu
 
     IEnumerable<KeyValuePair<string, ReferenceExpression>> IResourceWithConnectionString.GetConnectionProperties() =>
         Parent.CombineProperties([
-            new("Database", ReferenceExpression.Create($"{DatabaseName}")),
+            new("DatabaseName", ReferenceExpression.Create($"{DatabaseName}")),
             new("Uri", UriExpression),
             new("JdbcConnectionString", JdbcConnectionString),
         ]);

tests/Aspire.Hosting.Azure.Kusto.Tests/AzureKustoConnectionPropertiesTests.cs

@@ -61,7 +61,7 @@ public void AzureKustoDatabaseResourceGetConnectionPropertiesReturnsExpectedValu
             },
             property =>
             {
-                Assert.Equal("Database", property.Key);
+                Assert.Equal("DatabaseName", property.Key);
                 Assert.Equal("testdb", property.Value.ValueExpression);
             });
     }
@@ -85,7 +85,7 @@ public void AzureKustoDatabaseResourceWithEmulatorGetConnectionPropertiesReturns
             },
             property =>
             {
-                Assert.Equal("Database", property.Key);
+                Assert.Equal("DatabaseName", property.Key);
                 Assert.Equal("testdb", property.Value.ValueExpression);
             });
     }