Remove params keyword from extension methods to fix CS8620 and Rider warnings

tjementum · tjementum · commit 9581c090d661 · 2025-11-24T00:25:23.000+01:00
diff --git a/application/AppGateway/Program.cs b/application/AppGateway/Program.cs
@@ -36,7 +36,7 @@
     );
 }
 
-builder.AddNamedBlobStorages(("account-management-storage", "ACCOUNT_MANAGEMENT_STORAGE_URL"));
+builder.AddNamedBlobStorages([("account-management-storage", "ACCOUNT_MANAGEMENT_STORAGE_URL")]);
 
 builder.WebHost.UseKestrel(option => option.AddServerHeader = false);
 
diff --git a/application/account-management/Api/Program.cs b/application/account-management/Api/Program.cs
@@ -12,7 +12,7 @@
 
 // Configure dependency injection services like Repositories, MediatR, Pipelines, FluentValidation validators, etc.
 builder.Services
-    .AddApiServices(Assembly.GetExecutingAssembly(), Configuration.Assembly)
+    .AddApiServices([Assembly.GetExecutingAssembly(), Configuration.Assembly])
     .AddAccountManagementServices()
     .AddSinglePageAppFallback();
 
diff --git a/application/account-management/Core/Configuration.cs b/application/account-management/Core/Configuration.cs
@@ -18,7 +18,7 @@ public IHostApplicationBuilder AddAccountManagementInfrastructure()
             // Infrastructure is configured separately from other Infrastructure services to allow mocking in tests
             return builder
                 .AddSharedInfrastructure<AccountManagementDbContext>("account-management-database")
-                .AddNamedBlobStorages(("account-management-storage", "BLOB_STORAGE_URL"));
+                .AddNamedBlobStorages([("account-management-storage", "BLOB_STORAGE_URL")]);
         }
     }
 
@@ -34,7 +34,7 @@ public IServiceCollection AddAccountManagementServices()
             );
 
             return services
-                .AddSharedServices<AccountManagementDbContext>(Assembly)
+                .AddSharedServices<AccountManagementDbContext>([Assembly])
                 .AddScoped<AvatarUpdater>()
                 .AddScoped<UserInfoFactory>();
         }
diff --git a/application/account-management/Tests/Authentication/CompleteLoginTests.cs b/application/account-management/Tests/Authentication/CompleteLoginTests.cs
@@ -36,7 +36,7 @@ public async Task CompleteLogin_WhenValid_ShouldCompleteLoginAndCreateTokens()
         // Assert
         await response.ShouldBeSuccessfulPostRequest(hasLocation: false);
         var updatedLoginCount = Connection.ExecuteScalar<long>(
-            "SELECT COUNT(*) FROM Logins WHERE Id = @id AND Completed = 1", new { id = loginId.ToString() }
+            "SELECT COUNT(*) FROM Logins WHERE Id = @id AND Completed = 1", [new { id = loginId.ToString() }]
         );
         updatedLoginCount.Should().Be(1);
 
@@ -82,9 +82,9 @@ public async Task CompleteLogin_WhenInvalidOneTimePassword_ShouldReturnBadReques
         await response.ShouldHaveErrorStatusCode(HttpStatusCode.BadRequest, "The code is wrong or no longer valid.");
 
         // Verify retry count increment and event collection
-        var loginCompleted = Connection.ExecuteScalar<long>("SELECT Completed FROM Logins WHERE Id = @id", new { id = loginId.ToString() });
+        var loginCompleted = Connection.ExecuteScalar<long>("SELECT Completed FROM Logins WHERE Id = @id", [new { id = loginId.ToString() }]);
         loginCompleted.Should().Be(0);
-        var updatedRetryCount = Connection.ExecuteScalar<long>("SELECT RetryCount FROM EmailConfirmations WHERE Id = @id", new { id = emailConfirmationId.ToString() });
+        var updatedRetryCount = Connection.ExecuteScalar<long>("SELECT RetryCount FROM EmailConfirmations WHERE Id = @id", [new { id = emailConfirmationId.ToString() }]);
         updatedRetryCount.Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(2);
