Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Aspire.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<Project Path="src/Components/Aspire.Microsoft.EntityFrameworkCore.SqlServer/Aspire.Microsoft.EntityFrameworkCore.SqlServer.csproj" />
<Project Path="src/Components/Aspire.Microsoft.Extensions.Configuration.AzureAppConfiguration/Aspire.Microsoft.Extensions.Configuration.AzureAppConfiguration.csproj" />
<Project Path="src/Components/Aspire.Milvus.Client/Aspire.Milvus.Client.csproj" />
<Project Path="src/Components/Aspire.MongoDB.Driver.v3/Aspire.MongoDB.Driver.v3.csproj" />
<Project Path="src/Components/Aspire.MongoDB.Driver.v2/Aspire.MongoDB.Driver.v2.csproj" />
<Project Path="src/Components/Aspire.MongoDB.Driver/Aspire.MongoDB.Driver.csproj" />
<Project Path="src/Components/Aspire.MySqlConnector/Aspire.MySqlConnector.csproj" />
<Project Path="src/Components/Aspire.NATS.Net/Aspire.NATS.Net.csproj" />
Expand All @@ -36,7 +36,7 @@
<Project Path="src/Components/Aspire.Oracle.EntityFrameworkCore/Aspire.Oracle.EntityFrameworkCore.csproj" />
<Project Path="src/Components/Aspire.Pomelo.EntityFrameworkCore.MySql/Aspire.Pomelo.EntityFrameworkCore.MySql.csproj" />
<Project Path="src/Components/Aspire.Qdrant.Client/Aspire.Qdrant.Client.csproj" />
<Project Path="src/Components/Aspire.RabbitMQ.Client.v7/Aspire.RabbitMQ.Client.v7.csproj" />
<Project Path="src/Components/Aspire.RabbitMQ.Client.v6/Aspire.RabbitMQ.Client.v6.csproj" />
<Project Path="src/Components/Aspire.RabbitMQ.Client/Aspire.RabbitMQ.Client.csproj" />
<Project Path="src/Components/Aspire.Seq/Aspire.Seq.csproj" />
<Project Path="src/Components/Aspire.StackExchange.Redis.DistributedCaching/Aspire.StackExchange.Redis.DistributedCaching.csproj" />
Expand Down Expand Up @@ -392,7 +392,7 @@
<Project Path="tests/Aspire.Microsoft.Extensions.Configuration.AzureAppConfiguration.Tests/Aspire.Microsoft.Extensions.Configuration.AzureAppConfiguration.Tests.csproj" />
<Project Path="tests/Aspire.Milvus.Client.Tests/Aspire.Milvus.Client.Tests.csproj" />
<Project Path="tests/Aspire.MongoDB.Driver.Tests/Aspire.MongoDB.Driver.Tests.csproj" />
<Project Path="tests/Aspire.MongoDB.Driver.v3.Tests/Aspire.MongoDB.Driver.v3.Tests.csproj" />
<Project Path="tests/Aspire.MongoDB.Driver.v2.Tests/Aspire.MongoDB.Driver.v2.Tests.csproj" />
<Project Path="tests/Aspire.MySqlConnector.Tests/Aspire.MySqlConnector.Tests.csproj" />
<Project Path="tests/Aspire.NATS.Net.Tests/Aspire.NATS.Net.Tests.csproj" />
<Project Path="tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests/Aspire.Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj" />
Expand All @@ -402,7 +402,7 @@
<Project Path="tests/Aspire.Pomelo.EntityFrameworkCore.MySql.Tests/Aspire.Pomelo.EntityFrameworkCore.MySql.Tests.csproj" />
<Project Path="tests/Aspire.Qdrant.Client.Tests/Aspire.Qdrant.Client.Tests.csproj" />
<Project Path="tests/Aspire.RabbitMQ.Client.Tests/Aspire.RabbitMQ.Client.Tests.csproj" />
<Project Path="tests/Aspire.RabbitMQ.Client.v7.Tests/Aspire.RabbitMQ.Client.v7.Tests.csproj" />
<Project Path="tests/Aspire.RabbitMQ.Client.v6.Tests/Aspire.RabbitMQ.Client.v6.Tests.csproj" />
<Project Path="tests/Aspire.Seq.Tests/Aspire.Seq.Tests.csproj" />
<Project Path="tests/Aspire.StackExchange.Redis.DistributedCaching.Tests/Aspire.StackExchange.Redis.DistributedCaching.Tests.csproj" />
<Project Path="tests/Aspire.StackExchange.Redis.OutputCaching.Tests/Aspire.StackExchange.Redis.OutputCaching.Tests.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion eng/clipack/Common.projitems
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
<_MaxFileSizeMB Condition="'$(_MaxFileSizeMB)' == '' and !$([System.OperatingSystem]::IsWindows())">25</_MaxFileSizeMB>

