From 449f32317501e3dd7bdfa34175c9c9dd46659db0 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:13:33 +0200 Subject: [PATCH 1/3] Use newer C# language syntax --- .../MySql/DynamicTypeAccess/MySqlPackageResolver.cs | 4 ++-- .../RuntimeTypeAccess/SqlServerPackageResolver.cs | 4 ++-- .../test/Eureka.Test/EurekaDiscoveryClientTest.cs | 10 ++++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Connectors/src/Connectors/MySql/DynamicTypeAccess/MySqlPackageResolver.cs b/src/Connectors/src/Connectors/MySql/DynamicTypeAccess/MySqlPackageResolver.cs index 3f003e2bad..724eb7de77 100644 --- a/src/Connectors/src/Connectors/MySql/DynamicTypeAccess/MySqlPackageResolver.cs +++ b/src/Connectors/src/Connectors/MySql/DynamicTypeAccess/MySqlPackageResolver.cs @@ -11,8 +11,8 @@ namespace Steeltoe.Connectors.MySql.DynamicTypeAccess; /// internal sealed class MySqlPackageResolver : PackageResolver { - private static readonly (string AssemblyName, string PackageName) MySqlConnector = new("MySqlConnector", "MySqlConnector"); - private static readonly (string AssemblyName, string PackageName) Oracle = new("MySql.Data", "MySql.Data"); + private static readonly (string AssemblyName, string PackageName) MySqlConnector = ("MySqlConnector", "MySqlConnector"); + private static readonly (string AssemblyName, string PackageName) Oracle = ("MySql.Data", "MySql.Data"); internal static readonly MySqlPackageResolver MySqlConnectorOnly = new(MySqlConnector.AssemblyName, MySqlConnector.PackageName); internal static readonly MySqlPackageResolver OracleOnly = new(Oracle.AssemblyName, Oracle.PackageName); diff --git a/src/Connectors/src/Connectors/SqlServer/RuntimeTypeAccess/SqlServerPackageResolver.cs b/src/Connectors/src/Connectors/SqlServer/RuntimeTypeAccess/SqlServerPackageResolver.cs index 30373395ea..169569c2d9 100644 --- a/src/Connectors/src/Connectors/SqlServer/RuntimeTypeAccess/SqlServerPackageResolver.cs +++ b/src/Connectors/src/Connectors/SqlServer/RuntimeTypeAccess/SqlServerPackageResolver.cs @@ -11,8 +11,8 @@ namespace Steeltoe.Connectors.SqlServer.RuntimeTypeAccess; /// internal sealed class SqlServerPackageResolver : PackageResolver { - private static readonly (string AssemblyName, string PackageName) MicrosoftData = new("Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient"); - private static readonly (string AssemblyName, string PackageName) SystemData = new("System.Data.SqlClient", "System.Data.SqlClient"); + private static readonly (string AssemblyName, string PackageName) MicrosoftData = ("Microsoft.Data.SqlClient", "Microsoft.Data.SqlClient"); + private static readonly (string AssemblyName, string PackageName) SystemData = ("System.Data.SqlClient", "System.Data.SqlClient"); internal static readonly SqlServerPackageResolver MicrosoftDataOnly = new(MicrosoftData.AssemblyName, MicrosoftData.PackageName); internal static readonly SqlServerPackageResolver SystemDataOnly = new(SystemData.AssemblyName, SystemData.PackageName); diff --git a/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs b/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs index 590e979a1c..38118ba99a 100644 --- a/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs @@ -491,7 +491,8 @@ public async Task GetInstancesAsync_ReturnsExpected() var discoveryClient = webApplication.Services.GetRequiredService(); - discoveryClient.Applications = new ApplicationInfoCollection([ + discoveryClient.Applications = + [ new ApplicationInfo("app1", [ new InstanceInfo("id11", "app1", "localhost", "192.168.56.1", new DataCenterInfo(), TimeProvider.System) { @@ -520,7 +521,7 @@ public async Task GetInstancesAsync_ReturnsExpected() Status = InstanceStatus.OutOfService } ]) - ]); + ]; IList result = await discoveryClient.GetInstancesAsync("vapp1", TestContext.Current.CancellationToken); @@ -555,7 +556,8 @@ public async Task GetApplication_ReturnsExpected() var discoveryClient = webApplication.Services.GetRequiredService(); - discoveryClient.Applications = new ApplicationInfoCollection([ + discoveryClient.Applications = + [ new ApplicationInfo("app1", [ new InstanceInfo("id1", "app1", "localhost", "192.168.56.1", new DataCenterInfo(), TimeProvider.System) { @@ -584,7 +586,7 @@ public async Task GetApplication_ReturnsExpected() Status = InstanceStatus.OutOfService } ]) - ]); + ]; ApplicationInfo? result = discoveryClient.GetApplication("app1"); From 14f9fe2a777f8eae08e5ad45e80cc3fba521ff2b Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:14:14 +0200 Subject: [PATCH 2/3] Fix flaky test on macOS --- .../Connectors.Test/RelationalDatabaseHealthContributorTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs index a7f5abb2dc..93f701a22e 100644 --- a/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs @@ -36,8 +36,7 @@ public async Task PostgreSQL_Not_Connected_Returns_Down_Status() string errorMessage = result.Details.Should().ContainKey("error").WhoseValue.As(); errorMessage.Should().Match(error => - error.StartsWith("NpgsqlException: Failed to connect", StringComparison.Ordinal) || - error.StartsWith("TimeoutException: ", StringComparison.Ordinal)); + error.StartsWith("NpgsqlException: ", StringComparison.Ordinal) || error.StartsWith("TimeoutException: ", StringComparison.Ordinal)); } [Fact(Skip = "Integration test - Requires local PostgreSQL server")] From ea7d1e27ea76fb1d45847c9add2f9ad2be96aa71 Mon Sep 17 00:00:00 2001 From: Bart Koelman <104792814+bart-vmware@users.noreply.github.com> Date: Fri, 11 Sep 2026 16:17:30 +0200 Subject: [PATCH 3/3] Optimize code cleanup --- .github/workflows/verify-code-style.yml | 6 +++--- cleanupcode.ps1 | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml index 0cab3f9724..119c8e7288 100644 --- a/.github/workflows/verify-code-style.yml +++ b/.github/workflows/verify-code-style.yml @@ -47,7 +47,7 @@ jobs: run: dotnet restore ${{ env.SOLUTION_FILE }} /p:Configuration=Release /p:NuGetAudit=false --verbosity minimal - name: Build - run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release /p:RunAnalyzers=false + run: dotnet build ${{ env.SOLUTION_FILE }} --no-restore --configuration Release /p:RunAnalyzers=false /p:GeneratePackageOnBuild=false - name: CleanupCode (on PR diff) if: ${{ github.event_name == 'pull_request' }} @@ -60,7 +60,7 @@ jobs: Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request." dotnet jb cleanupcode --version - dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff + dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --properties:GeneratePackageOnBuild=false --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash --fail-on-diff --print-diff - name: CleanupCode (on branch) if: ${{ github.event_name == 'push' || github.event_name == 'release' || github.event_name == 'workflow_dispatch' }} @@ -68,4 +68,4 @@ jobs: run: | Write-Output 'Running code cleanup on all files.' dotnet jb cleanupcode --version - dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN --fail-on-diff --print-diff + dotnet regitlint -s $env:SOLUTION_FILE --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --properties:GeneratePackageOnBuild=false --jb --verbosity=WARN --fail-on-diff --print-diff diff --git a/cleanupcode.ps1 b/cleanupcode.ps1 index f8c18429ab..cc339372cf 100644 --- a/cleanupcode.ps1 +++ b/cleanupcode.ps1 @@ -13,7 +13,7 @@ $solutionFile = 'src/Steeltoe.All.slnx' dotnet tool restore dotnet restore $solutionFile /p:NuGetAudit=false -dotnet build $solutionFile --no-restore --configuration Release /p:RunAnalyzers=false +dotnet build $solutionFile --no-restore --configuration Release /p:RunAnalyzers=false /p:GeneratePackageOnBuild=false if ($revision) { $headCommitHash = git rev-parse HEAD @@ -22,16 +22,16 @@ if ($revision) { if ($baseCommitHash -eq $headCommitHash) { Write-Output "Running code cleanup on staged/unstaged files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --properties:GeneratePackageOnBuild=false --jb --verbosity=WARN -f staged,modified } else { Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --max-runs=5 --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --properties:GeneratePackageOnBuild=false --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash } } else { Write-Output "Running code cleanup on all files." dotnet jb cleanupcode --version - dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --verbosity=WARN + dotnet regitlint -s $solutionFile --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --no-updates --jb --properties:Configuration=Release --jb --properties:RunAnalyzers=false --jb --properties:NuGetAudit=false --jb --properties:GeneratePackageOnBuild=false --jb --verbosity=WARN }