@@ -130,11 +130,11 @@ public async Task CompleteLogin_WhenRetryCountExceeded_ShouldReturnForbidden()
 
         // Verify retry count increment and event collection
         var loginCompleted = Connection.ExecuteScalar<long>(
-            "SELECT Completed FROM Logins WHERE Id = @id", new { id = loginId.ToString() }
+            "SELECT Completed FROM Logins WHERE Id = @id", [new { id = loginId.ToString() }]
         );
         loginCompleted.Should().Be(0);
         var updatedRetryCount = Connection.ExecuteScalar<long>(
-            "SELECT RetryCount FROM EmailConfirmations WHERE Id = @id", new { id = emailConfirmationId.ToString() }
+            "SELECT RetryCount FROM EmailConfirmations WHERE Id = @id", [new { id = emailConfirmationId.ToString() }]
         );
         updatedRetryCount.Should().Be(4);
 
@@ -215,7 +215,7 @@ public async Task CompleteLogin_WhenUserInviteCompleted_ShouldTrackUserInviteAcc
         // Assert
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE TenantId = @tenantId AND Email = @email AND EmailConfirmed = 1",
-            new { tenantId = DatabaseSeeder.Tenant1.Id.ToString(), email = email.ToLower() }
+            [new { tenantId = DatabaseSeeder.Tenant1.Id.ToString(), email = email.ToLower() }]
         ).Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(3);
diff --git a/application/account-management/Tests/Authentication/SwitchTenantTests.cs b/application/account-management/Tests/Authentication/SwitchTenantTests.cs
@@ -189,7 +189,7 @@ public async Task SwitchTenant_WhenUserEmailNotConfirmed_ShouldConfirmEmail()
         // Verify that the user's email is now confirmed
         var emailConfirmed = Connection.ExecuteScalar<long>(
             "SELECT EmailConfirmed FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
         emailConfirmed.Should().Be(1); // SQLite stores boolean as 0/1
     }