<!-- pwsh on windows. Use Ceiling to match `du -m` behavior -->
<_GetFileSizeMBCommand Condition="$([System.OperatingSystem]::IsWindows())">pwsh -Command &quot;[Math]::Ceiling((Get-Item '$(_NativeBinaryPath)' -ErrorAction Stop).Length / 1MB)&quot;</_GetFileSizeMBCommand>
<_GetFileSizeMBCommand Condition="$([System.OperatingSystem]::IsWindows())">pwsh -NoProfile -Command &quot;[Math]::Ceiling((Get-Item '$(_NativeBinaryPath)' -ErrorAction Stop).Length / 1MB)&quot;</_GetFileSizeMBCommand>

<!-- Using unix tools on Linux/macOS -->
<_GetFileSizeMBCommand Condition="!$([System.OperatingSystem]::IsWindows())">du -m '$(_NativeBinaryPath)' | cut -f1</_GetFileSizeMBCommand>
Expand Down
2 changes: 1 addition & 1 deletion playground/TestShop/BasketService/BasketService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.StackExchange.Redis" />
<AspireProjectOrPackageReference Include="Aspire.RabbitMQ.Client.v7" />
<AspireProjectOrPackageReference Include="Aspire.RabbitMQ.Client" />
<ProjectReference Include="..\TestShop.ServiceDefaults\TestShop.ServiceDefaults.csproj" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion playground/TestShop/OrderProcessor/OrderProcessor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</ItemGroup>

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.RabbitMQ.Client.v7" />
<AspireProjectOrPackageReference Include="Aspire.RabbitMQ.Client" />
<ProjectReference Include="..\TestShop.ServiceDefaults\TestShop.ServiceDefaults.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion playground/mongo/Mongo.ApiService/Mongo.ApiService.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<AspireProjectOrPackageReference Include="Aspire.MongoDB.Driver.v3" />
<AspireProjectOrPackageReference Include="Aspire.MongoDB.Driver" />

<ProjectReference Include="..\..\Playground.ServiceDefaults\Playground.ServiceDefaults.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
<IsPackable>true</IsPackable>
<PackageTags>$(ComponentDatabasePackageTags) MongoDB</PackageTags>
<PackageIconFullPath>$(SharedDir)MongoDB_300px.png</PackageIconFullPath>
<Description>A generic MongoDB client that integrates with Aspire.</Description>
<!-- MongoDB.Driver.Core.Extensions.DiagnosticSources is not signed -->
<Description>A generic MongoDB client (versions 2.x) that integrates with Aspire.</Description>
<!-- MongoDB.Driver.Core.Extensions.DiagnosticSources and AspNetCore.HealthChecks.MongoDb packages are not signed -->
<NoWarn>$(NoWarn);CS8002</NoWarn>
<DefineConstants>$(DefineConstants);MONGODB_V2</DefineConstants>
<!-- Disable package validation as this package hasn't shipped yet. -->
<EnablePackageValidation>false</EnablePackageValidation>

Expand All @@ -29,12 +30,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" />
<PackageReference Include="MongoDB.Driver" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" VersionOverride="[8.1.0,9.0.0)" />
<PackageReference Include="MongoDB.Driver" VersionOverride="[2.30.0,3.0.0)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" VersionOverride="[1.5.0,2.0.0)" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<PackageTags>$(ComponentDatabasePackageTags) MongoDB</PackageTags>
<PackageIconFullPath>$(SharedDir)MongoDB_300px.png</PackageIconFullPath>
<Description>A generic MongoDB client that integrates with Aspire.</Description>
<!-- MongoDB.Driver.Core.Extensions.DiagnosticSources and AspNetCore.HealthChecks.MongoDb packages are not signed -->
<!-- MongoDB.Driver.Core.Extensions.DiagnosticSources is not signed -->
<NoWarn>$(NoWarn);CS8002</NoWarn>
<DefineConstants>$(DefineConstants);MONGODB_V2</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -18,12 +17,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" VersionOverride="[8.1.0,9.0.0)" />
<PackageReference Include="MongoDB.Driver" VersionOverride="[2.30.0,3.0.0)" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" />
<PackageReference Include="MongoDB.Driver" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" VersionOverride="[1.5.0,2.0.0)" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
<TargetFrameworks>$(AllTargetFrameworks)</TargetFrameworks>
<IsPackable>true</IsPackable>
<PackageTags>$(ComponentDatabasePackageTags) rabbitmq amqp messaging eventing</PackageTags>
<Description>A RabbitMQ client (version 7+) that integrates with Aspire, including health checks, logging, and telemetry.</Description>
<Description>A RabbitMQ client (versions 6.x) that integrates with Aspire, including health checks, logging, and telemetry.</Description>
<NoWarn>$(NoWarn);SYSLIB1100;SYSLIB1101</NoWarn>
<DefineConstants>$(DefineConstants);RABBITMQ_V6</DefineConstants>
<!-- Disable package validation as this package hasn't shipped yet. -->
<EnablePackageValidation>false</EnablePackageValidation>

