Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2e03cdd
Aspire.Azure.Messaging.EventHubs
Zombach Aug 23, 2024
6c0bbe9
Aspire.Azure.Messaging.ServiceBus
Zombach Aug 23, 2024
609f932
Aspire.Azure.Messaging.WebPubSub
Zombach Aug 23, 2024
eb9beda
Aspire.Azure.Storage.Blobs
Zombach Aug 23, 2024
8a07913
Aspire.Microsoft.Data.SqlClient
Zombach Aug 23, 2024
12f82b9
Aspire.Microsoft.EntityFrameworkCore.Cosmos
Zombach Aug 23, 2024
3219b6e
Aspire.Microsoft.EntityFrameworkCore.SqlServer
Zombach Aug 23, 2024
6eaf998
Aspire.MySqlConnector
Zombach Aug 23, 2024
26b3d0f
Aspire.Npgsql
Zombach Aug 23, 2024
55ffb7f
Aspire.Npgsql.EntityFrameworkCore.PostgreSQL
Zombach Aug 23, 2024
3a5d69a
Aspire.Oracle.EntityFrameworkCore
Zombach Aug 23, 2024
49ad0b0
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 24, 2024
2cf01a8
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 24, 2024
f84a605
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 27, 2024
8c1beb3
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 29, 2024
0156ccb
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Aug 31, 2024
78bad1c
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 8, 2024
eb57d65
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 12, 2024
88d3937
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 16, 2024
1c2ca1b
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 19, 2024
a7e4367
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 21, 2024
5a8897c
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 25, 2024
79065a0
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Sep 26, 2024
5272a41
Merge branch 'main' into validate-arguments-of-public-methods#part-2
Zombach Oct 14, 2024
6b633b4
remove space
Zombach Oct 14, 2024
4f25b05
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Oct 15, 2024
e37ba62
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Oct 15, 2024
10936ac
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Oct 16, 2024
1216ec3
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Oct 19, 2024
51273dd
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Oct 27, 2024
60db66f
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Nov 12, 2024
f0f5a41
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Nov 17, 2024
8c562d2
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Nov 29, 2024
79018fc
Merge branch 'dotnet:main' into validate-arguments-of-public-methods#…
Zombach Feb 11, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ public static void AddAzureEventProcessorClient(
Action<AzureMessagingEventHubsProcessorSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventProcessorClient, EventProcessorClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventProcessorClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventProcessorClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -53,6 +56,7 @@ public static void AddKeyedAzureEventProcessorClient(
Action<AzureMessagingEventHubsProcessorSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventProcessorClient, EventProcessorClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new EventProcessorClientComponent()
Expand All @@ -75,6 +79,9 @@ public static void AddAzurePartitionReceiverClient(
Action<AzureMessagingEventHubsPartitionReceiverSettings>? configureSettings = null,
Action<IAzureClientBuilder<PartitionReceiver, PartitionReceiverOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new PartitionReceiverClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(PartitionReceiver),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -95,6 +102,7 @@ public static void AddKeyedAzurePartitionReceiverClient(
Action<AzureMessagingEventHubsPartitionReceiverSettings>? configureSettings = null,
Action<IAzureClientBuilder<PartitionReceiver, PartitionReceiverOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new PartitionReceiverClientComponent()
Expand All @@ -117,6 +125,9 @@ public static void AddAzureEventHubProducerClient(
Action<AzureMessagingEventHubsProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubProducerClient, EventHubProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubProducerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubProducerClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -137,6 +148,7 @@ public static void AddKeyedAzureEventHubProducerClient(
Action<AzureMessagingEventHubsProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubProducerClient, EventHubProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new EventHubProducerClientComponent()
Expand All @@ -160,6 +172,9 @@ public static void AddAzureEventHubBufferedProducerClient(
Action<IAzureClientBuilder<EventHubBufferedProducerClient, EventHubBufferedProducerClientOptions>>?
configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubBufferedProducerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubBufferedProducerClient), configureSettings,
configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -181,6 +196,7 @@ public static void AddKeyedAzureEventHubBufferedProducerClient(
Action<AzureMessagingEventHubsBufferedProducerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubBufferedProducerClient, EventHubBufferedProducerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new EventHubBufferedProducerClientComponent()
Expand All @@ -203,6 +219,9 @@ public static void AddAzureEventHubConsumerClient(
Action<AzureMessagingEventHubsConsumerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubConsumerClient, EventHubConsumerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new EventHubConsumerClientComponent()
.AddClient(builder, DefaultConfigSectionName + nameof(EventHubConsumerClient),
configureSettings, configureClientBuilder, connectionName, serviceKey: null);
Expand All @@ -224,6 +243,7 @@ public static void AddKeyedAzureEventHubConsumerClient(
Action<AzureMessagingEventHubsConsumerSettings>? configureSettings = null,
Action<IAzureClientBuilder<EventHubConsumerClient, EventHubConsumerClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new EventHubConsumerClientComponent()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ public static void AddAzureServiceBusClient(
Action<AzureMessagingServiceBusSettings>? configureSettings = null,
Action<IAzureClientBuilder<ServiceBusClient, ServiceBusClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new MessageBusComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
}

Expand All @@ -55,6 +58,7 @@ public static void AddKeyedAzureServiceBusClient(
Action<AzureMessagingServiceBusSettings>? configureSettings = null,
Action<IAzureClientBuilder<ServiceBusClient, ServiceBusClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(name);

new MessageBusComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName: name, serviceKey: name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public static void AddAzureWebPubSubServiceClient(
Action<AzureMessagingWebPubSubSettings>? configureSettings = null,
Action<IAzureClientBuilder<WebPubSubServiceClient, WebPubSubServiceClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new WebPubSubComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
}

Expand All @@ -56,6 +59,7 @@ public static void AddKeyedAzureWebPubSubServiceClient(
Action<AzureMessagingWebPubSubSettings>? configureSettings = null,
Action<IAzureClientBuilder<WebPubSubServiceClient, WebPubSubServiceClientOptions>>? configureClientBuilder = null)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);
ArgumentException.ThrowIfNullOrEmpty(serviceKey);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public static void AddAzureBlobClient(
Action<AzureStorageBlobsSettings>? configureSettings = null,
Action<IAzureClientBuilder<BlobServiceClient, BlobClientOptions>>? configureClientBuilder = null)
{
ArgumentException.ThrowIfNullOrEmpty(connectionName);

new BlobStorageComponent().AddClient(builder, DefaultConfigSectionName, configureSettings, configureClientBuilder, connectionName, serviceKey: null);
}

Expand Down Expand Up @@ -64,9 +66,11 @@ public static void AddKeyedAzureBlobClient(
private sealed class BlobStorageComponent : AzureComponent<AzureStorageBlobsSettings, BlobServiceClient, BlobClientOptions>
{
protected override IAzureClientBuilder<BlobServiceClient, BlobClientOptions> AddClient(
AzureClientFactoryBuilder azureFactoryBuilder, AzureStorageBlobsSettings settings, string connectionName,
AzureClientFactoryBuilder azureFactoryBuilder,
AzureStorageBlobsSettings settings,
string connectionName,
string configurationSectionName)
{
{
return ((IAzureClientFactoryBuilderWithCredential)azureFactoryBuilder).RegisterClientFactory<BlobServiceClient, BlobClientOptions>((options, cred) =>
{
var connectionString = settings.ConnectionString;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,19 @@ public static void AddSqlServerClient(this IHostApplicationBuilder builder, stri
/// <exception cref="InvalidOperationException">If required <see cref="MicrosoftDataSqlClientSettings.ConnectionString"/> is not provided in configuration section.</exception>
public static void AddKeyedSqlServerClient(this IHostApplicationBuilder builder, string name, Action<MicrosoftDataSqlClientSettings>? configureSettings = null)
{
ArgumentNullException.ThrowIfNull(name);
ArgumentException.ThrowIfNullOrEmpty(name);

AddSqlClient(builder, configureSettings, connectionName: name, serviceKey: name);
}

private static void AddSqlClient(IHostApplicationBuilder builder,
Action<MicrosoftDataSqlClientSettings>? configure, string connectionName, object? serviceKey)
private static void AddSqlClient(
IHostApplicationBuilder builder,
Action<MicrosoftDataSqlClientSettings>? configure,
string connectionName,
object? serviceKey)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

MicrosoftDataSqlClientSettings settings = new();
var configSection = builder.Configuration.GetSection(DefaultConfigSectionName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public static class AspireAzureEFCoreCosmosExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);
ArgumentException.ThrowIfNullOrEmpty(databaseName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ public static class AspireSqlServerEFCoreSqlClientExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Diagnostics.HealthChecks;
using Microsoft.Extensions.Logging;
using MySqlConnector;

namespace Microsoft.Extensions.Hosting;
Expand Down Expand Up @@ -54,6 +53,7 @@ private static void AddMySqlDataSource(IHostApplicationBuilder builder,
Action<MySqlConnectorSettings>? configureSettings, string connectionName, object? serviceKey)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

MySqlConnectorSettings settings = new();
var configSection = builder.Configuration.GetSection(DefaultConfigSectionName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public static partial class AspireEFPostgreSqlExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,15 @@ public static void AddKeyedNpgsqlDataSource(this IHostApplicationBuilder builder
AddNpgsqlDataSource(builder, configureSettings, connectionName: name, serviceKey: name, configureDataSourceBuilder: configureDataSourceBuilder);
}

private static void AddNpgsqlDataSource(IHostApplicationBuilder builder,
Action<NpgsqlSettings>? configureSettings, string connectionName, object? serviceKey, Action<NpgsqlDataSourceBuilder>? configureDataSourceBuilder)
private static void AddNpgsqlDataSource(
IHostApplicationBuilder builder,
Action<NpgsqlSettings>? configureSettings,
string connectionName,
object? serviceKey,
Action<NpgsqlDataSourceBuilder>? configureDataSourceBuilder)
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

NpgsqlSettings settings = new();
var configSection = builder.Configuration.GetSection(DefaultConfigSectionName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public static class AspireOracleEFCoreExtensions
Action<DbContextOptionsBuilder>? configureDbContextOptions = null) where TContext : DbContext
{
ArgumentNullException.ThrowIfNull(builder);
ArgumentException.ThrowIfNullOrEmpty(connectionName);

builder.EnsureDbContextNotRegistered<TContext>();

Expand Down
Loading