@@ -257,23 +257,23 @@ public async Task SwitchTenant_WhenAcceptingInvite_ShouldCopyProfileData()
         // Verify profile data was copied
         var firstName = Connection.ExecuteScalar<string>(
             "SELECT FirstName FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
         var lastName = Connection.ExecuteScalar<string>(
             "SELECT LastName FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
         var title = Connection.ExecuteScalar<string>(
             "SELECT Title FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
         var locale = Connection.ExecuteScalar<string>(
             "SELECT Locale FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
         var emailConfirmed = Connection.ExecuteScalar<long>(
             "SELECT EmailConfirmed FROM Users WHERE Id = @Id",
-            new { Id = user2Id.ToString() }
+            [new { Id = user2Id.ToString() }]
         );
 
         firstName.Should().Be(currentFirstName);
diff --git a/application/account-management/Tests/Signups/CompleteSignupTests.cs b/application/account-management/Tests/Signups/CompleteSignupTests.cs
@@ -40,7 +40,7 @@ public async Task CompleteSignup_WhenValid_ShouldCreateTenantAndOwnerUser()
 
         // Assert
         await response.ShouldBeSuccessfulPostRequest(hasLocation: false);
-        Connection.ExecuteScalar<long>("SELECT COUNT(*) FROM Users WHERE Email = @email", new { email = email.ToLower() }).Should().Be(1);
+        Connection.ExecuteScalar<long>("SELECT COUNT(*) FROM Users WHERE Email = @email", [new { email = email.ToLower() }]).Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(4);
         TelemetryEventsCollectorSpy.CollectedEvents[0].GetType().Name.Should().Be("SignupStarted");
diff --git a/application/account-management/Tests/Users/DeclineInvitationTests.cs b/application/account-management/Tests/Users/DeclineInvitationTests.cs
@@ -58,7 +58,7 @@ public async Task DeclineInvitation_WhenValidInviteExists_ShouldDeleteUserAndCol
         response.ShouldHaveEmptyHeaderAndLocationOnSuccess();
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE Id = @userId",
-            new { userId = userId.ToString() }
+            [new { userId = userId.ToString() }]
         ).Should().Be(0);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(1);
@@ -154,11 +154,11 @@ public async Task DeclineInvitation_WhenMultipleInvitesExist_ShouldDeclineSpecif
         response.ShouldHaveEmptyHeaderAndLocationOnSuccess();
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE Id = @userId",
-            new { userId = userId2.ToString() }
+            [new { userId = userId2.ToString() }]
         ).Should().Be(0);
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE Id = @userId",
-            new { userId = userId3.ToString() }
+            [new { userId = userId3.ToString() }]
         ).Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(1);
diff --git a/application/account-management/Tests/Users/InviteUserTests.cs b/application/account-management/Tests/Users/InviteUserTests.cs
@@ -51,7 +51,7 @@ public async Task InviteUser_WhenTenantHasName_ShouldCreateUserAndUseTenantNameI
         // Verify user was created
         Connection.ExecuteScalar<long>(
             "SELECT COUNT(*) FROM Users WHERE TenantId = @tenantId AND Email = @email AND EmailConfirmed = 0",
-            new { tenantId = DatabaseSeeder.Tenant1.Id.ToString(), email = email.ToLower() }
+            [new { tenantId = DatabaseSeeder.Tenant1.Id.ToString(), email = email.ToLower() }]
         ).Should().Be(1);
 
         TelemetryEventsCollectorSpy.CollectedEvents.Count.Should().Be(2);
diff --git a/application/back-office/Api/Program.cs b/application/back-office/Api/Program.cs
@@ -12,7 +12,7 @@
 
 // Configure dependency injection services like Repositories, MediatR, Pipelines, FluentValidation validators, etc.
 builder.Services
-    .AddApiServices(Assembly.GetExecutingAssembly(), Configuration.Assembly)
+    .AddApiServices([Assembly.GetExecutingAssembly(), Configuration.Assembly])
     .AddBackOfficeServices()
     .AddSinglePageAppFallback();
 
diff --git a/application/back-office/Core/Configuration.cs b/application/back-office/Core/Configuration.cs
@@ -22,7 +22,7 @@ public IHostApplicationBuilder AddBackOfficeInfrastructure()
     {
         public IServiceCollection AddBackOfficeServices()
         {
-            return services.AddSharedServices<BackOfficeDbContext>(Assembly);
+            return services.AddSharedServices<BackOfficeDbContext>([Assembly]);
         }
     }
 }