Expand All @@ -17,6 +18,7 @@

<ItemGroup>
<Compile Include="..\Aspire.RabbitMQ.Client\AspireRabbitMQExtensions.cs" />
<Compile Include="..\Aspire.RabbitMQ.Client\AssemblyInfo.cs" />
<Compile Include="..\Aspire.RabbitMQ.Client\RabbitMQClientSettings.cs" />
<Compile Include="..\Aspire.RabbitMQ.Client\RabbitMQEventSourceLogForwarder.cs" />
<None Include="..\Aspire.RabbitMQ.Client\README.md" Pack="true" PackagePath="\" />
Expand All @@ -26,17 +28,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq.v6" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.AutoActivation" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Polly.Core" />
<PackageReference Include="RabbitMQ.Client" VersionOverride="7.1.2" />
<PackageReference Include="RabbitMQ.Client" VersionOverride="[6.8.1,7.0.0)" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="Aspire.RabbitMQ.Client.v7.Tests" />
<InternalsVisibleTo Include="Aspire.RabbitMQ.Client.v6.Tests" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
},
"ConsumerDispatchConcurrency": {
"type": "integer",
"description": "Set to a value greater than one to enable concurrent processing. For a concurrency greater than one 'RabbitMQ.Client.IAsyncBasicConsumer' will be offloaded to the worker thread pool so it is important to choose the value for the concurrency wisely to avoid thread pool overloading. 'RabbitMQ.Client.IAsyncBasicConsumer' can handle concurrency much more efficiently due to the non-blocking nature of the consumer. Defaults to 1."
"description": "Set to a value greater than one to enable concurrent processing. For a concurrency greater than one 'RabbitMQ.Client.IBasicConsumer' will be offloaded to the worker thread pool so it is important to choose the value for the concurrency wisely to avoid thread pool overloading. 'RabbitMQ.Client.IAsyncBasicConsumer' can handle concurrency much more efficiently due to the non-blocking nature of the consumer. Defaults to 1."
},
"ContinuationTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "Amount of time protocol operations (e.g. queue.declare) are allowed to take before timing out."
"description": "Amount of time protocol operations (e.g. queue.declare) are allowed to take before timing out."
},
"DefaultAddressFamily": {
"enum": [
Expand Down Expand Up @@ -103,6 +103,10 @@
],
"description": "TLS versions enabled by default: TLSv1.2, v1.1, v1.0."
},
"DispatchConsumersAsync": {
"type": "boolean",
"description": "Set to true will enable a asynchronous consumer dispatcher which is compatible with 'RabbitMQ.Client.IAsyncBasicConsumer'. Defaults to false."
},
"Endpoint": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -212,9 +216,9 @@
"type": "string",
"description": "The host to connect to."
},
"MaxInboundMessageBodySize": {
"MaxMessageSize": {
"type": "integer",
"description": "Maximum allowed message size, in bytes, from RabbitMQ. Corresponds to the ConnectionFactory.DefaultMaxMessageSize setting."
"description": "Maximum allowed message size, in bytes, from RabbitMQ. Corresponds to the rabbit.max_message_size setting."
},
"NetworkRecoveryInterval": {
"type": "string",
Expand Down Expand Up @@ -329,6 +333,11 @@
"type": "string",
"description": "Gets or sets the connection string of the RabbitMQ server to connect to."
},
"DisableAutoActivation": {
"type": "boolean",
"description": "Gets or sets a boolean value that indicates whether auto activation is disabled or not.",
"default": true
},
"DisableHealthChecks": {
"type": "boolean",
"description": "Gets or sets a boolean value that indicates whether the RabbitMQ health check is disabled or not.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<PackageTags>$(ComponentDatabasePackageTags) rabbitmq amqp messaging eventing</PackageTags>
<Description>A RabbitMQ client that integrates with Aspire, including health checks, logging, and telemetry.</Description>
<NoWarn>$(NoWarn);SYSLIB1100;SYSLIB1101</NoWarn>
<DefineConstants>$(DefineConstants);RABBITMQ_V6</DefineConstants>
</PropertyGroup>

<ItemGroup>
Expand All @@ -15,12 +14,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq.v6" />
<PackageReference Include="AspNetCore.HealthChecks.Rabbitmq" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.AutoActivation" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="Polly.Core" />
<PackageReference Include="RabbitMQ.Client" VersionOverride="[6.8.1,7.0.0)" />
<PackageReference Include="RabbitMQ.Client" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" />
</ItemGroup>

Expand Down
12 changes: 4 additions & 8 deletions src/Components/Aspire.RabbitMQ.Client/ConfigurationSchema.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
},
"ConsumerDispatchConcurrency": {
"type": "integer",
"description": "Set to a value greater than one to enable concurrent processing. For a concurrency greater than one 'RabbitMQ.Client.IBasicConsumer' will be offloaded to the worker thread pool so it is important to choose the value for the concurrency wisely to avoid thread pool overloading. 'RabbitMQ.Client.IAsyncBasicConsumer' can handle concurrency much more efficiently due to the non-blocking nature of the consumer. Defaults to 1."
"description": "Set to a value greater than one to enable concurrent processing. For a concurrency greater than one 'RabbitMQ.Client.IAsyncBasicConsumer' will be offloaded to the worker thread pool so it is important to choose the value for the concurrency wisely to avoid thread pool overloading. 'RabbitMQ.Client.IAsyncBasicConsumer' can handle concurrency much more efficiently due to the non-blocking nature of the consumer. Defaults to 1."
},
"ContinuationTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "Amount of time protocol operations (e.g. queue.declare) are allowed to take before timing out."
"description": "Amount of time protocol operations (e.g. queue.declare) are allowed to take before timing out."
},
"DefaultAddressFamily": {
"enum": [
Expand Down Expand Up @@ -103,10 +103,6 @@
],
"description": "TLS versions enabled by default: TLSv1.2, v1.1, v1.0."
},
"DispatchConsumersAsync": {
"type": "boolean",
"description": "Set to true will enable a asynchronous consumer dispatcher which is compatible with 'RabbitMQ.Client.IAsyncBasicConsumer'. Defaults to false."
},
"Endpoint": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -216,9 +212,9 @@
"type": "string",
"description": "The host to connect to."
},
"MaxMessageSize": {
"MaxInboundMessageBodySize": {
"type": "integer",
"description": "Maximum allowed message size, in bytes, from RabbitMQ. Corresponds to the rabbit.max_message_size setting."
"description": "Maximum allowed message size, in bytes, from RabbitMQ. Corresponds to the ConnectionFactory.DefaultMaxMessageSize setting."
},
"NetworkRecoveryInterval": {
"type": "string",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<ProjectReference Include="..\..\src\Aspire.Hosting.MongoDB\Aspire.Hosting.MongoDB.csproj" />
<ProjectReference Include="..\..\src\Components\Aspire.MongoDB.Driver.v3\Aspire.MongoDB.Driver.v3.csproj" />
<ProjectReference Include="..\..\src\Components\Aspire.MongoDB.Driver\Aspire.MongoDB.Driver.csproj" />
<ProjectReference Include="..\Aspire.Hosting.Tests\Aspire.Hosting.Tests.csproj" />

<PackageReference Include="Microsoft.Extensions.Http.Resilience" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference Include="..\..\src\Aspire.Hosting.AppHost\Aspire.Hosting.AppHost.csproj" />
<ProjectReference Include="..\..\src\Aspire.Hosting.RabbitMQ\Aspire.Hosting.RabbitMQ.csproj" />
<ProjectReference Include="..\..\src\Components\Aspire.RabbitMQ.Client.v7\Aspire.RabbitMQ.Client.v7.csproj" />
<ProjectReference Include="..\..\src\Components\Aspire.RabbitMQ.Client\Aspire.RabbitMQ.Client.csproj" />
<ProjectReference Include="..\Aspire.Hosting.Tests\Aspire.Hosting.Tests.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<None Include="$(RepoRoot)src\Components\Aspire.MongoDB.Driver\ConfigurationSchema.json" CopyToOutputDirectory="PreserveNewest" />

<ProjectReference Include="..\..\src\Components\Aspire.MongoDB.Driver\Aspire.MongoDB.Driver.csproj" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" VersionOverride="[8.1.0,9.0.0)" />
<PackageReference Include="MongoDB.Driver" VersionOverride="[2.30.0,3.0.0)" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" VersionOverride="[1.5.0,2.0.0)" />
<PackageReference Include="AspNetCore.HealthChecks.MongoDb" />
<PackageReference Include="MongoDB.Driver" />
<PackageReference Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" />

<ProjectReference Include="..\Aspire.Components.Common.TestUtilities\Aspire.Components.Common.TestUtilities.csproj" />

Expand Down
Loading