diff --git a/application/shared-kernel/SharedKernel/Configuration/ApiDependencyConfiguration.cs b/application/shared-kernel/SharedKernel/Configuration/ApiDependencyConfiguration.cs
@@ -55,7 +55,7 @@ public WebApplicationBuilder AddDevelopmentPort(int port)
 
     extension(IServiceCollection services)
     {
-        public IServiceCollection AddApiServices(params Assembly[] assemblies)
+        public IServiceCollection AddApiServices(Assembly[] assemblies)
         {
             return services
                 .AddApiExecutionContext()
@@ -117,7 +117,7 @@ public WebApplication UseApiServices()
 
     extension(IServiceCollection services)
     {
-        private IServiceCollection AddApiEndpoints(params Assembly[] assemblies)
+        private IServiceCollection AddApiEndpoints(Assembly[] assemblies)
         {
             return services
                 .Scan(scan => scan
@@ -147,7 +147,7 @@ private WebApplication UseApiEndpoints()
 
     extension(IServiceCollection services)
     {
-        private IServiceCollection AddOpenApiConfiguration(params Assembly[] assemblies)
+        private IServiceCollection AddOpenApiConfiguration(Assembly[] assemblies)
         {
             return services.AddOpenApiDocument((settings, _) =>
                 {
diff --git a/application/shared-kernel/SharedKernel/Configuration/SharedDependencyConfiguration.cs b/application/shared-kernel/SharedKernel/Configuration/SharedDependencyConfiguration.cs
@@ -52,7 +52,7 @@ public static ITokenSigningClient GetTokenSigningService()
 
     extension(IServiceCollection services)
     {
-        public IServiceCollection AddSharedServices<T>(params Assembly[] assemblies)
+        public IServiceCollection AddSharedServices<T>(Assembly[] assemblies)
             where T : DbContext
         {
             // Even though the HttpContextAccessor is not available in Worker Services, it is still registered here because
@@ -147,14 +147,14 @@ private IServiceCollection AddMediatRPipelineBehaviors()
                 .AddScoped<ConcurrentCommandCounter>();
         }
 
-        private IServiceCollection RegisterMediatRRequest(params Assembly[] assemblies)
+        private IServiceCollection RegisterMediatRRequest(Assembly[] assemblies)
         {
             return services
                 .AddMediatR(configuration => configuration.RegisterServicesFromAssemblies(assemblies))
                 .AddValidatorsFromAssemblies(assemblies);
         }
 
-        private IServiceCollection RegisterRepositories(params Assembly[] assemblies)
+        private IServiceCollection RegisterRepositories(Assembly[] assemblies)
         {
             // Scrutor will scan the assembly for all classes that implement the IRepository
             // and register them as a service in the container.
diff --git a/application/shared-kernel/SharedKernel/Configuration/SharedInfrastructureConfiguration.cs b/application/shared-kernel/SharedKernel/Configuration/SharedInfrastructureConfiguration.cs
@@ -95,14 +95,14 @@ private IHostApplicationBuilder AddDefaultBlobStorage()
         ///     Register different storage accounts for BlobStorage using .NET Keyed services, when a service needs to access
         ///     multiple storage accounts
         /// </summary>
-        public IHostApplicationBuilder AddNamedBlobStorages(params (string ConnectionName, string EnvironmentVariable)[] connections)
+        public IHostApplicationBuilder AddNamedBlobStorages((string ConnectionName, string EnvironmentVariable)?[] connections)
         {
             if (IsRunningInAzure)
             {
                 foreach (var connection in connections)
                 {
-                    var storageEndpointUri = new Uri(Environment.GetEnvironmentVariable(connection.EnvironmentVariable)!);
-                    builder.Services.AddKeyedSingleton(connection.ConnectionName,
+                    var storageEndpointUri = new Uri(Environment.GetEnvironmentVariable(connection!.Value.EnvironmentVariable)!);
+                    builder.Services.AddKeyedSingleton(connection.Value.ConnectionName,
                         (_, _) => new BlobStorageClient(new BlobServiceClient(storageEndpointUri, DefaultAzureCredential))
                     );
                 }
@@ -112,7 +112,7 @@ public IHostApplicationBuilder AddNamedBlobStorages(params (string ConnectionNam
                 var connectionString = builder.Configuration.GetConnectionString("blob-storage");
                 foreach (var connection in connections)
                 {
-                    builder.Services.AddKeyedSingleton(connection.ConnectionName,
+                    builder.Services.AddKeyedSingleton(connection!.Value.ConnectionName,
                         (_, _) => new BlobStorageClient(new BlobServiceClient(connectionString))
                     );
                 }
diff --git a/application/shared-kernel/SharedKernel/SinglePageApp/SinglePageAppConfiguration.cs b/application/shared-kernel/SharedKernel/SinglePageApp/SinglePageAppConfiguration.cs
@@ -30,7 +30,7 @@ public class SinglePageAppConfiguration
     private string? _htmlTemplate;
     private string? _remoteEntryJsContent;
 
-    public SinglePageAppConfiguration(bool isDevelopment, params (string Key, string Value)[] environmentVariables)
+    public SinglePageAppConfiguration(bool isDevelopment, (string Key, string Value)[] environmentVariables)
     {
         // Environment variables are empty when generating EF Core migrations
         PublicUrl = Environment.GetEnvironmentVariable(PublicUrlKey) ?? string.Empty;
diff --git a/application/shared-kernel/Tests/Persistence/SqliteConnectionExtensions.cs b/application/shared-kernel/Tests/Persistence/SqliteConnectionExtensions.cs
@@ -7,18 +7,18 @@ public static class SqliteConnectionExtensions
     extension(SqliteConnection connection)
     {
         [Obsolete("Use ExecuteScalar<long> instead")]
-        public long ExecuteScalar(string sql, params object?[] parameters)
+        public long ExecuteScalar(string sql, object[] parameters)
         {
             return connection.ExecuteScalar<long>(sql, parameters);
         }
 
-        public T ExecuteScalar<T>(string sql, params object?[] parameters)
+        public T ExecuteScalar<T>(string sql, object[] parameters)
         {
             using var command = new SqliteCommand(sql, connection);
 
             foreach (var parameter in parameters)
             {
-                foreach (var property in parameter?.GetType().GetProperties() ?? [])
+                foreach (var property in parameter.GetType().GetProperties())
                 {
                     command.Parameters.AddWithValue(property.Name, property.GetValue(parameter));
                 }
@@ -30,13 +30,13 @@ public T ExecuteScalar<T>(string sql, params object?[] parameters)
 
         public bool RowExists(string tableName, string id)
         {
-            object?[] parameters = [new { id }];
+            object[] parameters = [new { id }];
             return connection.ExecuteScalar<long>($"SELECT COUNT(*) FROM {tableName} WHERE Id = @id", parameters) == 1;
         }
 
         public bool RowExists(string tableName, long id)
         {
-            object?[] parameters = [new { id }];
+            object[] parameters = [new { id }];
             return connection.ExecuteScalar<long>($"SELECT COUNT(*) FROM {tableName} WHERE Id = @id", parameters) == 1;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`);`
`37`	`37`	`}`
`38`	`38`
`39`		`-builder.AddNamedBlobStorages(("account-management-storage", "ACCOUNT_MANAGEMENT_STORAGE_URL"));`
	`39`	`+builder.AddNamedBlobStorages([("account-management-storage", "ACCOUNT_MANAGEMENT_STORAGE_URL")]);`
`40`	`40`
`41`	`41`	`builder.WebHost.UseKestrel(option => option.AddServerHeader = false);`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public IHostApplicationBuilder AddAccountManagementInfrastructure()`
`18`	`18`	`// Infrastructure is configured separately from other Infrastructure services to allow mocking in tests`
`19`	`19`	`return builder`
`20`	`20`	`.AddSharedInfrastructure<AccountManagementDbContext>("account-management-database")`
`21`		`- .AddNamedBlobStorages(("account-management-storage", "BLOB_STORAGE_URL"));`
	`21`	`+ .AddNamedBlobStorages([("account-management-storage", "BLOB_STORAGE_URL")]);`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`@@ -34,7 +34,7 @@ public IServiceCollection AddAccountManagementServices()`
`34`	`34`	`);`
`35`	`35`
`36`	`36`	`return services`
`37`		`- .AddSharedServices<AccountManagementDbContext>(Assembly)`
	`37`	`+ .AddSharedServices<AccountManagementDbContext>([Assembly])`
`38`	`38`	`.AddScoped<AvatarUpdater>()`
`39`	`39`	`.AddScoped<UserInfoFactory>();`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public IHostApplicationBuilder AddBackOfficeInfrastructure()`
`22`	`22`	`{`
`23`	`23`	`public IServiceCollection AddBackOfficeServices()`
`24`	`24`	`{`
`25`		`- return services.AddSharedServices<BackOfficeDbContext>(Assembly);`
	`25`	`+ return services.AddSharedServices<BackOfficeDbContext>([Assembly]);`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`