diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e3b1742e1d..23bbb97ed3 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,10 +53,6 @@ jobs: echo "##vso[task.setvariable variable=DOTNET_GENERATE_ASPNET_CERTIFICATE]false" - checkout: self fetchDepth: 0 - - task: UseDotNet@2 - displayName: Install .NET 6 - inputs: - version: 6.0.x - task: UseDotNet@2 displayName: Install .NET 8 inputs: @@ -105,14 +101,7 @@ jobs: condition: eq(variables['integrationTests'], 'true') displayName: Start Docker services - task: DotNetCoreCLI@2 - displayName: dotnet test 6.0 - inputs: - command: test - projects: '**/*.csproj' - arguments: '--blame-hang-timeout 3m -f net6.0 --no-build -c $(buildConfiguration) -maxcpucount:1 $(skipFilter) --collect "XPlat Code Coverage" --settings coverlet.runsettings --logger trx --results-directory $(Build.SourcesDirectory)' - publishTestResults: false - - task: DotNetCoreCLI@2 - displayName: dotnet test 8.0 + displayName: dotnet test net8.0 inputs: command: test projects: '**/*.csproj' diff --git a/build/package.yml b/build/package.yml index 584ea6cc97..d750e0ff24 100644 --- a/build/package.yml +++ b/build/package.yml @@ -19,10 +19,6 @@ jobs: steps: - checkout: self fetchDepth: 0 - - task: UseDotNet@2 - displayName: Install .NET 6 - inputs: - version: 6.0.x - task: UseDotNet@2 displayName: Install .NET 8 inputs: diff --git a/build/pr-code-cleanup.yml b/build/pr-code-cleanup.yml index 43770f37ac..9cf4296419 100644 --- a/build/pr-code-cleanup.yml +++ b/build/pr-code-cleanup.yml @@ -18,6 +18,7 @@ jobs: throw 'This pipeline can only be run from pull requests. Use "/azp run cleanup-code" in a GitHub PR comment.' } - task: UseDotNet@2 + # Workaround for https://github.com/sethreno/ReGitLint/issues/46. displayName: Install .NET 6 inputs: version: 6.0.x diff --git a/build/security.yml b/build/security.yml index 69a613b15b..96a99fd73e 100644 --- a/build/security.yml +++ b/build/security.yml @@ -18,9 +18,7 @@ jobs: parameters: component: Security skipFilter: --filter "Category!=SkipOnLinux" - skipNET6: true - template: templates/component-build.yaml parameters: component: Security OS: windows - skipNET6: true diff --git a/build/sonar-analyze.yml b/build/sonar-analyze.yml index a19640df87..a597e54bdd 100644 --- a/build/sonar-analyze.yml +++ b/build/sonar-analyze.yml @@ -16,10 +16,6 @@ jobs: steps: - checkout: self fetchDepth: 0 - - task: UseDotNet@2 - displayName: Install .NET 6 - inputs: - version: 6.0.x - task: UseDotNet@2 displayName: Install .NET 8 inputs: @@ -59,14 +55,7 @@ jobs: docker run -d --name rabbitmq -p 5672:5672 -p 15672:15672 rabbitmq:3-management displayName: Start Docker services - task: DotNetCoreCLI@2 - displayName: dotnet test 6.0 - inputs: - command: test - projects: '**/*.csproj' - arguments: '--blame-hang-timeout 3m -f net6.0 --no-build -c $(buildConfiguration) -maxcpucount:1 --filter "Category!=SkipOnLinux" --collect "XPlat Code Coverage" --settings coverlet.runsettings --logger trx --results-directory $(Build.SourcesDirectory)' - publishTestResults: false - - task: DotNetCoreCLI@2 - displayName: dotnet test 8.0 + displayName: dotnet test net8.0 inputs: command: test projects: '**/*.csproj' diff --git a/build/templates/component-build.yaml b/build/templates/component-build.yaml index b5a9587e89..6adcb1e684 100644 --- a/build/templates/component-build.yaml +++ b/build/templates/component-build.yaml @@ -2,7 +2,6 @@ parameters: component: '' runConfigServer: false runRabbitMQ: false - skipNET6: false skipFilter: '' OS: ubuntu @@ -27,11 +26,6 @@ jobs: steps: - checkout: self fetchDepth: 0 - - task: UseDotNet@2 - condition: ne(${{parameters.skipNET6}}, 'true') - displayName: Install .NET 6 - inputs: - version: 6.0.x - task: UseDotNet@2 displayName: Install .NET 8 inputs: @@ -70,15 +64,7 @@ jobs: condition: eq(${{parameters.runConfigServer}}, 'true') displayName: Start Config Server - task: DotNetCoreCLI@2 - condition: ne(${{parameters.skipNET6}}, 'true') - displayName: dotnet test 6.0 - inputs: - command: test - projects: $(SolutionFile) - arguments: -f net6.0 ${{parameters.skipFilter}} $(CommonTestArgs) - publishTestResults: false - - task: DotNetCoreCLI@2 - displayName: dotnet test 8.0 + displayName: dotnet test net8.0 inputs: command: test projects: $(SolutionFile) diff --git a/build/verify-code-style.yml b/build/verify-code-style.yml index bfa3bdd117..794fd97bc9 100644 --- a/build/verify-code-style.yml +++ b/build/verify-code-style.yml @@ -13,6 +13,7 @@ jobs: pool: vmImage: ubuntu-latest steps: + # Workaround for https://github.com/sethreno/ReGitLint/issues/46. - task: UseDotNet@2 displayName: Install .NET 6 inputs: diff --git a/shared-package.props b/shared-package.props index 4f258e19c6..bebfd83c26 100644 --- a/shared-package.props +++ b/shared-package.props @@ -53,21 +53,17 @@ - - - + + - - - + + $(NoWarn);SA1401;S1168;S2360;S3900;S3956;S4004;S4023 diff --git a/shared-test.props b/shared-test.props index 312c432d80..8ba9e39f2a 100644 --- a/shared-test.props +++ b/shared-test.props @@ -14,7 +14,12 @@ - + + + + + + diff --git a/shared.props b/shared.props index a391137aca..bd976f21ec 100644 --- a/shared.props +++ b/shared.props @@ -19,15 +19,6 @@ $(MSBuildThisFileDirectory)\Steeltoe.Release.ruleset - - - $(NoWarn);S4056 - - diff --git a/src/Bootstrap/src/AutoConfiguration/WebApplicationBuilderExtensions.cs b/src/Bootstrap/src/AutoConfiguration/HostApplicationBuilderExtensions.cs similarity index 71% rename from src/Bootstrap/src/AutoConfiguration/WebApplicationBuilderExtensions.cs rename to src/Bootstrap/src/AutoConfiguration/HostApplicationBuilderExtensions.cs index 26df6460ff..a423d72627 100644 --- a/src/Bootstrap/src/AutoConfiguration/WebApplicationBuilderExtensions.cs +++ b/src/Bootstrap/src/AutoConfiguration/HostApplicationBuilderExtensions.cs @@ -3,7 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common; @@ -12,7 +12,7 @@ namespace Steeltoe.Bootstrap.AutoConfiguration; -public static class WebApplicationBuilderExtensions +public static class HostApplicationBuilderExtensions { private static readonly IReadOnlySet EmptySet = ImmutableHashSet.Empty; @@ -20,12 +20,12 @@ public static class WebApplicationBuilderExtensions /// Automatically configures Steeltoe packages that have been added to your project as NuGet references. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddSteeltoe(this IHostApplicationBuilder builder) { return AddSteeltoe(builder, EmptySet, BootstrapLoggerFactory.Default); } @@ -34,15 +34,15 @@ public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder build /// Automatically configures Steeltoe packages that have been added to your project as NuGet references. /// /// - /// The to configure. + /// The to configure. /// /// /// The set of assembly names to exclude from auto-configuration. For ease of use, select from the constants in . /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder builder, IReadOnlySet assemblyNamesToExclude) + public static IHostApplicationBuilder AddSteeltoe(this IHostApplicationBuilder builder, IReadOnlySet assemblyNamesToExclude) { return AddSteeltoe(builder, assemblyNamesToExclude, BootstrapLoggerFactory.Default); } @@ -51,16 +51,16 @@ public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder build /// Automatically configures Steeltoe packages that have been added to your project as NuGet references. /// /// - /// The to configure. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder builder, ILoggerFactory loggerFactory) + public static IHostApplicationBuilder AddSteeltoe(this IHostApplicationBuilder builder, ILoggerFactory loggerFactory) { return AddSteeltoe(builder, EmptySet, loggerFactory); } @@ -69,7 +69,7 @@ public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder build /// Automatically configures Steeltoe packages that have been added to your project as NuGet references. /// /// - /// The to configure. + /// The to configure. /// /// /// The set of assembly names to exclude from auto-configuration. For ease of use, select from the constants in . @@ -79,9 +79,9 @@ public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder build /// write only to the console until logging is fully initialized. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddSteeltoe(this WebApplicationBuilder builder, IReadOnlySet assemblyNamesToExclude, + public static IHostApplicationBuilder AddSteeltoe(this IHostApplicationBuilder builder, IReadOnlySet assemblyNamesToExclude, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); diff --git a/src/Bootstrap/src/AutoConfiguration/HostBuilderExtensions.cs b/src/Bootstrap/src/AutoConfiguration/HostBuilderExtensions.cs index 2db3e2d86f..459a58ead1 100644 --- a/src/Bootstrap/src/AutoConfiguration/HostBuilderExtensions.cs +++ b/src/Bootstrap/src/AutoConfiguration/HostBuilderExtensions.cs @@ -23,7 +23,7 @@ public static class HostBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddSteeltoe(this IHostBuilder builder) { @@ -40,7 +40,7 @@ public static IHostBuilder AddSteeltoe(this IHostBuilder builder) /// The set of assembly names to exclude from auto-configuration. For ease of use, select from the constants in . /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddSteeltoe(this IHostBuilder builder, IReadOnlySet assemblyNamesToExclude) { @@ -58,7 +58,7 @@ public static IHostBuilder AddSteeltoe(this IHostBuilder builder, IReadOnlySet /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddSteeltoe(this IHostBuilder builder, ILoggerFactory loggerFactory) { @@ -79,7 +79,7 @@ public static IHostBuilder AddSteeltoe(this IHostBuilder builder, ILoggerFactory /// write only to the console until logging is fully initialized. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddSteeltoe(this IHostBuilder builder, IReadOnlySet assemblyNamesToExclude, ILoggerFactory loggerFactory) { diff --git a/src/Bootstrap/src/AutoConfiguration/PublicAPI.Unshipped.txt b/src/Bootstrap/src/AutoConfiguration/PublicAPI.Unshipped.txt index 6e7332ac62..2b61e7f678 100644 --- a/src/Bootstrap/src/AutoConfiguration/PublicAPI.Unshipped.txt +++ b/src/Bootstrap/src/AutoConfiguration/PublicAPI.Unshipped.txt @@ -12,19 +12,19 @@ const Steeltoe.Bootstrap.AutoConfiguration.SteeltoeAssemblyNames.ManagementEndpo const Steeltoe.Bootstrap.AutoConfiguration.SteeltoeAssemblyNames.ManagementPrometheus = "Steeltoe.Management.Prometheus" -> string! const Steeltoe.Bootstrap.AutoConfiguration.SteeltoeAssemblyNames.ManagementTracing = "Steeltoe.Management.Tracing" -> string! const Steeltoe.Bootstrap.AutoConfiguration.SteeltoeAssemblyNames.ManagementWavefront = "Steeltoe.Management.Wavefront" -> string! +static Steeltoe.Bootstrap.AutoConfiguration.HostApplicationBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Bootstrap.AutoConfiguration.HostApplicationBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Bootstrap.AutoConfiguration.HostApplicationBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Bootstrap.AutoConfiguration.HostApplicationBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Bootstrap.AutoConfiguration.HostBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.HostBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.HostBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.HostBuilderExtensions.AddSteeltoe(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder! -static Steeltoe.Bootstrap.AutoConfiguration.WebApplicationBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Bootstrap.AutoConfiguration.WebApplicationBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Bootstrap.AutoConfiguration.WebApplicationBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Bootstrap.AutoConfiguration.WebApplicationBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Bootstrap.AutoConfiguration.WebHostBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.WebHostBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.WebHostBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Bootstrap.AutoConfiguration.WebHostBuilderExtensions.AddSteeltoe(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Collections.Generic.IReadOnlySet! assemblyNamesToExclude, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +Steeltoe.Bootstrap.AutoConfiguration.HostApplicationBuilderExtensions Steeltoe.Bootstrap.AutoConfiguration.HostBuilderExtensions Steeltoe.Bootstrap.AutoConfiguration.SteeltoeAssemblyNames -Steeltoe.Bootstrap.AutoConfiguration.WebApplicationBuilderExtensions Steeltoe.Bootstrap.AutoConfiguration.WebHostBuilderExtensions diff --git a/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj b/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj index 6c81bed4cd..2459b1b19d 100644 --- a/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj +++ b/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Package for automatically configuring Steeltoe packages that have separately been added to a project. Autoconfiguration;automatic configuration;application bootstrapping true diff --git a/src/Bootstrap/src/AutoConfiguration/WebHostBuilderExtensions.cs b/src/Bootstrap/src/AutoConfiguration/WebHostBuilderExtensions.cs index 94063c3047..e1f26518ce 100644 --- a/src/Bootstrap/src/AutoConfiguration/WebHostBuilderExtensions.cs +++ b/src/Bootstrap/src/AutoConfiguration/WebHostBuilderExtensions.cs @@ -23,7 +23,7 @@ public static class WebHostBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder) { @@ -40,7 +40,7 @@ public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder) /// The set of assembly names to exclude from auto-configuration. For ease of use, select from the constants in . /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder, IReadOnlySet assemblyNamesToExclude) { @@ -58,7 +58,7 @@ public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder, IReadOnl /// write only to the console until logging is fully initialized. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder, ILoggerFactory loggerFactory) { @@ -79,7 +79,7 @@ public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder, ILoggerF /// write only to the console until logging is fully initialized. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddSteeltoe(this IWebHostBuilder builder, IReadOnlySet assemblyNamesToExclude, ILoggerFactory loggerFactory) { diff --git a/src/Bootstrap/test/AutoConfiguration.Test/HostBuilderExtensionsTest.cs b/src/Bootstrap/test/AutoConfiguration.Test/HostBuilderExtensionsTest.cs index bbb4bb9bbb..0d8d578cdc 100644 --- a/src/Bootstrap/test/AutoConfiguration.Test/HostBuilderExtensionsTest.cs +++ b/src/Bootstrap/test/AutoConfiguration.Test/HostBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; @@ -46,7 +45,6 @@ using Steeltoe.Management.Endpoint; using Steeltoe.Management.Endpoint.Web.Hypermedia; using Steeltoe.Management.Wavefront.Exporters; -using Xunit; namespace Steeltoe.Bootstrap.AutoConfiguration.Test; diff --git a/src/Bootstrap/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj b/src/Bootstrap/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj index f7e02269a7..7b5306bc88 100644 --- a/src/Bootstrap/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj +++ b/src/Bootstrap/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable @@ -25,7 +25,7 @@ - + diff --git a/src/Bootstrap/test/AutoConfiguration.Test/WebApplicationBuilderExtensionsTest.cs b/src/Bootstrap/test/AutoConfiguration.Test/WebApplicationBuilderExtensionsTest.cs index 913a3b2c2c..65ff7519bb 100644 --- a/src/Bootstrap/test/AutoConfiguration.Test/WebApplicationBuilderExtensionsTest.cs +++ b/src/Bootstrap/test/AutoConfiguration.Test/WebApplicationBuilderExtensionsTest.cs @@ -4,7 +4,6 @@ using System.Net; using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; @@ -47,7 +46,6 @@ using Steeltoe.Management.Endpoint; using Steeltoe.Management.Endpoint.Web.Hypermedia; using Steeltoe.Management.Wavefront.Exporters; -using Xunit; namespace Steeltoe.Bootstrap.AutoConfiguration.Test; diff --git a/src/Bootstrap/test/AutoConfiguration.Test/WebHostBuilderExtensionsTest.cs b/src/Bootstrap/test/AutoConfiguration.Test/WebHostBuilderExtensionsTest.cs index d9d7a85f63..6f6549405e 100644 --- a/src/Bootstrap/test/AutoConfiguration.Test/WebHostBuilderExtensionsTest.cs +++ b/src/Bootstrap/test/AutoConfiguration.Test/WebHostBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -47,7 +46,6 @@ using Steeltoe.Management.Endpoint; using Steeltoe.Management.Endpoint.Web.Hypermedia; using Steeltoe.Management.Wavefront.Exporters; -using Xunit; namespace Steeltoe.Bootstrap.AutoConfiguration.Test; diff --git a/src/Bootstrap/test/EmptyAutoConfiguration.Test/EmptyAutoConfigurationTest.cs b/src/Bootstrap/test/EmptyAutoConfiguration.Test/EmptyAutoConfigurationTest.cs index c2bd8ad6d5..50de37cbee 100644 --- a/src/Bootstrap/test/EmptyAutoConfiguration.Test/EmptyAutoConfigurationTest.cs +++ b/src/Bootstrap/test/EmptyAutoConfiguration.Test/EmptyAutoConfigurationTest.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Steeltoe.Bootstrap.AutoConfiguration; -using Xunit; namespace Steeltoe.Bootstrap.EmptyAutoConfiguration.Test; diff --git a/src/Bootstrap/test/EmptyAutoConfiguration.Test/Steeltoe.Bootstrap.EmptyAutoConfiguration.Test.csproj b/src/Bootstrap/test/EmptyAutoConfiguration.Test/Steeltoe.Bootstrap.EmptyAutoConfiguration.Test.csproj index a86273c674..65c3544cf5 100644 --- a/src/Bootstrap/test/EmptyAutoConfiguration.Test/Steeltoe.Bootstrap.EmptyAutoConfiguration.Test.csproj +++ b/src/Bootstrap/test/EmptyAutoConfiguration.Test/Steeltoe.Bootstrap.EmptyAutoConfiguration.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Common/src/Abstractions/DynamicTypeAccess/TaskShim.cs b/src/Common/src/Abstractions/DynamicTypeAccess/TaskShim.cs index 3c6fa2e448..746ed6fe37 100644 --- a/src/Common/src/Abstractions/DynamicTypeAccess/TaskShim.cs +++ b/src/Common/src/Abstractions/DynamicTypeAccess/TaskShim.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. #nullable enable + namespace Steeltoe.Common.DynamicTypeAccess; /// diff --git a/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj b/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj index 22534a06d4..2095351124 100644 --- a/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj +++ b/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe.Common Abstractions commonly used across Steeltoe components abstractions;availability;health;health-checks;load-balancer diff --git a/src/Common/src/Common.Certificates/LocalCertificateWriter.cs b/src/Common/src/Common.Certificates/LocalCertificateWriter.cs index 5e0a55f565..af3991178f 100644 --- a/src/Common/src/Common.Certificates/LocalCertificateWriter.cs +++ b/src/Common/src/Common.Certificates/LocalCertificateWriter.cs @@ -74,25 +74,8 @@ public void Write(Guid orgId, Guid spaceId) Directory.CreateDirectory(Path.Combine(AppBasePath, CertificateDirectoryName)); } -#if NET6_0 - string chainedCertificateContents = $""" - -----BEGIN CERTIFICATE----- - {Convert.ToBase64String(clientCertificate.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks)} - -----END CERTIFICATE----- - -----BEGIN CERTIFICATE----- - {Convert.ToBase64String(intermediateCertificate.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks)} - -----END CERTIFICATE----- - """; - - string keyContents = $""" - -----BEGIN RSA PRIVATE KEY----- - {Convert.ToBase64String(clientCertificate.GetRSAPrivateKey()!.ExportRSAPrivateKey(), Base64FormattingOptions.InsertLineBreaks)} - -----END RSA PRIVATE KEY----- - """; -#else string chainedCertificateContents = clientCertificate.ExportCertificatePem() + Environment.NewLine + intermediateCertificate.ExportCertificatePem(); string keyContents = clientCertificate.GetRSAPrivateKey()!.ExportRSAPrivateKeyPem(); -#endif File.WriteAllText(Path.Combine(AppBasePath, CertificateDirectoryName, $"{CertificateFilenamePrefix}Cert.pem"), chainedCertificateContents); File.WriteAllText(Path.Combine(AppBasePath, CertificateDirectoryName, $"{CertificateFilenamePrefix}Key.pem"), keyContents); diff --git a/src/Common/src/Common.Certificates/ServiceCollectionExtensions.cs b/src/Common/src/Common.Certificates/ServiceCollectionExtensions.cs index 88e5eb15f1..b3b846fce0 100644 --- a/src/Common/src/Common.Certificates/ServiceCollectionExtensions.cs +++ b/src/Common/src/Common.Certificates/ServiceCollectionExtensions.cs @@ -34,7 +34,7 @@ internal static class ServiceCollectionExtensions /// Provides access to the file system. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IServiceCollection WatchFilePathInOptions(this IServiceCollection services, string key, string? optionName, string pathPropertyName, IFileProvider fileProvider) diff --git a/src/Common/src/Common.Certificates/Steeltoe.Common.Certificates.csproj b/src/Common/src/Common.Certificates/Steeltoe.Common.Certificates.csproj index d981050562..6c7e2a46b9 100644 --- a/src/Common/src/Common.Certificates/Steeltoe.Common.Certificates.csproj +++ b/src/Common/src/Common.Certificates/Steeltoe.Common.Certificates.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe common library for using certificates security;pem;certificate true diff --git a/src/Common/src/Common.Hosting/HostBuilderContextWrapper.cs b/src/Common/src/Common.Hosting/HostBuilderContextWrapper.cs index 1e542ff32b..7c8e77dec9 100644 --- a/src/Common/src/Common.Hosting/HostBuilderContextWrapper.cs +++ b/src/Common/src/Common.Hosting/HostBuilderContextWrapper.cs @@ -4,7 +4,6 @@ #nullable enable -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; @@ -42,11 +41,7 @@ public static HostBuilderContextWrapper Wrap(WebHostBuilderContext context) return new HostBuilderContextWrapper(context.Configuration, context.HostingEnvironment, context); } -#if NET6_0 - public static HostBuilderContextWrapper Wrap(WebApplicationBuilder context) -#else public static HostBuilderContextWrapper Wrap(IHostApplicationBuilder context) -#endif { ArgumentGuard.NotNull(context); @@ -63,7 +58,7 @@ public static HostBuilderContextWrapper Wrap(IHostApplicationBuilder context) return WrapGenericAction(action); } - public static Action? WrapAction(Action? action) + public static Action? WrapAction(Action? action) { return WrapGenericAction(action); } diff --git a/src/Common/src/Common.Hosting/HostBuilderExtensions.cs b/src/Common/src/Common.Hosting/HostBuilderExtensions.cs index 92acd1dc33..b0d8402be3 100644 --- a/src/Common/src/Common.Hosting/HostBuilderExtensions.cs +++ b/src/Common/src/Common.Hosting/HostBuilderExtensions.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. +using System.Globalization; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -15,50 +16,51 @@ public static class HostBuilderExtensions /// /// Configure the application to listen on port(s) provided by the environment at runtime. Defaults to port 8080. /// - /// - /// Your . + /// + /// The to configure. /// /// - /// Your , now listening on port(s) found in the environment. + /// The so that additional calls can be chained. /// - public static IWebHostBuilder UseCloudHosting(this IWebHostBuilder webHostBuilder) + public static IWebHostBuilder UseCloudHosting(this IWebHostBuilder builder) { - ArgumentGuard.NotNull(webHostBuilder); + ArgumentGuard.NotNull(builder); - return webHostBuilder.BindToPorts(); + builder.BindToPorts(); + return builder; } /// /// Configure the application to listen on port(s) provided by the environment at runtime. Defaults to port 8080. /// - /// - /// Your . + /// + /// The to configure. /// - /// - /// Your , now listening on port(s) found in the environment. - /// /// /// runLocalPort parameter will not be used if an environment variable PORT is found

THIS EXTENSION IS NOT COMPATIBLE WITH IIS EXPRESS. /// - public static WebApplicationBuilder UseCloudHosting(this WebApplicationBuilder webApplicationBuilder) + /// + /// The so that additional calls can be chained. + /// + public static WebApplicationBuilder UseCloudHosting(this WebApplicationBuilder builder) { - ArgumentGuard.NotNull(webApplicationBuilder); + ArgumentGuard.NotNull(builder); - webApplicationBuilder.WebHost.BindToPorts(); - return webApplicationBuilder; + builder.WebHost.BindToPorts(); + return builder; } - internal static WebApplicationBuilder UseCloudHosting(this WebApplicationBuilder webApplicationBuilder, int? managementtHttpPort, int? managementHttpsPort) + internal static WebApplicationBuilder UseCloudHosting(this WebApplicationBuilder builder, int? managementHttpPort, int? managementHttpsPort) { - ArgumentGuard.NotNull(webApplicationBuilder); - webApplicationBuilder.WebHost.BindToPorts(managementtHttpPort, managementHttpsPort); - return webApplicationBuilder; + ArgumentGuard.NotNull(builder); + builder.WebHost.BindToPorts(managementHttpPort, managementHttpsPort); + return builder; } - internal static IWebHostBuilder UseCloudHosting(this IWebHostBuilder webhostBuilder, int? managementHttpPort, int? managementHttpsPort) + internal static IWebHostBuilder UseCloudHosting(this IWebHostBuilder builder, int? managementHttpPort, int? managementHttpsPort) { - ArgumentGuard.NotNull(webhostBuilder); - return webhostBuilder.BindToPorts(managementHttpPort, managementHttpsPort); + ArgumentGuard.NotNull(builder); + return builder.BindToPorts(managementHttpPort, managementHttpsPort); } private static List GetUrlsFromPorts(int? httpPort, int? httpsPort) @@ -78,14 +80,14 @@ private static List GetUrlsFromPorts(int? httpPort, int? httpsPort) return urls; } - private static IWebHostBuilder BindToPorts(this IWebHostBuilder webHostBuilder, int? managementHttpPort = null, int? managementHttpsPort = null) + private static IWebHostBuilder BindToPorts(this IWebHostBuilder builder, int? managementHttpPort = null, int? managementHttpsPort = null) { var urls = new HashSet(); string portStr = Environment.GetEnvironmentVariable("PORT") ?? Environment.GetEnvironmentVariable("SERVER_PORT"); string aspnetUrls = Environment.GetEnvironmentVariable("ASPNETCORE_URLS"); - string serverUrlSetting = webHostBuilder.GetSetting(DeprecatedServerUrlsKey); // check for deprecated setting - string urlSetting = webHostBuilder.GetSetting(WebHostDefaults.ServerUrlsKey); + string serverUrlSetting = builder.GetSetting(DeprecatedServerUrlsKey); // check for deprecated setting + string urlSetting = builder.GetSetting(WebHostDefaults.ServerUrlsKey); if (!string.IsNullOrEmpty(serverUrlSetting)) { @@ -116,12 +118,12 @@ private static IWebHostBuilder BindToPorts(this IWebHostBuilder webHostBuilder, urls.Add(url); } - return webHostBuilder.BindToPorts(urls); + return builder.BindToPorts(urls); } - private static IWebHostBuilder BindToPorts(this IWebHostBuilder webHostBuilder, HashSet urls) + private static IWebHostBuilder BindToPorts(this IWebHostBuilder builder, HashSet urls) { - string currentSetting = webHostBuilder.GetSetting(WebHostDefaults.ServerUrlsKey); + string currentSetting = builder.GetSetting(WebHostDefaults.ServerUrlsKey); if (!string.IsNullOrEmpty(currentSetting)) { @@ -131,7 +133,7 @@ private static IWebHostBuilder BindToPorts(this IWebHostBuilder webHostBuilder, } } - return webHostBuilder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Join(";", urls)); + return builder.UseSetting(WebHostDefaults.ServerUrlsKey, string.Join(";", urls)); } private static string GetCanonical(string serverUrlSetting) @@ -143,7 +145,7 @@ private static string GetCanonical(string serverUrlSetting) private static void AddPortAndAspNetCoreUrls(HashSet urls, string portStr, string aspnetUrls) { - if (int.TryParse(portStr, out int port)) + if (int.TryParse(portStr, CultureInfo.InvariantCulture, out int port)) { urls.Add($"http://*:{port}"); } diff --git a/src/Common/src/Common.Hosting/HostBuilderWrapper.cs b/src/Common/src/Common.Hosting/HostBuilderWrapper.cs index a06de6e783..031fc749e7 100644 --- a/src/Common/src/Common.Hosting/HostBuilderWrapper.cs +++ b/src/Common/src/Common.Hosting/HostBuilderWrapper.cs @@ -14,8 +14,8 @@ namespace Steeltoe.Common.Hosting; /// -/// A host-agnostic wrapper for , and . Intended to reduce -/// code duplication when targeting the various host builders. +/// A host-agnostic wrapper for , and . Intended to +/// reduce code duplication when targeting the various host builders. /// internal sealed class HostBuilderWrapper { @@ -83,15 +83,11 @@ public static HostBuilderWrapper Wrap(IWebHostBuilder builder) return wrapper; } -#if NET6_0 - public static HostBuilderWrapper Wrap(WebApplicationBuilder builder) -#else public static HostBuilderWrapper Wrap(IHostApplicationBuilder builder) -#endif { ArgumentGuard.NotNull(builder); - // WebApplicationBuilder/IHostApplicationBuilder immediately execute callbacks, so don't capture them for deferred execution. + // IHostApplicationBuilder implementations immediately execute callbacks, so don't capture them for deferred execution. return new HostBuilderWrapper(builder); } @@ -116,11 +112,7 @@ public HostBuilderWrapper ConfigureServices(Action configureActi { configureAction(webApplicationBuilder.WebHost); } -#if !NET6_0 else if (_innerBuilder is IHostApplicationBuilder) { // This is not a web application, so silently ignore. } -#endif else { throw new NotSupportedException($"Unknown host builder type '{_innerBuilder.GetType()}'."); diff --git a/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj b/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj index 6abedcf2e2..b8a439c232 100644 --- a/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj +++ b/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe library for common hosting-related utilities NET Core;Cloud Hosting; true diff --git a/src/Common/src/Common.Http/HttpClientExtensions.cs b/src/Common/src/Common.Http/HttpClientExtensions.cs index 03d0a5bdd4..7877050e00 100644 --- a/src/Common/src/Common.Http/HttpClientExtensions.cs +++ b/src/Common/src/Common.Http/HttpClientExtensions.cs @@ -60,12 +60,7 @@ public static async Task GetAccessTokenAsync(this HttpClient httpClient, using HttpResponseMessage response = await httpClient.SendAsync(request, cancellationToken); response.EnsureSuccessStatusCode(); -#if NET6_0 - var responseDocument = await response.Content.ReadFromJsonAsync(cancellationToken: cancellationToken); -#else var responseDocument = await response.Content.ReadFromJsonAsync(cancellationToken); -#endif - string? accessToken = responseDocument?.AccessToken; if (string.IsNullOrEmpty(accessToken)) diff --git a/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj b/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj index d304914917..450e558eb8 100644 --- a/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj +++ b/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe common library for HTTP http; discovery; loadbalancing true diff --git a/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj b/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj index 134856756b..d0b2ca36d4 100644 --- a/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj +++ b/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe common library for network interaction Windows-file-sharing; network-file-system true diff --git a/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj b/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj index 6d0c999d28..18f67ad06e 100644 --- a/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj +++ b/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe common utility libraries IO; File; Directory true diff --git a/src/Common/src/Common/Configuration/ConfigurationValuesHelper.cs b/src/Common/src/Common/Configuration/ConfigurationValuesHelper.cs index faf98b0e75..32c71d5c37 100644 --- a/src/Common/src/Common/Configuration/ConfigurationValuesHelper.cs +++ b/src/Common/src/Common/Configuration/ConfigurationValuesHelper.cs @@ -98,7 +98,7 @@ public static int GetInt(string key, IConfiguration configuration, IConfiguratio { string val = GetString(key, configuration, resolve, null); - if (!string.IsNullOrEmpty(val) && int.TryParse(val, out int result)) + if (!string.IsNullOrEmpty(val) && int.TryParse(val, CultureInfo.InvariantCulture, out int result)) { return result; } diff --git a/src/Common/src/Common/Steeltoe.Common.csproj b/src/Common/src/Common/Steeltoe.Common.csproj index bbfdb9c6a8..32d8d451e4 100644 --- a/src/Common/src/Common/Steeltoe.Common.csproj +++ b/src/Common/src/Common/Steeltoe.Common.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe common library availability;health;health-checks;loadbalancer;logging;reflection;utilities true diff --git a/src/Common/test/Common.Certificates.Test/CertificateConfigurationExtensionsTest.cs b/src/Common/test/Common.Certificates.Test/CertificateConfigurationExtensionsTest.cs index 13443f3a73..9694696225 100644 --- a/src/Common/test/Common.Certificates.Test/CertificateConfigurationExtensionsTest.cs +++ b/src/Common/test/Common.Certificates.Test/CertificateConfigurationExtensionsTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Common.Certificates.Test; diff --git a/src/Common/test/Common.Certificates.Test/ConfigureCertificateOptionsTest.cs b/src/Common/test/Common.Certificates.Test/ConfigureCertificateOptionsTest.cs index 6448294e68..50cb139a7d 100644 --- a/src/Common/test/Common.Certificates.Test/ConfigureCertificateOptionsTest.cs +++ b/src/Common/test/Common.Certificates.Test/ConfigureCertificateOptionsTest.cs @@ -4,14 +4,12 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Steeltoe.Common.Configuration; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Certificates.Test; diff --git a/src/Common/test/Common.Certificates.Test/LocalCertificateWriterTest.cs b/src/Common/test/Common.Certificates.Test/LocalCertificateWriterTest.cs index 85758d6d73..0bc9636d52 100644 --- a/src/Common/test/Common.Certificates.Test/LocalCertificateWriterTest.cs +++ b/src/Common/test/Common.Certificates.Test/LocalCertificateWriterTest.cs @@ -4,8 +4,6 @@ using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using FluentAssertions; -using Xunit; namespace Steeltoe.Common.Certificates.Test; diff --git a/src/Common/test/Common.Certificates.Test/Steeltoe.Common.Certificates.Test.csproj b/src/Common/test/Common.Certificates.Test/Steeltoe.Common.Certificates.Test.csproj index be3eb0ba94..110e205cd2 100644 --- a/src/Common/test/Common.Certificates.Test/Steeltoe.Common.Certificates.Test.csproj +++ b/src/Common/test/Common.Certificates.Test/Steeltoe.Common.Certificates.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Common/test/Common.Hosting.Test/BootstrapperLoggerFactoryTests.cs b/src/Common/test/Common.Hosting.Test/BootstrapperLoggerFactoryTests.cs index 05b23b01fe..a4fa3f026e 100644 --- a/src/Common/test/Common.Hosting.Test/BootstrapperLoggerFactoryTests.cs +++ b/src/Common/test/Common.Hosting.Test/BootstrapperLoggerFactoryTests.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Moq; using Steeltoe.Common.Logging; -using Xunit; namespace Steeltoe.Common.Hosting.Test; diff --git a/src/Common/test/Common.Hosting.Test/HostBuilderExtensionsTest.cs b/src/Common/test/Common.Hosting.Test/HostBuilderExtensionsTest.cs index ce16741aeb..a19abdb11c 100644 --- a/src/Common/test/Common.Hosting.Test/HostBuilderExtensionsTest.cs +++ b/src/Common/test/Common.Hosting.Test/HostBuilderExtensionsTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Common.Hosting.Test; diff --git a/src/Common/test/Common.Hosting.Test/Steeltoe.Common.Hosting.Test.csproj b/src/Common/test/Common.Hosting.Test/Steeltoe.Common.Hosting.Test.csproj index 8c1840d19d..1c266a6d37 100644 --- a/src/Common/test/Common.Hosting.Test/Steeltoe.Common.Hosting.Test.csproj +++ b/src/Common/test/Common.Hosting.Test/Steeltoe.Common.Hosting.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 diff --git a/src/Common/test/Common.Hosting.Test/TestServerStartup.cs b/src/Common/test/Common.Hosting.Test/TestServerStartup.cs index 8e8db88874..1a8da3df0f 100644 --- a/src/Common/test/Common.Hosting.Test/TestServerStartup.cs +++ b/src/Common/test/Common.Hosting.Test/TestServerStartup.cs @@ -5,7 +5,6 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server.Features; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Common.Hosting.Test; diff --git a/src/Common/test/Common.Http.Test/ConfigurationExtensionsTest.cs b/src/Common/test/Common.Http.Test/ConfigurationExtensionsTest.cs index 25f4e30659..d8aca38b97 100644 --- a/src/Common/test/Common.Http.Test/ConfigurationExtensionsTest.cs +++ b/src/Common/test/Common.Http.Test/ConfigurationExtensionsTest.cs @@ -3,13 +3,11 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Common.Http.Test; diff --git a/src/Common/test/Common.Http.Test/HttpClientHelperTest.cs b/src/Common/test/Common.Http.Test/HttpClientHelperTest.cs index 90dae3c6cd..0062ba0b22 100644 --- a/src/Common/test/Common.Http.Test/HttpClientHelperTest.cs +++ b/src/Common/test/Common.Http.Test/HttpClientHelperTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Text; -using Xunit; namespace Steeltoe.Common.Http.Test; diff --git a/src/Common/test/Common.Http.Test/Steeltoe.Common.Http.Test.csproj b/src/Common/test/Common.Http.Test/Steeltoe.Common.Http.Test.csproj index b244aa36fb..3e10376bea 100644 --- a/src/Common/test/Common.Http.Test/Steeltoe.Common.Http.Test.csproj +++ b/src/Common/test/Common.Http.Test/Steeltoe.Common.Http.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 diff --git a/src/Common/test/Common.Net.Test/Steeltoe.Common.Net.Test.csproj b/src/Common/test/Common.Net.Test/Steeltoe.Common.Net.Test.csproj index b12b124c5c..6e112223b8 100644 --- a/src/Common/test/Common.Net.Test/Steeltoe.Common.Net.Test.csproj +++ b/src/Common/test/Common.Net.Test/Steeltoe.Common.Net.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 diff --git a/src/Common/test/Common.Net.Test/WindowsNetworkFileShareTest.cs b/src/Common/test/Common.Net.Test/WindowsNetworkFileShareTest.cs index 07e148f8a3..cf2e16a1c1 100644 --- a/src/Common/test/Common.Net.Test/WindowsNetworkFileShareTest.cs +++ b/src/Common/test/Common.Net.Test/WindowsNetworkFileShareTest.cs @@ -4,7 +4,6 @@ using System.Net; using System.Runtime.InteropServices; -using Xunit; namespace Steeltoe.Common.Net.Test; diff --git a/src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs b/src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs index f3735b177f..064a70ba5b 100644 --- a/src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs +++ b/src/Common/test/Common.Test/ApplicationInstanceInfoTest.cs @@ -5,7 +5,6 @@ using System.Reflection; using Microsoft.Extensions.Configuration; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Test; diff --git a/src/Common/test/Common.Test/Availability/ApplicationAvailabilityTest.cs b/src/Common/test/Common.Test/Availability/ApplicationAvailabilityTest.cs index f5e3efa0db..34a5f50ebd 100644 --- a/src/Common/test/Common.Test/Availability/ApplicationAvailabilityTest.cs +++ b/src/Common/test/Common.Test/Availability/ApplicationAvailabilityTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.Availability; -using Xunit; namespace Steeltoe.Common.Test.Availability; diff --git a/src/Common/test/Common.Test/Availability/LivenessHealthContributorTest.cs b/src/Common/test/Common.Test/Availability/LivenessHealthContributorTest.cs index 6a873cada7..df754a9ac5 100644 --- a/src/Common/test/Common.Test/Availability/LivenessHealthContributorTest.cs +++ b/src/Common/test/Common.Test/Availability/LivenessHealthContributorTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Common.Availability; using Steeltoe.Common.HealthChecks; -using Xunit; namespace Steeltoe.Common.Test.Availability; diff --git a/src/Common/test/Common.Test/Availability/ReadinessHealthContributorTest.cs b/src/Common/test/Common.Test/Availability/ReadinessHealthContributorTest.cs index 5188750f98..8e9010325d 100644 --- a/src/Common/test/Common.Test/Availability/ReadinessHealthContributorTest.cs +++ b/src/Common/test/Common.Test/Availability/ReadinessHealthContributorTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Common.Availability; using Steeltoe.Common.HealthChecks; -using Xunit; namespace Steeltoe.Common.Test.Availability; diff --git a/src/Common/test/Common.Test/Configuration/ConfigurationKeyConverterTest.cs b/src/Common/test/Common.Test/Configuration/ConfigurationKeyConverterTest.cs index 645c2ff43d..69abb3c846 100644 --- a/src/Common/test/Common.Test/Configuration/ConfigurationKeyConverterTest.cs +++ b/src/Common/test/Common.Test/Configuration/ConfigurationKeyConverterTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Common.Configuration; -using Xunit; namespace Steeltoe.Common.Test.Configuration; diff --git a/src/Common/test/Common.Test/Configuration/ConfigurationValuesHelperTest.cs b/src/Common/test/Common.Test/Configuration/ConfigurationValuesHelperTest.cs index fb8383cbd9..2dffeffff3 100644 --- a/src/Common/test/Common.Test/Configuration/ConfigurationValuesHelperTest.cs +++ b/src/Common/test/Common.Test/Configuration/ConfigurationValuesHelperTest.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common.Configuration; -using Xunit; namespace Steeltoe.Common.Test.Configuration; diff --git a/src/Common/test/Common.Test/Configuration/PropertyPlaceholderHelperTest.cs b/src/Common/test/Common.Test/Configuration/PropertyPlaceholderHelperTest.cs index 56d880ae7f..cc6754dd37 100644 --- a/src/Common/test/Common.Test/Configuration/PropertyPlaceholderHelperTest.cs +++ b/src/Common/test/Common.Test/Configuration/PropertyPlaceholderHelperTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common.Configuration; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Test.Configuration; diff --git a/src/Common/test/Common.Test/Extensions/UriExtensionsTest.cs b/src/Common/test/Common.Test/Extensions/UriExtensionsTest.cs index 56d9febed5..9ef73b0cf5 100644 --- a/src/Common/test/Common.Test/Extensions/UriExtensionsTest.cs +++ b/src/Common/test/Common.Test/Extensions/UriExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Common.Extensions; -using Xunit; namespace Steeltoe.Common.Test.Extensions; diff --git a/src/Common/test/Common.Test/Net/InetUtilsTest.cs b/src/Common/test/Common.Test/Net/InetUtilsTest.cs index 7bdf695740..48850e1f2a 100644 --- a/src/Common/test/Common.Test/Net/InetUtilsTest.cs +++ b/src/Common/test/Common.Test/Net/InetUtilsTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.Net; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Common.Test.Net; diff --git a/src/Common/test/Common.Test/Options/AbstractOptionsTest.cs b/src/Common/test/Common.Test/Options/AbstractOptionsTest.cs index a05e37199a..e948c3dbc4 100644 --- a/src/Common/test/Common.Test/Options/AbstractOptionsTest.cs +++ b/src/Common/test/Common.Test/Options/AbstractOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Common.Test.Options; diff --git a/src/Common/test/Common.Test/PlatformTest.cs b/src/Common/test/Common.Test/PlatformTest.cs index dd562203f5..00bff45a07 100644 --- a/src/Common/test/Common.Test/PlatformTest.cs +++ b/src/Common/test/Common.Test/PlatformTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Common.Test; diff --git a/src/Common/test/Common.Test/SecurityUtilitiesTest.cs b/src/Common/test/Common.Test/SecurityUtilitiesTest.cs index 185537b876..e99ba75d2f 100644 --- a/src/Common/test/Common.Test/SecurityUtilitiesTest.cs +++ b/src/Common/test/Common.Test/SecurityUtilitiesTest.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Xunit; - namespace Steeltoe.Common.Test; public sealed class SecurityUtilitiesTest diff --git a/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj b/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj index 3df9b8abe2..9d7a30c741 100644 --- a/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj +++ b/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 diff --git a/src/Common/test/Common.TestResources/CancellationTokenSourceExtensions.cs b/src/Common/test/Common.TestResources/CancellationTokenSourceExtensions.cs deleted file mode 100644 index 719099e910..0000000000 --- a/src/Common/test/Common.TestResources/CancellationTokenSourceExtensions.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -#if NET6_0 -// ReSharper disable once CheckNamespace -namespace System.Threading; - -public static class CancellationTokenSourceExtensions -{ - // Workaround for Sonar S6966 bug: CancelAsync is suggested, which isn't available in .NET 6. - public static Task CancelAsync(this CancellationTokenSource source) - { - ArgumentNullException.ThrowIfNull(source); - - source.Cancel(); - return Task.CompletedTask; - } -} -#endif diff --git a/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj b/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj index 500eb32fc6..6bfbe631de 100644 --- a/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj +++ b/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 false diff --git a/src/Common/test/Common.Utils.Test/IO/SandboxTest.cs b/src/Common/test/Common.Utils.Test/IO/SandboxTest.cs index 56228079de..d9fe3d5d3d 100644 --- a/src/Common/test/Common.Utils.Test/IO/SandboxTest.cs +++ b/src/Common/test/Common.Utils.Test/IO/SandboxTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Utils.Test.IO; diff --git a/src/Common/test/Common.Utils.Test/IO/TempDirectoryTest.cs b/src/Common/test/Common.Utils.Test/IO/TempDirectoryTest.cs index cbd9c272f0..4a87735ea5 100644 --- a/src/Common/test/Common.Utils.Test/IO/TempDirectoryTest.cs +++ b/src/Common/test/Common.Utils.Test/IO/TempDirectoryTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Utils.Test.IO; diff --git a/src/Common/test/Common.Utils.Test/IO/TempFileTest.cs b/src/Common/test/Common.Utils.Test/IO/TempFileTest.cs index a90827dd3c..749042973a 100644 --- a/src/Common/test/Common.Utils.Test/IO/TempFileTest.cs +++ b/src/Common/test/Common.Utils.Test/IO/TempFileTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Common.Utils.Test.IO; diff --git a/src/Common/test/Common.Utils.Test/Steeltoe.Common.Utils.Test.csproj b/src/Common/test/Common.Utils.Test/Steeltoe.Common.Utils.Test.csproj index 38696eedce..9f8bd544c0 100644 --- a/src/Common/test/Common.Utils.Test/Steeltoe.Common.Utils.Test.csproj +++ b/src/Common/test/Common.Utils.Test/Steeltoe.Common.Utils.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 diff --git a/src/Configuration/src/Abstractions/ConfigurationExtensions.cs b/src/Configuration/src/Abstractions/ConfigurationExtensions.cs index 5c21315ca5..992bba1d6d 100644 --- a/src/Configuration/src/Abstractions/ConfigurationExtensions.cs +++ b/src/Configuration/src/Abstractions/ConfigurationExtensions.cs @@ -4,9 +4,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common; -#if NET6_0 -using System.Reflection; -#endif namespace Steeltoe.Configuration; @@ -57,7 +54,7 @@ internal static class ConfigurationExtensions if (provider is ChainedConfigurationProvider chained) { - var nextProvider = FindConfigurationProvider(chained); + var nextProvider = FindConfigurationProvider(chained.Configuration); if (nextProvider != null) { @@ -68,26 +65,4 @@ internal static class ConfigurationExtensions return null; } - - private static TProvider? FindConfigurationProvider(ChainedConfigurationProvider provider) - where TProvider : class, IConfigurationProvider - { -#if NET6_0 - FieldInfo? field = typeof(ChainedConfigurationProvider).GetField("_config", BindingFlags.Instance | BindingFlags.NonPublic); - - if (field != null) - { - var configuration = (IConfiguration?)field.GetValue(provider); - - if (configuration != null) - { - return FindConfigurationProvider(configuration); - } - } - - return null; -#else - return FindConfigurationProvider(provider.Configuration); -#endif - } } diff --git a/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj b/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj index 05deec8504..a6b709cc5d 100644 --- a/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj +++ b/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe.Configuration Abstractions used in Steeltoe Configuration libraries abstractions;configuration diff --git a/src/Configuration/src/CloudFoundry.ServiceBinding/Steeltoe.Configuration.CloudFoundry.ServiceBinding.csproj b/src/Configuration/src/CloudFoundry.ServiceBinding/Steeltoe.Configuration.CloudFoundry.ServiceBinding.csproj index 1ce172b14f..6cbd372b69 100644 --- a/src/Configuration/src/CloudFoundry.ServiceBinding/Steeltoe.Configuration.CloudFoundry.ServiceBinding.csproj +++ b/src/Configuration/src/CloudFoundry.ServiceBinding/Steeltoe.Configuration.CloudFoundry.ServiceBinding.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration Provider for reading CloudFoundry Service Bindings Configuration;CloudFoundry;Services;Bindings true diff --git a/src/Configuration/src/CloudFoundry/CloudFoundryHostBuilderExtensions.cs b/src/Configuration/src/CloudFoundry/CloudFoundryHostBuilderExtensions.cs index f5537deb99..f5d8c9d26a 100644 --- a/src/Configuration/src/CloudFoundry/CloudFoundryHostBuilderExtensions.cs +++ b/src/Configuration/src/CloudFoundry/CloudFoundryHostBuilderExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -19,8 +18,11 @@ public static class CloudFoundryHostBuilderExtensions /// Adds the Cloud Foundry configuration provider. /// /// - /// The host builder. + /// The to configure. /// + /// + /// The so that additional calls can be chained. + /// public static IWebHostBuilder AddCloudFoundryConfiguration(this IWebHostBuilder builder) { return AddCloudFoundryConfiguration(builder, BootstrapLoggerFactory.Default); @@ -30,12 +32,15 @@ public static IWebHostBuilder AddCloudFoundryConfiguration(this IWebHostBuilder /// Adds the Cloud Foundry configuration provider. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// + /// + /// The so that additional calls can be chained. + /// public static IWebHostBuilder AddCloudFoundryConfiguration(this IWebHostBuilder builder, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); @@ -50,8 +55,11 @@ public static IWebHostBuilder AddCloudFoundryConfiguration(this IWebHostBuilder /// Adds the Cloud Foundry configuration provider. /// /// - /// The host builder. + /// The to configure. /// + /// + /// The so that additional calls can be chained. + /// public static IHostBuilder AddCloudFoundryConfiguration(this IHostBuilder builder) { return AddCloudFoundryConfiguration(builder, BootstrapLoggerFactory.Default); @@ -61,12 +69,15 @@ public static IHostBuilder AddCloudFoundryConfiguration(this IHostBuilder builde /// Adds the Cloud Foundry configuration provider. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// + /// + /// The so that additional calls can be chained. + /// public static IHostBuilder AddCloudFoundryConfiguration(this IHostBuilder builder, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); @@ -81,9 +92,12 @@ public static IHostBuilder AddCloudFoundryConfiguration(this IHostBuilder builde /// Adds the Cloud Foundry configuration provider. /// /// - /// The application builder. + /// The to configure. /// - public static WebApplicationBuilder AddCloudFoundryConfiguration(this WebApplicationBuilder builder) + /// + /// The so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddCloudFoundryConfiguration(this IHostApplicationBuilder builder) { return AddCloudFoundryConfiguration(builder, BootstrapLoggerFactory.Default); } @@ -92,13 +106,16 @@ public static WebApplicationBuilder AddCloudFoundryConfiguration(this WebApplica /// Adds the Cloud Foundry configuration provider. /// /// - /// The application builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// - public static WebApplicationBuilder AddCloudFoundryConfiguration(this WebApplicationBuilder builder, ILoggerFactory loggerFactory) + /// + /// The so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddCloudFoundryConfiguration(this IHostApplicationBuilder builder, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); diff --git a/src/Configuration/src/CloudFoundry/PublicAPI.Unshipped.txt b/src/Configuration/src/CloudFoundry/PublicAPI.Unshipped.txt index faa8ad1fea..d15d3eba85 100644 --- a/src/Configuration/src/CloudFoundry/PublicAPI.Unshipped.txt +++ b/src/Configuration/src/CloudFoundry/PublicAPI.Unshipped.txt @@ -11,10 +11,10 @@ override Steeltoe.Configuration.CloudFoundry.CloudFoundryServicesOptions.Configu static Steeltoe.Configuration.CloudFoundry.CloudFoundryConfigurationBuilderExtensions.AddCloudFoundry(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryConfigurationBuilderExtensions.AddCloudFoundry(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder, Steeltoe.Configuration.CloudFoundry.ICloudFoundrySettingsReader? settingsReader) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryConfigurationBuilderExtensions.AddCloudFoundry(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder, Steeltoe.Configuration.CloudFoundry.ICloudFoundrySettingsReader? settingsReader, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! -static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryHostBuilderExtensions.AddCloudFoundryConfiguration(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.CloudFoundry.CloudFoundryServiceCollectionExtensions.ConfigureCloudFoundryOptions(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! diff --git a/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj b/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj index cc142cff2b..d7550b021a 100644 --- a/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj +++ b/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration Provider for reading Cloud Foundry Environment Variables configuration;CloudFoundry;vcap true diff --git a/src/Configuration/src/ConfigServer/ConfigServerHostBuilderExtensions.cs b/src/Configuration/src/ConfigServer/ConfigServerHostBuilderExtensions.cs index 72d215a7b3..8dd37512eb 100644 --- a/src/Configuration/src/ConfigServer/ConfigServerHostBuilderExtensions.cs +++ b/src/Configuration/src/ConfigServer/ConfigServerHostBuilderExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; @@ -19,10 +18,10 @@ public static class ConfigServerHostBuilderExtensions /// Adds Config Server and Cloud Foundry as application configuration sources. Adds Config Server health check contributor to the service container. /// /// - /// The host builder. + /// The to configure. /// /// - /// with Config Server and Cloud Foundry Config Provider attached. + /// The so that additional calls can be chained. /// public static IWebHostBuilder AddConfigServer(this IWebHostBuilder builder) { @@ -33,14 +32,14 @@ public static IWebHostBuilder AddConfigServer(this IWebHostBuilder builder) /// Adds Config Server and Cloud Foundry as application configuration sources. Adds Config Server health check contributor to the service container. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// with Config Server and Cloud Foundry Config Provider attached. + /// The so that additional calls can be chained. /// public static IWebHostBuilder AddConfigServer(this IWebHostBuilder builder, ILoggerFactory loggerFactory) { @@ -57,10 +56,10 @@ public static IWebHostBuilder AddConfigServer(this IWebHostBuilder builder, ILog /// Adds Config Server and Cloud Foundry as application configuration sources. Adds Config Server health check contributor to the service container. /// /// - /// The host builder. + /// The to configure. /// /// - /// with config server and Cloud Foundry Config Provider attached. + /// The so that additional calls can be chained. /// public static IHostBuilder AddConfigServer(this IHostBuilder builder) { @@ -71,14 +70,14 @@ public static IHostBuilder AddConfigServer(this IHostBuilder builder) /// Adds Config Server and Cloud Foundry as application configuration sources. Adds Config Server health check contributor to the service container. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// with config server and Cloud Foundry Config Provider attached. + /// The so that additional calls can be chained. /// public static IHostBuilder AddConfigServer(this IHostBuilder builder, ILoggerFactory loggerFactory) { @@ -96,9 +95,12 @@ public static IHostBuilder AddConfigServer(this IHostBuilder builder, ILoggerFac /// the service container. /// /// - /// The application builder. + /// The to configure. /// - public static WebApplicationBuilder AddConfigServer(this WebApplicationBuilder builder) + /// + /// The so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddConfigServer(this IHostApplicationBuilder builder) { return AddConfigServer(builder, BootstrapLoggerFactory.Default); } @@ -108,13 +110,16 @@ public static WebApplicationBuilder AddConfigServer(this WebApplicationBuilder b /// the service container. /// /// - /// The application builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// - public static WebApplicationBuilder AddConfigServer(this WebApplicationBuilder builder, ILoggerFactory loggerFactory) + /// + /// The so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddConfigServer(this IHostApplicationBuilder builder, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); ArgumentGuard.NotNull(loggerFactory); diff --git a/src/Configuration/src/ConfigServer/PublicAPI.Unshipped.txt b/src/Configuration/src/ConfigServer/PublicAPI.Unshipped.txt index a7dcf53720..6d212cd225 100644 --- a/src/Configuration/src/ConfigServer/PublicAPI.Unshipped.txt +++ b/src/Configuration/src/ConfigServer/PublicAPI.Unshipped.txt @@ -9,10 +9,10 @@ static Steeltoe.Configuration.ConfigServer.ConfigServerConfigurationBuilderExten static Steeltoe.Configuration.ConfigServer.ConfigServerConfigurationBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder, string? environment, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerConfigurationBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder, string? environment, string? applicationName) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerConfigurationBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Configuration.IConfigurationBuilder! configurationBuilder, string? environment, string? applicationName, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! -static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerHostBuilderExtensions.AddConfigServer(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.ConfigServer.ConfigServerServiceCollectionExtensions.AddConfigServerHealthContributor(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! diff --git a/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj b/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj index fe85cb4c0a..9196b630ef 100644 --- a/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj +++ b/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration provider for reading from Spring Cloud Config Server configuration;Spring Cloud;Spring Cloud Config Server true diff --git a/src/Configuration/src/Encryption/EncryptionHostBuilderExtensions.cs b/src/Configuration/src/Encryption/EncryptionHostBuilderExtensions.cs index c9bab30a54..f019453921 100644 --- a/src/Configuration/src/Encryption/EncryptionHostBuilderExtensions.cs +++ b/src/Configuration/src/Encryption/EncryptionHostBuilderExtensions.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; @@ -23,10 +22,10 @@ public static class EncryptionHostBuilderExtensions /// all of the applications' configuration sources with encryption resolution. /// /// - /// The host builder. + /// The to configure. /// /// - /// The provided host builder. + /// The so that additional calls can be chained. /// public static IWebHostBuilder AddEncryptionResolver(this IWebHostBuilder builder) { @@ -40,14 +39,14 @@ public static IWebHostBuilder AddEncryptionResolver(this IWebHostBuilder builder /// all of the applications' configuration sources with encryption resolution. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// The provided host builder. + /// The so that additional calls can be chained. /// public static IWebHostBuilder AddEncryptionResolver(this IWebHostBuilder builder, ILoggerFactory loggerFactory) { @@ -67,10 +66,10 @@ public static IWebHostBuilder AddEncryptionResolver(this IWebHostBuilder builder /// all of the applications configuration sources with encryption resolution. /// /// - /// The host builder. + /// The to configure. /// /// - /// The provided host builder. + /// The so that additional calls can be chained. /// public static IHostBuilder AddEncryptionResolver(this IHostBuilder builder) { @@ -84,14 +83,14 @@ public static IHostBuilder AddEncryptionResolver(this IHostBuilder builder) /// all of the applications configuration sources with encryption resolution. /// /// - /// The host builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// The provided host builder. + /// The so that additional calls can be chained. /// public static IHostBuilder AddEncryptionResolver(this IHostBuilder builder, ILoggerFactory loggerFactory) { @@ -111,12 +110,12 @@ public static IHostBuilder AddEncryptionResolver(this IHostBuilder builder, ILog /// all of the applications configuration sources with encryption resolution. /// /// - /// The application builder. + /// The to configure. /// /// - /// The provided application builder. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddEncryptionResolver(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddEncryptionResolver(this IHostApplicationBuilder builder) { return AddEncryptionResolver(builder, BootstrapLoggerFactory.Default); } @@ -128,16 +127,16 @@ public static WebApplicationBuilder AddEncryptionResolver(this WebApplicationBui /// all of the applications configuration sources with encryption resolution. /// /// - /// The application builder. + /// The to configure. /// /// /// Used for internal logging. Pass to disable logging, or to /// write only to the console until logging is fully initialized. /// /// - /// The provided application builder. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddEncryptionResolver(this WebApplicationBuilder builder, ILoggerFactory loggerFactory) + public static IHostApplicationBuilder AddEncryptionResolver(this IHostApplicationBuilder builder, ILoggerFactory loggerFactory) { ArgumentGuard.NotNull(builder); ArgumentGuard.NotNull(loggerFactory); diff --git a/src/Configuration/src/Encryption/PublicAPI.Unshipped.txt b/src/Configuration/src/Encryption/PublicAPI.Unshipped.txt index 2e1d593b09..78a7c8a1e5 100644 --- a/src/Configuration/src/Encryption/PublicAPI.Unshipped.txt +++ b/src/Configuration/src/Encryption/PublicAPI.Unshipped.txt @@ -5,10 +5,10 @@ static Steeltoe.Configuration.Encryption.EncryptionConfigurationExtensions.AddEn static Steeltoe.Configuration.Encryption.EncryptionConfigurationExtensions.AddEncryptionResolver(this Microsoft.Extensions.Configuration.IConfiguration! configuration, Steeltoe.Configuration.Encryption.ITextDecryptor! textDecryptor, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfiguration! static Steeltoe.Configuration.Encryption.EncryptionConfigurationExtensions.AddEncryptionResolver(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, Steeltoe.Configuration.Encryption.ITextDecryptor! textDecryptor) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Configuration.Encryption.EncryptionConfigurationExtensions.AddEncryptionResolver(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, Steeltoe.Configuration.Encryption.ITextDecryptor! textDecryptor, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! -static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.Encryption.EncryptionHostBuilderExtensions.AddEncryptionResolver(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Configuration.Encryption.EncryptionServiceCollectionExtensions.ConfigureConfigServerEncryptionResolver(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.Configuration.IConfiguration! diff --git a/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj b/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj index 85bfcebd81..d006c20a7c 100644 --- a/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj +++ b/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration provider for resolving property encryptions in configuration values configuration;encryptions;spring boot true diff --git a/src/Configuration/src/Kubernetes.ServiceBinding/Steeltoe.Configuration.Kubernetes.ServiceBinding.csproj b/src/Configuration/src/Kubernetes.ServiceBinding/Steeltoe.Configuration.Kubernetes.ServiceBinding.csproj index 6146254d60..618b0fa2a8 100644 --- a/src/Configuration/src/Kubernetes.ServiceBinding/Steeltoe.Configuration.Kubernetes.ServiceBinding.csproj +++ b/src/Configuration/src/Kubernetes.ServiceBinding/Steeltoe.Configuration.Kubernetes.ServiceBinding.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration Provider for reading Kubernetes Service Bindings Configuration;Kubernetes;Services;Bindings true diff --git a/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj b/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj index 7cab616209..f2fe254231 100644 --- a/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj +++ b/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration provider for resolving property placeholders in configuration values configuration;placeholders;spring boot true diff --git a/src/Configuration/src/RandomValue/RandomValueProvider.cs b/src/Configuration/src/RandomValue/RandomValueProvider.cs index bd7ca8ce17..c4f5340b07 100644 --- a/src/Configuration/src/RandomValue/RandomValueProvider.cs +++ b/src/Configuration/src/RandomValue/RandomValueProvider.cs @@ -171,21 +171,21 @@ private long GetLong() private int GetNextIntInRange(string range) { string[] tokens = range.Split(','); - int.TryParse(tokens[0], out int start); + int.TryParse(tokens[0], CultureInfo.InvariantCulture, out int start); if (tokens.Length == 1) { return Random.Shared.Next(start); } - int.TryParse(tokens[1], out int max); + int.TryParse(tokens[1], CultureInfo.InvariantCulture, out int max); return Random.Shared.Next(start, max); } private long GetNextLongInRange(string range) { string[] tokens = range.Split(','); - long.TryParse(tokens[0], out long start); + long.TryParse(tokens[0], CultureInfo.InvariantCulture, out long start); if (tokens.Length == 1) { @@ -193,7 +193,7 @@ private long GetNextLongInRange(string range) } long lowerBound = start; - long.TryParse(tokens[1], out long upperBound); + long.TryParse(tokens[1], CultureInfo.InvariantCulture, out long upperBound); upperBound -= lowerBound; return lowerBound + Math.Abs(GetLong() % upperBound); } diff --git a/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj b/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj index cc134e2b5a..9a9eb98803 100644 --- a/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj +++ b/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration provider for generating random values configuration;random values true diff --git a/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj b/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj index afb8d06912..9db75b8abf 100644 --- a/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj +++ b/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Configuration provider for reading Spring Boot style configuration configuration;springboot true diff --git a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/CloudFoundryServiceBindingConfigurationProviderTest.cs b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/CloudFoundryServiceBindingConfigurationProviderTest.cs index 8a8da79790..e8c3d91d32 100644 --- a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/CloudFoundryServiceBindingConfigurationProviderTest.cs +++ b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/CloudFoundryServiceBindingConfigurationProviderTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test; diff --git a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs index 683b7192ce..ec456d2d55 100644 --- a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test; diff --git a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/PostProcessorsTest.cs b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/PostProcessorsTest.cs index d4d3abfcd0..8bfe9ea8dc 100644 --- a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/PostProcessorsTest.cs +++ b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/PostProcessorsTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Configuration.CloudFoundry.ServiceBinding.PostProcessors; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test; diff --git a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test.csproj b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test.csproj index c88a33b2bd..38d24a8918 100644 --- a/src/Configuration/test/CloudFoundry.ServiceBinding.Test/Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test.csproj +++ b/src/Configuration/test/CloudFoundry.ServiceBinding.Test/Steeltoe.Configuration.CloudFoundry.ServiceBinding.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/CloudFoundry.Test/CloudFoundryApplicationOptionsTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudFoundryApplicationOptionsTest.cs index 1376a4bbc8..21e2f6e9ee 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudFoundryApplicationOptionsTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudFoundryApplicationOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/CloudFoundryConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudFoundryConfigurationBuilderExtensionsTest.cs index feae29c193..5ee5eee993 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudFoundryConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudFoundryConfigurationBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/CloudFoundryHostBuilderExtensionsTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudFoundryHostBuilderExtensionsTest.cs index 1807398cee..59de88c937 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudFoundryHostBuilderExtensionsTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudFoundryHostBuilderExtensionsTest.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Common; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceCollectionExtensionsTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceCollectionExtensionsTest.cs index 846098cac6..d11aa6a36a 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceCollectionExtensionsTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceCollectionExtensionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceOptionsTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceOptionsTest.cs index 6046311c76..2117a361db 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceOptionsTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudFoundryServiceOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs b/src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs index 45b51552e3..761e97170b 100644 --- a/src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/CloudfoundryConfigurationProviderTest.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationProviderTest.cs b/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationProviderTest.cs index 6c12e73ffd..002bef0d17 100644 --- a/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationProviderTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationProviderTest.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Xunit; - namespace Steeltoe.Configuration.CloudFoundry.Test; public sealed class JsonStreamConfigurationProviderTest diff --git a/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationSourceTest.cs b/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationSourceTest.cs index c8f5c31641..1c390c4337 100644 --- a/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationSourceTest.cs +++ b/src/Configuration/test/CloudFoundry.Test/JsonStreamConfigurationSourceTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.CloudFoundry.Test; diff --git a/src/Configuration/test/CloudFoundry.Test/Steeltoe.Configuration.CloudFoundry.Test.csproj b/src/Configuration/test/CloudFoundry.Test/Steeltoe.Configuration.CloudFoundry.Test.csproj index 3cfff4925e..8c7f78bdac 100644 --- a/src/Configuration/test/CloudFoundry.Test/Steeltoe.Configuration.CloudFoundry.Test.csproj +++ b/src/Configuration/test/CloudFoundry.Test/Steeltoe.Configuration.CloudFoundry.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerDiscoveryServiceTest.cs b/src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerDiscoveryServiceTest.cs index 92c15bcbf1..ead9ae429f 100644 --- a/src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerDiscoveryServiceTest.cs +++ b/src/Configuration/test/ConfigServer.Discovery.Test/ConfigServerDiscoveryServiceTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Collections.Immutable; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.Discovery; @@ -11,7 +10,6 @@ using Steeltoe.Discovery.Configuration; using Steeltoe.Discovery.Consul; using Steeltoe.Discovery.Eureka; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Discovery.Test; diff --git a/src/Configuration/test/ConfigServer.Discovery.Test/Steeltoe.Configuration.ConfigServer.Discovery.Test.csproj b/src/Configuration/test/ConfigServer.Discovery.Test/Steeltoe.Configuration.ConfigServer.Discovery.Test.csproj index a4014af916..5cd42122a6 100644 --- a/src/Configuration/test/ConfigServer.Discovery.Test/Steeltoe.Configuration.ConfigServer.Discovery.Test.csproj +++ b/src/Configuration/test/ConfigServer.Discovery.Test/Steeltoe.Configuration.ConfigServer.Discovery.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/ConfigServer.Integration.Test/ConfigServerConfigurationExtensionsIntegrationTest.cs b/src/Configuration/test/ConfigServer.Integration.Test/ConfigServerConfigurationExtensionsIntegrationTest.cs index 688756f5e3..8c295b92d6 100644 --- a/src/Configuration/test/ConfigServer.Integration.Test/ConfigServerConfigurationExtensionsIntegrationTest.cs +++ b/src/Configuration/test/ConfigServer.Integration.Test/ConfigServerConfigurationExtensionsIntegrationTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Common.TestResources; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Integration.Test; diff --git a/src/Configuration/test/ConfigServer.Integration.Test/NestedPlaceholderEncryptionIntegrationTest.cs b/src/Configuration/test/ConfigServer.Integration.Test/NestedPlaceholderEncryptionIntegrationTest.cs index f3dbf2cea3..d136260ebd 100644 --- a/src/Configuration/test/ConfigServer.Integration.Test/NestedPlaceholderEncryptionIntegrationTest.cs +++ b/src/Configuration/test/ConfigServer.Integration.Test/NestedPlaceholderEncryptionIntegrationTest.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Integration.Test; diff --git a/src/Configuration/test/ConfigServer.Integration.Test/Steeltoe.Configuration.ConfigServer.Integration.Test.csproj b/src/Configuration/test/ConfigServer.Integration.Test/Steeltoe.Configuration.ConfigServer.Integration.Test.csproj index bcbfdefdfe..0560bb38f5 100644 --- a/src/Configuration/test/ConfigServer.Integration.Test/Steeltoe.Configuration.ConfigServer.Integration.Test.csproj +++ b/src/Configuration/test/ConfigServer.Integration.Test/Steeltoe.Configuration.ConfigServer.Integration.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsOptionsTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsOptionsTest.cs index 2a1aee906b..2c9f743d99 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsOptionsTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsOptionsTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsTest.cs index 92e93bd68d..99f7a13bc3 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerClientSettingsTest.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Xunit; - namespace Steeltoe.Configuration.ConfigServer.Test; public sealed class ConfigServerClientSettingsTest diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs index f398304599..47651e7ad4 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging; using Steeltoe.Common.TestResources; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsTest.cs index 95174080b1..d50fb516a2 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationBuilderExtensionsTest.cs @@ -8,7 +8,6 @@ using Steeltoe.Common.Utils.IO; using Steeltoe.Configuration.CloudFoundry; using Steeltoe.Configuration.Placeholder; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs index 8b34632030..9c27a93d41 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs @@ -4,7 +4,6 @@ using System.Globalization; using System.Net.Http.Json; -using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; @@ -14,7 +13,6 @@ using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.Discovery; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationSourceTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationSourceTest.cs index 2e467aaa54..7950e0a16e 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationSourceTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationSourceTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration.Memory; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerDiscoveryServiceTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerDiscoveryServiceTest.cs index 131107c431..3000902ef9 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerDiscoveryServiceTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerDiscoveryServiceTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerHealthContributorTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerHealthContributorTest.cs index ffb680e3cf..c284d3e7fb 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerHealthContributorTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerHealthContributorTest.cs @@ -7,7 +7,6 @@ using Steeltoe.Common.HealthChecks; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.Placeholder; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerHostBuilderExtensionsTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerHostBuilderExtensionsTest.cs index 4c8836e257..3ef48c618b 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerHostBuilderExtensionsTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerHostBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -12,7 +11,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.CloudFoundry; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerHostedServiceTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerHostedServiceTest.cs index 35825150cc..4354ff0cda 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerHostedServiceTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerHostedServiceTest.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.Placeholder; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerServiceCollectionExtensionsTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerServiceCollectionExtensionsTest.cs index 089fadde80..e89aef8218 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerServiceCollectionExtensionsTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerServiceCollectionExtensionsTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.CloudFoundry; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigurationSettingsHelperTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigurationSettingsHelperTest.cs index e6f367e1be..d6fd0a34bc 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigurationSettingsHelperTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigurationSettingsHelperTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/ConfigServer.Test/Steeltoe.Configuration.ConfigServer.Test.csproj b/src/Configuration/test/ConfigServer.Test/Steeltoe.Configuration.ConfigServer.Test.csproj index 90086d9280..ddfbcc68be 100644 --- a/src/Configuration/test/ConfigServer.Test/Steeltoe.Configuration.ConfigServer.Test.csproj +++ b/src/Configuration/test/ConfigServer.Test/Steeltoe.Configuration.ConfigServer.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/ConfigServer.Test/TestHelper.cs b/src/Configuration/test/ConfigServer.Test/TestHelper.cs index 2c41fe831c..298d5d869e 100644 --- a/src/Configuration/test/ConfigServer.Test/TestHelper.cs +++ b/src/Configuration/test/ConfigServer.Test/TestHelper.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.ConfigServer.Test; diff --git a/src/Configuration/test/Encryption.Test/Decryption/AesTextDecryptorTests.cs b/src/Configuration/test/Encryption.Test/Decryption/AesTextDecryptorTests.cs index 2881f33ccc..d690a836bf 100644 --- a/src/Configuration/test/Encryption.Test/Decryption/AesTextDecryptorTests.cs +++ b/src/Configuration/test/Encryption.Test/Decryption/AesTextDecryptorTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Configuration.Encryption.Decryption; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test.Decryption; diff --git a/src/Configuration/test/Encryption.Test/Decryption/EncryptionFactoryTest.cs b/src/Configuration/test/Encryption.Test/Decryption/EncryptionFactoryTest.cs index 39ec8eec70..27458441ea 100644 --- a/src/Configuration/test/Encryption.Test/Decryption/EncryptionFactoryTest.cs +++ b/src/Configuration/test/Encryption.Test/Decryption/EncryptionFactoryTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Configuration.Encryption.Decryption; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test.Decryption; diff --git a/src/Configuration/test/Encryption.Test/Decryption/EncryptionServiceCollectionForConfigServerExtensionsTest.cs b/src/Configuration/test/Encryption.Test/Decryption/EncryptionServiceCollectionForConfigServerExtensionsTest.cs index 751536e1f1..3fe5297ac7 100644 --- a/src/Configuration/test/Encryption.Test/Decryption/EncryptionServiceCollectionForConfigServerExtensionsTest.cs +++ b/src/Configuration/test/Encryption.Test/Decryption/EncryptionServiceCollectionForConfigServerExtensionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test.Decryption; diff --git a/src/Configuration/test/Encryption.Test/Decryption/NoopDecryptorTest.cs b/src/Configuration/test/Encryption.Test/Decryption/NoopDecryptorTest.cs index 95de07e2b9..35c6d11680 100644 --- a/src/Configuration/test/Encryption.Test/Decryption/NoopDecryptorTest.cs +++ b/src/Configuration/test/Encryption.Test/Decryption/NoopDecryptorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Configuration.Encryption.Decryption; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test.Decryption; diff --git a/src/Configuration/test/Encryption.Test/Decryption/RsaKeyStoreDecryptorTest.cs b/src/Configuration/test/Encryption.Test/Decryption/RsaKeyStoreDecryptorTest.cs index 1bca801490..9498c0016f 100644 --- a/src/Configuration/test/Encryption.Test/Decryption/RsaKeyStoreDecryptorTest.cs +++ b/src/Configuration/test/Encryption.Test/Decryption/RsaKeyStoreDecryptorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Configuration.Encryption.Decryption; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test.Decryption; diff --git a/src/Configuration/test/Encryption.Test/EncryptionConfigurationExtensionsTest.cs b/src/Configuration/test/Encryption.Test/EncryptionConfigurationExtensionsTest.cs index 41e5cb8909..0e95b8146c 100644 --- a/src/Configuration/test/Encryption.Test/EncryptionConfigurationExtensionsTest.cs +++ b/src/Configuration/test/Encryption.Test/EncryptionConfigurationExtensionsTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Moq; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test; diff --git a/src/Configuration/test/Encryption.Test/EncryptionResolverProviderTest.cs b/src/Configuration/test/Encryption.Test/EncryptionResolverProviderTest.cs index f22e96e75e..215470a203 100644 --- a/src/Configuration/test/Encryption.Test/EncryptionResolverProviderTest.cs +++ b/src/Configuration/test/Encryption.Test/EncryptionResolverProviderTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Moq; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test; diff --git a/src/Configuration/test/Encryption.Test/EncryptionResolverSourceTest.cs b/src/Configuration/test/Encryption.Test/EncryptionResolverSourceTest.cs index c305a973cf..5f19453a03 100644 --- a/src/Configuration/test/Encryption.Test/EncryptionResolverSourceTest.cs +++ b/src/Configuration/test/Encryption.Test/EncryptionResolverSourceTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using Moq; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test; diff --git a/src/Configuration/test/Encryption.Test/EncryptionServiceCollectionExtensionsTest.cs b/src/Configuration/test/Encryption.Test/EncryptionServiceCollectionExtensionsTest.cs index 4f61c044b2..44a2b60cb3 100644 --- a/src/Configuration/test/Encryption.Test/EncryptionServiceCollectionExtensionsTest.cs +++ b/src/Configuration/test/Encryption.Test/EncryptionServiceCollectionExtensionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Configuration.Encryption.Test; diff --git a/src/Configuration/test/Encryption.Test/Steeltoe.Configuration.Encryption.Test.csproj b/src/Configuration/test/Encryption.Test/Steeltoe.Configuration.Encryption.Test.csproj index a4e102dda5..449131e46f 100644 --- a/src/Configuration/test/Encryption.Test/Steeltoe.Configuration.Encryption.Test.csproj +++ b/src/Configuration/test/Encryption.Test/Steeltoe.Configuration.Encryption.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs index 79f0f5b829..41a375081d 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ConfigurationBuilderExtensionsTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationProviderTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationProviderTest.cs index 0218e53941..8aa479f19b 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationProviderTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationProviderTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationSourceTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationSourceTest.cs index 5a52c5f1e1..c6a024f42b 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationSourceTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/KubernetesServiceBindingConfigurationSourceTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.FileProviders; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/PostProcessorsTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/PostProcessorsTest.cs index 4ceac17c95..9e1809551e 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/PostProcessorsTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/PostProcessorsTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Steeltoe.Configuration.Kubernetes.ServiceBinding.PostProcessors; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingMapperTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingMapperTest.cs index 750114c937..718ef1468e 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingMapperTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingMapperTest.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; -using Xunit; - namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; public sealed class ServiceBindingMapperTest diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingTest.cs index 191729da04..f97855ed34 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.FileProviders; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingsTest.cs b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingsTest.cs index 64b041b187..6406544590 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingsTest.cs +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/ServiceBindingsTest.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.FileProviders; -using Xunit; namespace Steeltoe.Configuration.Kubernetes.ServiceBinding.Test; diff --git a/src/Configuration/test/Kubernetes.ServiceBinding.Test/Steeltoe.Configuration.Kubernetes.ServiceBinding.Test.csproj b/src/Configuration/test/Kubernetes.ServiceBinding.Test/Steeltoe.Configuration.Kubernetes.ServiceBinding.Test.csproj index d96ad1dcd0..cff24d8f07 100644 --- a/src/Configuration/test/Kubernetes.ServiceBinding.Test/Steeltoe.Configuration.Kubernetes.ServiceBinding.Test.csproj +++ b/src/Configuration/test/Kubernetes.ServiceBinding.Test/Steeltoe.Configuration.Kubernetes.ServiceBinding.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/Placeholder.Test/PlaceholderConfigurationExtensionsTest.cs b/src/Configuration/test/Placeholder.Test/PlaceholderConfigurationExtensionsTest.cs index 5424866f02..90a74d6b4e 100644 --- a/src/Configuration/test/Placeholder.Test/PlaceholderConfigurationExtensionsTest.cs +++ b/src/Configuration/test/Placeholder.Test/PlaceholderConfigurationExtensionsTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.Placeholder.Test; diff --git a/src/Configuration/test/Placeholder.Test/PlaceholderResolverExtensionsTest.cs b/src/Configuration/test/Placeholder.Test/PlaceholderResolverExtensionsTest.cs index 9b225146c4..1645d000fa 100644 --- a/src/Configuration/test/Placeholder.Test/PlaceholderResolverExtensionsTest.cs +++ b/src/Configuration/test/Placeholder.Test/PlaceholderResolverExtensionsTest.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.Placeholder.Test; diff --git a/src/Configuration/test/Placeholder.Test/PlaceholderResolverProviderTest.cs b/src/Configuration/test/Placeholder.Test/PlaceholderResolverProviderTest.cs index 9cca4bae48..e7d609a7e0 100644 --- a/src/Configuration/test/Placeholder.Test/PlaceholderResolverProviderTest.cs +++ b/src/Configuration/test/Placeholder.Test/PlaceholderResolverProviderTest.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Primitives; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Configuration.Placeholder.Test; diff --git a/src/Configuration/test/Placeholder.Test/PlaceholderResolverSourceTest.cs b/src/Configuration/test/Placeholder.Test/PlaceholderResolverSourceTest.cs index 736da326a6..fea3bb6e61 100644 --- a/src/Configuration/test/Placeholder.Test/PlaceholderResolverSourceTest.cs +++ b/src/Configuration/test/Placeholder.Test/PlaceholderResolverSourceTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration.Memory; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Steeltoe.Configuration.Placeholder.Test; diff --git a/src/Configuration/test/Placeholder.Test/Steeltoe.Configuration.Placeholder.Test.csproj b/src/Configuration/test/Placeholder.Test/Steeltoe.Configuration.Placeholder.Test.csproj index 80ef46aa8c..6b11922462 100644 --- a/src/Configuration/test/Placeholder.Test/Steeltoe.Configuration.Placeholder.Test.csproj +++ b/src/Configuration/test/Placeholder.Test/Steeltoe.Configuration.Placeholder.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/RandomValue.Test/RandomValueConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/RandomValue.Test/RandomValueConfigurationBuilderExtensionsTest.cs index 7f6279ace3..ca6ff68dc5 100644 --- a/src/Configuration/test/RandomValue.Test/RandomValueConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/RandomValue.Test/RandomValueConfigurationBuilderExtensionsTest.cs @@ -4,7 +4,6 @@ using System.Globalization; using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.RandomValue.Test; diff --git a/src/Configuration/test/RandomValue.Test/RandomValueProviderTest.cs b/src/Configuration/test/RandomValue.Test/RandomValueProviderTest.cs index 539e41e208..62de6c0904 100644 --- a/src/Configuration/test/RandomValue.Test/RandomValueProviderTest.cs +++ b/src/Configuration/test/RandomValue.Test/RandomValueProviderTest.cs @@ -4,7 +4,6 @@ using System.Globalization; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Steeltoe.Configuration.RandomValue.Test; diff --git a/src/Configuration/test/RandomValue.Test/RandomValueSourceTest.cs b/src/Configuration/test/RandomValue.Test/RandomValueSourceTest.cs index 60e1ef3918..708d8dede7 100644 --- a/src/Configuration/test/RandomValue.Test/RandomValueSourceTest.cs +++ b/src/Configuration/test/RandomValue.Test/RandomValueSourceTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; -using Xunit; namespace Steeltoe.Configuration.RandomValue.Test; diff --git a/src/Configuration/test/RandomValue.Test/Steeltoe.Configuration.RandomValue.Test.csproj b/src/Configuration/test/RandomValue.Test/Steeltoe.Configuration.RandomValue.Test.csproj index 0760792eb7..aeb3c94197 100644 --- a/src/Configuration/test/RandomValue.Test/Steeltoe.Configuration.RandomValue.Test.csproj +++ b/src/Configuration/test/RandomValue.Test/Steeltoe.Configuration.RandomValue.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Configuration/test/SpringBoot.Test/HostedSpringBootConfigurationTests.cs b/src/Configuration/test/SpringBoot.Test/HostedSpringBootConfigurationTests.cs index 60041bc73a..9f4ebc035d 100644 --- a/src/Configuration/test/SpringBoot.Test/HostedSpringBootConfigurationTests.cs +++ b/src/Configuration/test/SpringBoot.Test/HostedSpringBootConfigurationTests.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.Placeholder; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineProviderTest.cs b/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineProviderTest.cs index 1067dbe203..7025501774 100644 --- a/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineProviderTest.cs +++ b/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineProviderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineSourceTest.cs b/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineSourceTest.cs index d25d99b5a0..79c821e928 100644 --- a/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineSourceTest.cs +++ b/src/Configuration/test/SpringBoot.Test/SpringBootCommandLineSourceTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/SpringBootConfigurationBuilderExtensionsTest.cs b/src/Configuration/test/SpringBoot.Test/SpringBootConfigurationBuilderExtensionsTest.cs index d191a689a1..e5fc7e2b3a 100644 --- a/src/Configuration/test/SpringBoot.Test/SpringBootConfigurationBuilderExtensionsTest.cs +++ b/src/Configuration/test/SpringBoot.Test/SpringBootConfigurationBuilderExtensionsTest.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableProviderTest.cs b/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableProviderTest.cs index d982db0c2e..5583e20f96 100644 --- a/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableProviderTest.cs +++ b/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableProviderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Text.Json; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableSourceTest.cs b/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableSourceTest.cs index 575d38c68d..33ba695c0c 100644 --- a/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableSourceTest.cs +++ b/src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableSourceTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.Configuration; -using Xunit; namespace Steeltoe.Configuration.SpringBoot.Test; diff --git a/src/Configuration/test/SpringBoot.Test/Steeltoe.Configuration.SpringBoot.Test.csproj b/src/Configuration/test/SpringBoot.Test/Steeltoe.Configuration.SpringBoot.Test.csproj index f530c1d9c4..7e9609335d 100644 --- a/src/Configuration/test/SpringBoot.Test/Steeltoe.Configuration.SpringBoot.Test.csproj +++ b/src/Configuration/test/SpringBoot.Test/Steeltoe.Configuration.SpringBoot.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Connectors/src/Connectors/CosmosDb/CosmosDbWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/CosmosDb/CosmosDbHostApplicationBuilderExtensions.cs similarity index 69% rename from src/Connectors/src/Connectors/CosmosDb/CosmosDbWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/CosmosDb/CosmosDbHostApplicationBuilderExtensions.cs index 706dcd923b..afa38d377b 100644 --- a/src/Connectors/src/Connectors/CosmosDb/CosmosDbWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/CosmosDb/CosmosDbHostApplicationBuilderExtensions.cs @@ -2,24 +2,24 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; namespace Steeltoe.Connectors.CosmosDb; -public static class CosmosDbWebApplicationBuilderExtensions +public static class CosmosDbHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and /// Microsoft.Azure.Cosmos.CosmosClient) to connect to a CosmosDB database. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddCosmosDb(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddCosmosDb(this IHostApplicationBuilder builder) { return AddCosmosDb(builder, null, null); } @@ -29,7 +29,7 @@ public static WebApplicationBuilder AddCosmosDb(this WebApplicationBuilder build /// Microsoft.Azure.Cosmos.CosmosClient) to connect to a CosmosDB database. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -38,9 +38,9 @@ public static WebApplicationBuilder AddCosmosDb(this WebApplicationBuilder build /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddCosmosDb(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddCosmosDb(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/MongoDb/MongoDbConnectionStringBuilder.cs b/src/Connectors/src/Connectors/MongoDb/MongoDbConnectionStringBuilder.cs index 9cf767dc40..df6149cac3 100644 --- a/src/Connectors/src/Connectors/MongoDb/MongoDbConnectionStringBuilder.cs +++ b/src/Connectors/src/Connectors/MongoDb/MongoDbConnectionStringBuilder.cs @@ -95,7 +95,7 @@ private string ToConnectionString() } } - if (_settings.TryGetValue(KnownKeywords.Port, out string? portText) && int.TryParse(portText, out int port)) + if (_settings.TryGetValue(KnownKeywords.Port, out string? portText) && int.TryParse(portText, CultureInfo.InvariantCulture, out int port)) { builder.Port = port; } diff --git a/src/Connectors/src/Connectors/MongoDb/MongoDbWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/MongoDb/MongoDbHostApplicationBuilderExtensions.cs similarity index 69% rename from src/Connectors/src/Connectors/MongoDb/MongoDbWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/MongoDb/MongoDbHostApplicationBuilderExtensions.cs index e45c6e7cf9..02c14a175a 100644 --- a/src/Connectors/src/Connectors/MongoDb/MongoDbWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/MongoDb/MongoDbHostApplicationBuilderExtensions.cs @@ -2,24 +2,24 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; namespace Steeltoe.Connectors.MongoDb; -public static class MongoDbWebApplicationBuilderExtensions +public static class MongoDbHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and /// MongoDB.Driver.IMongoClient) to connect to a MongoDB database. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddMongoDb(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddMongoDb(this IHostApplicationBuilder builder) { return AddMongoDb(builder, null, null); } @@ -29,7 +29,7 @@ public static WebApplicationBuilder AddMongoDb(this WebApplicationBuilder builde /// MongoDB.Driver.IMongoClient) to connect to a MongoDB database. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -38,9 +38,9 @@ public static WebApplicationBuilder AddMongoDb(this WebApplicationBuilder builde /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddMongoDb(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddMongoDb(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/MySql/MySqlWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/MySql/MySqlHostApplicationBuilderExtensions.cs similarity index 71% rename from src/Connectors/src/Connectors/MySql/MySqlWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/MySql/MySqlHostApplicationBuilderExtensions.cs index 7a5cec66f0..fa67271cea 100644 --- a/src/Connectors/src/Connectors/MySql/MySqlWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/MySql/MySqlHostApplicationBuilderExtensions.cs @@ -2,25 +2,25 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; using Steeltoe.Connectors.MySql.DynamicTypeAccess; namespace Steeltoe.Connectors.MySql; -public static class MySqlWebApplicationBuilderExtensions +public static class MySqlHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and /// MySqlConnector.MySqlConnection or MySql.Data.MySqlClient.MySqlConnection) to connect to a MySQL compatible database. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddMySql(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddMySql(this IHostApplicationBuilder builder) { return AddMySql(builder, MySqlPackageResolver.Default); } @@ -30,7 +30,7 @@ public static WebApplicationBuilder AddMySql(this WebApplicationBuilder builder) /// MySqlConnector.MySqlConnection or MySql.Data.MySqlClient.MySqlConnection) to connect to a MySQL compatible database. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -39,15 +39,15 @@ public static WebApplicationBuilder AddMySql(this WebApplicationBuilder builder) /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddMySql(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddMySql(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { return AddMySql(builder, MySqlPackageResolver.Default, configureAction, addAction); } - internal static WebApplicationBuilder AddMySql(this WebApplicationBuilder builder, MySqlPackageResolver packageResolver, + internal static IHostApplicationBuilder AddMySql(this IHostApplicationBuilder builder, MySqlPackageResolver packageResolver, Action? configureAction = null, Action? addAction = null) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/PostgreSql/PostgreSqlWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/PostgreSql/PostgreSqlHostApplicationBuilderExtensions.cs similarity index 69% rename from src/Connectors/src/Connectors/PostgreSql/PostgreSqlWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/PostgreSql/PostgreSqlHostApplicationBuilderExtensions.cs index ea82b8180e..29c5a8ed3c 100644 --- a/src/Connectors/src/Connectors/PostgreSql/PostgreSqlWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/PostgreSql/PostgreSqlHostApplicationBuilderExtensions.cs @@ -2,24 +2,24 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; namespace Steeltoe.Connectors.PostgreSql; -public static class PostgreSqlWebApplicationBuilderExtensions +public static class PostgreSqlHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and Npgsql.NpgsqlConnection) /// to connect to a PostgreSQL database. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddPostgreSql(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddPostgreSql(this IHostApplicationBuilder builder) { return AddPostgreSql(builder, null, null); } @@ -29,7 +29,7 @@ public static WebApplicationBuilder AddPostgreSql(this WebApplicationBuilder bui /// to connect to a PostgreSQL database. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -38,9 +38,9 @@ public static WebApplicationBuilder AddPostgreSql(this WebApplicationBuilder bui /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddPostgreSql(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddPostgreSql(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/PublicAPI.Unshipped.txt b/src/Connectors/src/Connectors/PublicAPI.Unshipped.txt index e8655440e9..e469b0e61f 100644 --- a/src/Connectors/src/Connectors/PublicAPI.Unshipped.txt +++ b/src/Connectors/src/Connectors/PublicAPI.Unshipped.txt @@ -1,46 +1,46 @@ #nullable enable static Steeltoe.Connectors.CosmosDb.CosmosDbConfigurationBuilderExtensions.ConfigureCosmosDb(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.CosmosDb.CosmosDbConfigurationBuilderExtensions.ConfigureCosmosDb(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.CosmosDb.CosmosDbHostApplicationBuilderExtensions.AddCosmosDb(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.CosmosDb.CosmosDbHostApplicationBuilderExtensions.AddCosmosDb(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.CosmosDb.CosmosDbServiceCollectionExtensions.AddCosmosDb(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.CosmosDb.CosmosDbServiceCollectionExtensions.AddCosmosDb(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.CosmosDb.CosmosDbWebApplicationBuilderExtensions.AddCosmosDb(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.CosmosDb.CosmosDbWebApplicationBuilderExtensions.AddCosmosDb(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.MongoDb.MongoDbConfigurationBuilderExtensions.ConfigureMongoDb(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.MongoDb.MongoDbConfigurationBuilderExtensions.ConfigureMongoDb(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.MongoDb.MongoDbHostApplicationBuilderExtensions.AddMongoDb(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.MongoDb.MongoDbHostApplicationBuilderExtensions.AddMongoDb(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.MongoDb.MongoDbServiceCollectionExtensions.AddMongoDb(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.MongoDb.MongoDbServiceCollectionExtensions.AddMongoDb(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.MongoDb.MongoDbWebApplicationBuilderExtensions.AddMongoDb(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.MongoDb.MongoDbWebApplicationBuilderExtensions.AddMongoDb(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.MySql.MySqlConfigurationBuilderExtensions.ConfigureMySql(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.MySql.MySqlConfigurationBuilderExtensions.ConfigureMySql(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.MySql.MySqlHostApplicationBuilderExtensions.AddMySql(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.MySql.MySqlHostApplicationBuilderExtensions.AddMySql(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.MySql.MySqlServiceCollectionExtensions.AddMySql(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.MySql.MySqlServiceCollectionExtensions.AddMySql(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.MySql.MySqlWebApplicationBuilderExtensions.AddMySql(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.MySql.MySqlWebApplicationBuilderExtensions.AddMySql(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.PostgreSql.PostgreSqlConfigurationBuilderExtensions.ConfigurePostgreSql(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.PostgreSql.PostgreSqlConfigurationBuilderExtensions.ConfigurePostgreSql(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.PostgreSql.PostgreSqlHostApplicationBuilderExtensions.AddPostgreSql(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.PostgreSql.PostgreSqlHostApplicationBuilderExtensions.AddPostgreSql(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.PostgreSql.PostgreSqlServiceCollectionExtensions.AddPostgreSql(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.PostgreSql.PostgreSqlServiceCollectionExtensions.AddPostgreSql(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.PostgreSql.PostgreSqlWebApplicationBuilderExtensions.AddPostgreSql(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.PostgreSql.PostgreSqlWebApplicationBuilderExtensions.AddPostgreSql(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.RabbitMQ.RabbitMQConfigurationBuilderExtensions.ConfigureRabbitMQ(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.RabbitMQ.RabbitMQConfigurationBuilderExtensions.ConfigureRabbitMQ(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.RabbitMQ.RabbitMQHostApplicationBuilderExtensions.AddRabbitMQ(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.RabbitMQ.RabbitMQHostApplicationBuilderExtensions.AddRabbitMQ(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.RabbitMQ.RabbitMQServiceCollectionExtensions.AddRabbitMQ(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.RabbitMQ.RabbitMQServiceCollectionExtensions.AddRabbitMQ(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.RabbitMQ.RabbitMQWebApplicationBuilderExtensions.AddRabbitMQ(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.RabbitMQ.RabbitMQWebApplicationBuilderExtensions.AddRabbitMQ(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.Redis.RedisConfigurationBuilderExtensions.ConfigureRedis(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.Redis.RedisConfigurationBuilderExtensions.ConfigureRedis(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.Redis.RedisHostApplicationBuilderExtensions.AddRedis(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.Redis.RedisHostApplicationBuilderExtensions.AddRedis(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.Redis.RedisServiceCollectionExtensions.AddRedis(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.Redis.RedisServiceCollectionExtensions.AddRedis(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.Redis.RedisWebApplicationBuilderExtensions.AddRedis(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.Redis.RedisWebApplicationBuilderExtensions.AddRedis(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Connectors.SqlServer.SqlServerConfigurationBuilderExtensions.ConfigureSqlServer(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! static Steeltoe.Connectors.SqlServer.SqlServerConfigurationBuilderExtensions.ConfigureSqlServer(this Microsoft.Extensions.Configuration.IConfigurationBuilder! builder, System.Action? configureAction) -> Microsoft.Extensions.Configuration.IConfigurationBuilder! +static Steeltoe.Connectors.SqlServer.SqlServerHostApplicationBuilderExtensions.AddSqlServer(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Connectors.SqlServer.SqlServerHostApplicationBuilderExtensions.AddSqlServer(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Connectors.SqlServer.SqlServerServiceCollectionExtensions.AddSqlServer(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Connectors.SqlServer.SqlServerServiceCollectionExtensions.AddSqlServer(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.Extensions.Configuration.IConfiguration! configuration, System.Action? addAction) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! -static Steeltoe.Connectors.SqlServer.SqlServerWebApplicationBuilderExtensions.AddSqlServer(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Connectors.SqlServer.SqlServerWebApplicationBuilderExtensions.AddSqlServer(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureAction, System.Action? addAction) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! Steeltoe.Connectors.ConnectionStringOptions Steeltoe.Connectors.ConnectionStringOptions.ConnectionString.get -> string? Steeltoe.Connectors.ConnectionStringOptions.ConnectionString.set -> void @@ -72,41 +72,41 @@ Steeltoe.Connectors.ConnectorFactory.Get() -> Steeltoe.Co Steeltoe.Connectors.ConnectorFactory.Get(string! serviceBindingName) -> Steeltoe.Connectors.Connector! Steeltoe.Connectors.ConnectorFactory.ServiceBindingNames.get -> System.Collections.Generic.IReadOnlySet! Steeltoe.Connectors.CosmosDb.CosmosDbConfigurationBuilderExtensions +Steeltoe.Connectors.CosmosDb.CosmosDbHostApplicationBuilderExtensions Steeltoe.Connectors.CosmosDb.CosmosDbOptions Steeltoe.Connectors.CosmosDb.CosmosDbOptions.CosmosDbOptions() -> void Steeltoe.Connectors.CosmosDb.CosmosDbOptions.Database.get -> string? Steeltoe.Connectors.CosmosDb.CosmosDbOptions.Database.set -> void Steeltoe.Connectors.CosmosDb.CosmosDbServiceCollectionExtensions -Steeltoe.Connectors.CosmosDb.CosmosDbWebApplicationBuilderExtensions Steeltoe.Connectors.MongoDb.MongoDbConfigurationBuilderExtensions +Steeltoe.Connectors.MongoDb.MongoDbHostApplicationBuilderExtensions Steeltoe.Connectors.MongoDb.MongoDbOptions Steeltoe.Connectors.MongoDb.MongoDbOptions.Database.get -> string? Steeltoe.Connectors.MongoDb.MongoDbOptions.Database.set -> void Steeltoe.Connectors.MongoDb.MongoDbOptions.MongoDbOptions() -> void Steeltoe.Connectors.MongoDb.MongoDbServiceCollectionExtensions -Steeltoe.Connectors.MongoDb.MongoDbWebApplicationBuilderExtensions Steeltoe.Connectors.MySql.MySqlConfigurationBuilderExtensions +Steeltoe.Connectors.MySql.MySqlHostApplicationBuilderExtensions Steeltoe.Connectors.MySql.MySqlOptions Steeltoe.Connectors.MySql.MySqlOptions.MySqlOptions() -> void Steeltoe.Connectors.MySql.MySqlServiceCollectionExtensions -Steeltoe.Connectors.MySql.MySqlWebApplicationBuilderExtensions Steeltoe.Connectors.PostgreSql.PostgreSqlConfigurationBuilderExtensions +Steeltoe.Connectors.PostgreSql.PostgreSqlHostApplicationBuilderExtensions Steeltoe.Connectors.PostgreSql.PostgreSqlOptions Steeltoe.Connectors.PostgreSql.PostgreSqlOptions.PostgreSqlOptions() -> void Steeltoe.Connectors.PostgreSql.PostgreSqlServiceCollectionExtensions -Steeltoe.Connectors.PostgreSql.PostgreSqlWebApplicationBuilderExtensions Steeltoe.Connectors.RabbitMQ.RabbitMQConfigurationBuilderExtensions +Steeltoe.Connectors.RabbitMQ.RabbitMQHostApplicationBuilderExtensions Steeltoe.Connectors.RabbitMQ.RabbitMQOptions Steeltoe.Connectors.RabbitMQ.RabbitMQOptions.RabbitMQOptions() -> void Steeltoe.Connectors.RabbitMQ.RabbitMQServiceCollectionExtensions -Steeltoe.Connectors.RabbitMQ.RabbitMQWebApplicationBuilderExtensions Steeltoe.Connectors.Redis.RedisConfigurationBuilderExtensions +Steeltoe.Connectors.Redis.RedisHostApplicationBuilderExtensions Steeltoe.Connectors.Redis.RedisOptions Steeltoe.Connectors.Redis.RedisOptions.RedisOptions() -> void Steeltoe.Connectors.Redis.RedisServiceCollectionExtensions -Steeltoe.Connectors.Redis.RedisWebApplicationBuilderExtensions Steeltoe.Connectors.SqlServer.SqlServerConfigurationBuilderExtensions +Steeltoe.Connectors.SqlServer.SqlServerHostApplicationBuilderExtensions Steeltoe.Connectors.SqlServer.SqlServerOptions Steeltoe.Connectors.SqlServer.SqlServerOptions.SqlServerOptions() -> void Steeltoe.Connectors.SqlServer.SqlServerServiceCollectionExtensions -Steeltoe.Connectors.SqlServer.SqlServerWebApplicationBuilderExtensions diff --git a/src/Connectors/src/Connectors/RabbitMQ/RabbitMQConnectionStringBuilder.cs b/src/Connectors/src/Connectors/RabbitMQ/RabbitMQConnectionStringBuilder.cs index 843d4cb053..de9a14ee85 100644 --- a/src/Connectors/src/Connectors/RabbitMQ/RabbitMQConnectionStringBuilder.cs +++ b/src/Connectors/src/Connectors/RabbitMQ/RabbitMQConnectionStringBuilder.cs @@ -93,7 +93,7 @@ private string ToConnectionString() } } - if (_settings.TryGetValue(KnownKeywords.Port, out string? portText) && int.TryParse(portText, out int port)) + if (_settings.TryGetValue(KnownKeywords.Port, out string? portText) && int.TryParse(portText, CultureInfo.InvariantCulture, out int port)) { builder.Port = port; } diff --git a/src/Connectors/src/Connectors/RabbitMQ/RabbitMQWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/RabbitMQ/RabbitMQHostApplicationBuilderExtensions.cs similarity index 69% rename from src/Connectors/src/Connectors/RabbitMQ/RabbitMQWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/RabbitMQ/RabbitMQHostApplicationBuilderExtensions.cs index a115e767ba..80e6e29800 100644 --- a/src/Connectors/src/Connectors/RabbitMQ/RabbitMQWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/RabbitMQ/RabbitMQHostApplicationBuilderExtensions.cs @@ -2,24 +2,24 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; namespace Steeltoe.Connectors.RabbitMQ; -public static class RabbitMQWebApplicationBuilderExtensions +public static class RabbitMQHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and /// RabbitMQ.Client.IConnection) to connect to a RabbitMQ server. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddRabbitMQ(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddRabbitMQ(this IHostApplicationBuilder builder) { return AddRabbitMQ(builder, null, null); } @@ -29,7 +29,7 @@ public static WebApplicationBuilder AddRabbitMQ(this WebApplicationBuilder build /// RabbitMQ.Client.IConnection) to connect to a RabbitMQ server. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -38,9 +38,9 @@ public static WebApplicationBuilder AddRabbitMQ(this WebApplicationBuilder build /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddRabbitMQ(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddRabbitMQ(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/Redis/RedisWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/Redis/RedisHostApplicationBuilderExtensions.cs similarity index 76% rename from src/Connectors/src/Connectors/Redis/RedisWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/Redis/RedisHostApplicationBuilderExtensions.cs index c7ef4877ed..c6a758fd6f 100644 --- a/src/Connectors/src/Connectors/Redis/RedisWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/Redis/RedisHostApplicationBuilderExtensions.cs @@ -2,13 +2,13 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; namespace Steeltoe.Connectors.Redis; -public static class RedisWebApplicationBuilderExtensions +public static class RedisHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and @@ -17,12 +17,12 @@ public static class RedisWebApplicationBuilderExtensions /// . /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddRedis(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddRedis(this IHostApplicationBuilder builder) { return AddRedis(builder, null, null); } @@ -34,7 +34,7 @@ public static WebApplicationBuilder AddRedis(this WebApplicationBuilder builder) /// . /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -43,9 +43,9 @@ public static WebApplicationBuilder AddRedis(this WebApplicationBuilder builder) /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddRedis(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddRedis(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/SqlServer/SqlServerWebApplicationBuilderExtensions.cs b/src/Connectors/src/Connectors/SqlServer/SqlServerHostApplicationBuilderExtensions.cs similarity index 71% rename from src/Connectors/src/Connectors/SqlServer/SqlServerWebApplicationBuilderExtensions.cs rename to src/Connectors/src/Connectors/SqlServer/SqlServerHostApplicationBuilderExtensions.cs index ba1af61dd2..02384d22a9 100644 --- a/src/Connectors/src/Connectors/SqlServer/SqlServerWebApplicationBuilderExtensions.cs +++ b/src/Connectors/src/Connectors/SqlServer/SqlServerHostApplicationBuilderExtensions.cs @@ -2,25 +2,25 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; using Steeltoe.Connectors.SqlServer.RuntimeTypeAccess; namespace Steeltoe.Connectors.SqlServer; -public static class SqlServerWebApplicationBuilderExtensions +public static class SqlServerHostApplicationBuilderExtensions { /// /// Registers a (with type parameters and /// Microsoft.Data.SqlClient.SqlConnection or System.Data.SqlClient.SqlConnection) to connect to a SQL Server database. /// /// - /// The to add services to. + /// The to configure. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddSqlServer(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddSqlServer(this IHostApplicationBuilder builder) { return AddSqlServer(builder, SqlServerPackageResolver.Default); } @@ -30,7 +30,7 @@ public static WebApplicationBuilder AddSqlServer(this WebApplicationBuilder buil /// Microsoft.Data.SqlClient.SqlConnection or System.Data.SqlClient.SqlConnection) to connect to a SQL Server database. /// /// - /// The to add services to. + /// The to configure. /// /// /// An optional delegate to configure configuration of this connector. @@ -39,15 +39,15 @@ public static WebApplicationBuilder AddSqlServer(this WebApplicationBuilder buil /// An optional delegate to configure this connector. /// /// - /// The so that additional calls can be chained. + /// The so that additional calls can be chained. /// - public static WebApplicationBuilder AddSqlServer(this WebApplicationBuilder builder, Action? configureAction, + public static IHostApplicationBuilder AddSqlServer(this IHostApplicationBuilder builder, Action? configureAction, Action? addAction) { return AddSqlServer(builder, SqlServerPackageResolver.Default, configureAction, addAction); } - internal static WebApplicationBuilder AddSqlServer(this WebApplicationBuilder builder, SqlServerPackageResolver packageResolver, + internal static IHostApplicationBuilder AddSqlServer(this IHostApplicationBuilder builder, SqlServerPackageResolver packageResolver, Action? configureAction = null, Action? addAction = null) { ArgumentGuard.NotNull(builder); diff --git a/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj b/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj index 540bfa4ffd..39f88a9deb 100644 --- a/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj +++ b/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Connectors for using service bindings in your application connectors;services true diff --git a/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj b/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj index 839a1304a0..c71947603c 100644 --- a/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj +++ b/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Package for using Steeltoe Connectors with Entity Framework Core connectors;EFCore;EntityFrameworkCore;EF;Entity Framework Core;entity-framework-core;services true diff --git a/src/Connectors/test/Connectors.Test/ConfigurationChangeDetectionTests.cs b/src/Connectors/test/Connectors.Test/ConfigurationChangeDetectionTests.cs index 4b6515cf7f..7fb817730f 100644 --- a/src/Connectors/test/Connectors.Test/ConfigurationChangeDetectionTests.cs +++ b/src/Connectors/test/Connectors.Test/ConfigurationChangeDetectionTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; @@ -11,7 +10,6 @@ using Npgsql; using Steeltoe.Common.TestResources; using Steeltoe.Connectors.PostgreSql; -using Xunit; namespace Steeltoe.Connectors.Test; diff --git a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbConnectorTests.cs b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbConnectorTests.cs index 95a55d5a1e..f0bcea7053 100644 --- a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Azure.Cosmos; using Microsoft.Extensions.Configuration; @@ -12,7 +11,6 @@ using Steeltoe.Common.HealthChecks; using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Connectors.CosmosDb; -using Xunit; namespace Steeltoe.Connectors.Test.CosmosDb; diff --git a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs index 173596987e..6d286a7e9f 100644 --- a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.Azure.Cosmos; using Microsoft.Extensions.Logging.Abstractions; @@ -10,7 +9,6 @@ using Moq.Protected; using Steeltoe.Common.HealthChecks; using Steeltoe.Connectors.CosmosDb; -using Xunit; namespace Steeltoe.Connectors.Test.CosmosDb; diff --git a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectionStringBuilderTests.cs b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectionStringBuilderTests.cs index 8591ade794..b63ee27ddc 100644 --- a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectionStringBuilderTests.cs +++ b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectionStringBuilderTests.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Connectors.MongoDb; -using Xunit; namespace Steeltoe.Connectors.Test.MongoDb; diff --git a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectorTests.cs b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectorTests.cs index 6f872a4326..388ba55cd1 100644 --- a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -13,7 +12,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.MongoDb; -using Xunit; namespace Steeltoe.Connectors.Test.MongoDb; diff --git a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbHealthContributorTest.cs index e6f83cfc49..bc64e083af 100644 --- a/src/Connectors/test/Connectors.Test/MongoDb/MongoDbHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/MongoDb/MongoDbHealthContributorTest.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Logging.Abstractions; using MongoDB.Driver; using Moq; using Steeltoe.Common.HealthChecks; using Steeltoe.Connectors.MongoDb; -using Xunit; namespace Steeltoe.Connectors.Test.MongoDb; diff --git a/src/Connectors/test/Connectors.Test/MySql/MySqlConnector/MySqlConnectorTests.cs b/src/Connectors/test/Connectors.Test/MySql/MySqlConnector/MySqlConnectorTests.cs index 6f3bb976d3..53b7f5e39e 100644 --- a/src/Connectors/test/Connectors.Test/MySql/MySqlConnector/MySqlConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/MySql/MySqlConnector/MySqlConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +13,6 @@ using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.MySql; using Steeltoe.Connectors.MySql.DynamicTypeAccess; -using Xunit; namespace Steeltoe.Connectors.Test.MySql.MySqlConnector; diff --git a/src/Connectors/test/Connectors.Test/MySql/Oracle/MySqlConnectorTests.cs b/src/Connectors/test/Connectors.Test/MySql/Oracle/MySqlConnectorTests.cs index e5ae593fcc..5261fb7787 100644 --- a/src/Connectors/test/Connectors.Test/MySql/Oracle/MySqlConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/MySql/Oracle/MySqlConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +13,6 @@ using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.MySql; using Steeltoe.Connectors.MySql.DynamicTypeAccess; -using Xunit; namespace Steeltoe.Connectors.Test.MySql.Oracle; diff --git a/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTests.cs b/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTests.cs index 3516f465ad..0c2c6ca189 100644 --- a/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +13,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.PostgreSql; -using Xunit; namespace Steeltoe.Connectors.Test.PostgreSql; diff --git a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectionStringBuilderTests.cs b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectionStringBuilderTests.cs index d96ee48e34..67a5e3edaa 100644 --- a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectionStringBuilderTests.cs +++ b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectionStringBuilderTests.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Connectors.RabbitMQ; -using Xunit; namespace Steeltoe.Connectors.Test.RabbitMQ; diff --git a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectorTests.cs b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectorTests.cs index 2a7f9cc824..3ad7782953 100644 --- a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +13,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.RabbitMQ; -using Xunit; namespace Steeltoe.Connectors.Test.RabbitMQ; diff --git a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQHealthContributorTest.cs index c0b6ece6d7..224a94683d 100644 --- a/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/RabbitMQ/RabbitMQHealthContributorTest.cs @@ -3,14 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Text; -using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.Extensions.Logging.Abstractions; using Moq; using RabbitMQ.Client; using Steeltoe.Common.HealthChecks; using Steeltoe.Connectors.RabbitMQ; -using Xunit; namespace Steeltoe.Connectors.Test.RabbitMQ; diff --git a/src/Connectors/test/Connectors.Test/Redis/RedisConnectionStringBuilderTests.cs b/src/Connectors/test/Connectors.Test/Redis/RedisConnectionStringBuilderTests.cs index 2b8bec505d..8a347d9fea 100644 --- a/src/Connectors/test/Connectors.Test/Redis/RedisConnectionStringBuilderTests.cs +++ b/src/Connectors/test/Connectors.Test/Redis/RedisConnectionStringBuilderTests.cs @@ -2,9 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Connectors.Redis; -using Xunit; namespace Steeltoe.Connectors.Test.Redis; diff --git a/src/Connectors/test/Connectors.Test/Redis/RedisConnectorTests.cs b/src/Connectors/test/Connectors.Test/Redis/RedisConnectorTests.cs index 99283c5170..413f5d20ba 100644 --- a/src/Connectors/test/Connectors.Test/Redis/RedisConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/Redis/RedisConnectorTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.StackExchangeRedis; @@ -17,7 +16,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Configuration.Kubernetes.ServiceBinding; using Steeltoe.Connectors.Redis; -using Xunit; namespace Steeltoe.Connectors.Test.Redis; diff --git a/src/Connectors/test/Connectors.Test/Redis/RedisHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/Redis/RedisHealthContributorTest.cs index 1bc5cefd6e..e76b08416c 100644 --- a/src/Connectors/test/Connectors.Test/Redis/RedisHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/Redis/RedisHealthContributorTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using FluentAssertions.Extensions; using Microsoft.Extensions.Logging.Abstractions; using Moq; using StackExchange.Redis; using Steeltoe.Common.HealthChecks; using Steeltoe.Connectors.Redis; -using Xunit; namespace Steeltoe.Connectors.Test.Redis; diff --git a/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs index 4ac6d9ab69..76516e8719 100644 --- a/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/RelationalDatabaseHealthContributorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Data.Common; -using FluentAssertions; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Logging.Abstractions; using Moq; @@ -11,7 +10,6 @@ using MySqlConnector; using Npgsql; using Steeltoe.Common.HealthChecks; -using Xunit; namespace Steeltoe.Connectors.Test; diff --git a/src/Connectors/test/Connectors.Test/SqlServer/MicrosoftData/SqlServerConnectorTests.cs b/src/Connectors/test/Connectors.Test/SqlServer/MicrosoftData/SqlServerConnectorTests.cs index 5e3492c720..ec58475f4f 100644 --- a/src/Connectors/test/Connectors.Test/SqlServer/MicrosoftData/SqlServerConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/SqlServer/MicrosoftData/SqlServerConnectorTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; @@ -13,7 +12,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Connectors.SqlServer; using Steeltoe.Connectors.SqlServer.RuntimeTypeAccess; -using Xunit; namespace Steeltoe.Connectors.Test.SqlServer.MicrosoftData; diff --git a/src/Connectors/test/Connectors.Test/SqlServer/SystemData/SqlServerConnectorTests.cs b/src/Connectors/test/Connectors.Test/SqlServer/SystemData/SqlServerConnectorTests.cs index 2adcea467c..c61920e141 100644 --- a/src/Connectors/test/Connectors.Test/SqlServer/SystemData/SqlServerConnectorTests.cs +++ b/src/Connectors/test/Connectors.Test/SqlServer/SystemData/SqlServerConnectorTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Data.SqlClient; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -13,7 +12,6 @@ using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Connectors.SqlServer; using Steeltoe.Connectors.SqlServer.RuntimeTypeAccess; -using Xunit; namespace Steeltoe.Connectors.Test.SqlServer.SystemData; diff --git a/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj b/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj index aa2905dc08..7afaddf259 100644 --- a/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj +++ b/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable @@ -15,7 +15,7 @@ - + diff --git a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Oracle/MySqlDbContextOptionsBuilderExtensionsTest.cs b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Oracle/MySqlDbContextOptionsBuilderExtensionsTest.cs index 019039adf8..205e95f6c0 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Oracle/MySqlDbContextOptionsBuilderExtensionsTest.cs +++ b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Oracle/MySqlDbContextOptionsBuilderExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -11,7 +10,6 @@ using Steeltoe.Connectors.EntityFrameworkCore.MySql.DynamicTypeAccess; using Steeltoe.Connectors.MySql; using Steeltoe.Connectors.MySql.DynamicTypeAccess; -using Xunit; using SteeltoeExtensions = Steeltoe.Connectors.EntityFrameworkCore.MySql.MySqlDbContextOptionsBuilderExtensions; namespace Steeltoe.Connectors.EntityFrameworkCore.Test.MySql.Oracle; diff --git a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Pomelo/MySqlDbContextOptionsBuilderExtensionsTest.cs b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Pomelo/MySqlDbContextOptionsBuilderExtensionsTest.cs index 33dcc5b263..6b764128cc 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Pomelo/MySqlDbContextOptionsBuilderExtensionsTest.cs +++ b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Pomelo/MySqlDbContextOptionsBuilderExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -11,7 +10,6 @@ using Steeltoe.Connectors.EntityFrameworkCore.MySql.DynamicTypeAccess; using Steeltoe.Connectors.MySql; using Steeltoe.Connectors.MySql.DynamicTypeAccess; -using Xunit; using SteeltoeExtensions = Steeltoe.Connectors.EntityFrameworkCore.MySql.MySqlDbContextOptionsBuilderExtensions; namespace Steeltoe.Connectors.EntityFrameworkCore.Test.MySql.Pomelo; diff --git a/src/Connectors/test/EntityFrameworkCore.Test/PostgreSql/PostgreSqlDbContextOptionsBuilderExtensionsTest.cs b/src/Connectors/test/EntityFrameworkCore.Test/PostgreSql/PostgreSqlDbContextOptionsBuilderExtensionsTest.cs index 91677d3ed3..a5a27d3d50 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/PostgreSql/PostgreSqlDbContextOptionsBuilderExtensionsTest.cs +++ b/src/Connectors/test/EntityFrameworkCore.Test/PostgreSql/PostgreSqlDbContextOptionsBuilderExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -10,7 +9,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Connectors.EntityFrameworkCore.PostgreSql; using Steeltoe.Connectors.PostgreSql; -using Xunit; namespace Steeltoe.Connectors.EntityFrameworkCore.Test.PostgreSql; diff --git a/src/Connectors/test/EntityFrameworkCore.Test/SqlServer/SqlServerDbContextOptionsBuilderExtensionsTest.cs b/src/Connectors/test/EntityFrameworkCore.Test/SqlServer/SqlServerDbContextOptionsBuilderExtensionsTest.cs index d09324a0c4..aa8695aa98 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/SqlServer/SqlServerDbContextOptionsBuilderExtensionsTest.cs +++ b/src/Connectors/test/EntityFrameworkCore.Test/SqlServer/SqlServerDbContextOptionsBuilderExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; @@ -11,7 +10,6 @@ using Steeltoe.Connectors.EntityFrameworkCore.SqlServer; using Steeltoe.Connectors.SqlServer; using Steeltoe.Connectors.SqlServer.RuntimeTypeAccess; -using Xunit; namespace Steeltoe.Connectors.EntityFrameworkCore.Test.SqlServer; diff --git a/src/Connectors/test/EntityFrameworkCore.Test/Steeltoe.Connectors.EntityFrameworkCore.Test.csproj b/src/Connectors/test/EntityFrameworkCore.Test/Steeltoe.Connectors.EntityFrameworkCore.Test.csproj index 4709f37907..601bba3d3d 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/Steeltoe.Connectors.EntityFrameworkCore.Test.csproj +++ b/src/Connectors/test/EntityFrameworkCore.Test/Steeltoe.Connectors.EntityFrameworkCore.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable @@ -9,7 +9,7 @@ - + diff --git a/src/Discovery/src/Configuration/Steeltoe.Discovery.Configuration.csproj b/src/Discovery/src/Configuration/Steeltoe.Discovery.Configuration.csproj index dd9e2d24b1..3917ebdc55 100644 --- a/src/Discovery/src/Configuration/Steeltoe.Discovery.Configuration.csproj +++ b/src/Discovery/src/Configuration/Steeltoe.Discovery.Configuration.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Client for service discovery from application configuration service-discovery;service-registry;configuration-based true diff --git a/src/Discovery/src/Consul/PeriodicHeartbeat.cs b/src/Discovery/src/Consul/PeriodicHeartbeat.cs index 020fa6d2ef..5fb6b774d5 100644 --- a/src/Discovery/src/Consul/PeriodicHeartbeat.cs +++ b/src/Discovery/src/Consul/PeriodicHeartbeat.cs @@ -11,13 +11,14 @@ namespace Steeltoe.Discovery.Consul; internal sealed class PeriodicHeartbeat : IAsyncDisposable { private readonly string _serviceId; - private readonly TimeSpan _interval; private readonly PeriodicTimer _periodicTimer; private readonly CancellationTokenSource _cancellationTokenSource = new(); private readonly IConsulClient _client; private readonly ILogger _logger; private readonly Task _task; + internal TimeSpan Interval { get; private set; } + public PeriodicHeartbeat(string serviceId, TimeSpan interval, IConsulClient client, ILogger logger) { ArgumentGuard.NotNull(serviceId); @@ -25,7 +26,7 @@ public PeriodicHeartbeat(string serviceId, TimeSpan interval, IConsulClient clie ArgumentGuard.NotNull(logger); _serviceId = serviceId; - _interval = interval; + Interval = interval; _periodicTimer = new PeriodicTimer(interval); _client = client; _logger = logger; @@ -36,7 +37,7 @@ private async Task TimerLoopAsync() { try { - _logger.LogDebug("Start sending periodic Consul heartbeats for '{ServiceId}' with interval {Interval}.", _serviceId, _interval); + _logger.LogDebug("Start sending periodic Consul heartbeats for '{ServiceId}' with interval {Interval}.", _serviceId, Interval); while (await _periodicTimer.WaitForNextTickAsync(_cancellationTokenSource.Token)) { @@ -58,13 +59,19 @@ private async Task TimerLoopAsync() } } + public void ChangeInterval(TimeSpan interval) + { + if (interval != Interval) + { + _periodicTimer.Period = interval; + Interval = interval; + _logger.LogDebug("Periodic Consul heartbeat interval for '{ServiceId}' changed to {Interval}.", _serviceId, interval); + } + } + public async ValueTask DisposeAsync() { -#if NET6_0 - _cancellationTokenSource.Cancel(); -#else await _cancellationTokenSource.CancelAsync(); -#endif await _task; _cancellationTokenSource.Dispose(); _task.Dispose(); diff --git a/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj b/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj index 07db2278ca..05266e3995 100644 --- a/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj +++ b/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe compatibility package for service discovery and registration with Hashicorp Consul service-discovery;service-registry;Consul;hashicorp true diff --git a/src/Discovery/src/Consul/TtlScheduler.cs b/src/Discovery/src/Consul/TtlScheduler.cs index e4dde0c8c7..0eb0e59bca 100644 --- a/src/Discovery/src/Consul/TtlScheduler.cs +++ b/src/Discovery/src/Consul/TtlScheduler.cs @@ -23,6 +23,7 @@ public sealed class TtlScheduler : IAsyncDisposable private readonly IConsulClient _client; private readonly ILogger _schedulerLogger; private readonly ILogger _heartbeatLogger; + private readonly IDisposable? _optionsChangeToken; private bool _isDisposed; internal ConcurrentDictionary ServiceHeartbeats { get; } = new(StringComparer.OrdinalIgnoreCase); @@ -49,6 +50,15 @@ public TtlScheduler(IOptionsMonitor optionsMonitor, ICon _client = client; _schedulerLogger = loggerFactory.CreateLogger(); _heartbeatLogger = loggerFactory.CreateLogger(); + _optionsChangeToken = optionsMonitor.OnChange(HandleOptionsChanged); + } + + private void HandleOptionsChanged(ConsulDiscoveryOptions options) + { + if (options is { InstanceId: not null, Heartbeat: not null }) + { + AddOrUpdate(options.InstanceId, options.Heartbeat); + } } /// @@ -65,19 +75,27 @@ internal void Add(string instanceId) if (heartbeatOptions != null) { - _schedulerLogger.LogDebug("Adding instance '{InstanceId}'.", instanceId); + AddOrUpdate(instanceId, heartbeatOptions); + } + } - TimeSpan interval = heartbeatOptions.ComputeHeartbeatInterval(); - string checkId = instanceId; + private void AddOrUpdate(string instanceId, ConsulHeartbeatOptions heartbeatOptions) + { + _schedulerLogger.LogDebug("Adding/updating instance '{InstanceId}'.", instanceId); - if (!checkId.StartsWith(InstancePrefix, StringComparison.Ordinal)) - { - checkId = $"{InstancePrefix}{checkId}"; - } + TimeSpan interval = heartbeatOptions.ComputeHeartbeatInterval(); + string checkId = instanceId; - // Not using AddOrUpdate, because .NET 6 lacks support for changing PeriodicTimer.Period (added in .NET 8). - _ = ServiceHeartbeats.GetOrAdd(instanceId, _ => new PeriodicHeartbeat(checkId, interval, _client, _heartbeatLogger)); + if (!checkId.StartsWith(InstancePrefix, StringComparison.Ordinal)) + { + checkId = $"{InstancePrefix}{checkId}"; } + + ServiceHeartbeats.AddOrUpdate(instanceId, _ => new PeriodicHeartbeat(checkId, interval, _client, _heartbeatLogger), (_, periodicHeartbeat) => + { + periodicHeartbeat.ChangeInterval(interval); + return periodicHeartbeat; + }); } /// @@ -109,6 +127,7 @@ public async ValueTask DisposeAsync() await RemoveAsync(instanceId); } + _optionsChangeToken?.Dispose(); _isDisposed = true; } } diff --git a/src/Discovery/src/Eureka/EurekaApplicationInfoManager.cs b/src/Discovery/src/Eureka/EurekaApplicationInfoManager.cs index a6c82bf709..5b77eebc15 100644 --- a/src/Discovery/src/Eureka/EurekaApplicationInfoManager.cs +++ b/src/Discovery/src/Eureka/EurekaApplicationInfoManager.cs @@ -50,7 +50,7 @@ public EurekaApplicationInfoManager(IOptionsMonitor clientO else { _instance = InstanceInfo.FromConfiguration(instanceOptionsMonitor.CurrentValue); - _instanceOptionsChangeToken = instanceOptionsMonitor.OnChange((instanceOptions, _) => HandleInstanceOptionsChanged(instanceOptions)); + _instanceOptionsChangeToken = instanceOptionsMonitor.OnChange(HandleInstanceOptionsChanged); } _clientOptionsMonitor = clientOptionsMonitor; diff --git a/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj b/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj index cf7d252f1e..391d45654e 100644 --- a/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj +++ b/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Client for service discovery and registration with Neflix Eureka service-discovery;service-registry;Netflix-Eureka;netflix;eureka true diff --git a/src/Discovery/src/HttpClients/Steeltoe.Discovery.HttpClients.csproj b/src/Discovery/src/HttpClients/Steeltoe.Discovery.HttpClients.csproj index 6085383626..85ae232332 100644 --- a/src/Discovery/src/HttpClients/Steeltoe.Discovery.HttpClients.csproj +++ b/src/Discovery/src/HttpClients/Steeltoe.Discovery.HttpClients.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Base package for using Steeltoe Service Discovery service-discovery;service-registry;load-balancing;round-robin;httpclient;httpclientfactory true diff --git a/src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs b/src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs index 3c0579195a..ecd141a6dc 100644 --- a/src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs +++ b/src/Discovery/test/Configuration.Test/ConfigurationDiscoveryClientTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Steeltoe.Common.Discovery; using Steeltoe.Common.TestResources; using Steeltoe.Common.Utils.IO; -using Xunit; namespace Steeltoe.Discovery.Configuration.Test; diff --git a/src/Discovery/test/Configuration.Test/Steeltoe.Discovery.Configuration.Test.csproj b/src/Discovery/test/Configuration.Test/Steeltoe.Discovery.Configuration.Test.csproj index 60735b8d8e..e2bf146b15 100644 --- a/src/Discovery/test/Configuration.Test/Steeltoe.Discovery.Configuration.Test.csproj +++ b/src/Discovery/test/Configuration.Test/Steeltoe.Discovery.Configuration.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Discovery/test/Consul.Test/ConsulClientFactoryTest.cs b/src/Discovery/test/Consul.Test/ConsulClientFactoryTest.cs index cf86cf745e..cf2aa24416 100644 --- a/src/Discovery/test/Consul.Test/ConsulClientFactoryTest.cs +++ b/src/Discovery/test/Consul.Test/ConsulClientFactoryTest.cs @@ -4,7 +4,6 @@ using Consul; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test; diff --git a/src/Discovery/test/Consul.Test/ConsulOptionsTest.cs b/src/Discovery/test/Consul.Test/ConsulOptionsTest.cs index f910a9b022..251955d4ec 100644 --- a/src/Discovery/test/Consul.Test/ConsulOptionsTest.cs +++ b/src/Discovery/test/Consul.Test/ConsulOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test; diff --git a/src/Discovery/test/Consul.Test/ConsulServiceCollectionExtensionsTest.cs b/src/Discovery/test/Consul.Test/ConsulServiceCollectionExtensionsTest.cs index 4460e3032e..22c6b7bcc7 100644 --- a/src/Discovery/test/Consul.Test/ConsulServiceCollectionExtensionsTest.cs +++ b/src/Discovery/test/Consul.Test/ConsulServiceCollectionExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -10,7 +9,6 @@ using Steeltoe.Common.Discovery; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test; diff --git a/src/Discovery/test/Consul.Test/Discovery/ConsulDiscoveryClientTest.cs b/src/Discovery/test/Consul.Test/Discovery/ConsulDiscoveryClientTest.cs index 361a3443bb..82ae95086d 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ConsulDiscoveryClientTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ConsulDiscoveryClientTest.cs @@ -8,7 +8,6 @@ using Steeltoe.Common.Discovery; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/ConsulHealthContributorTest.cs b/src/Discovery/test/Consul.Test/Discovery/ConsulHealthContributorTest.cs index 3b4ac9ade1..024df243a1 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ConsulHealthContributorTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ConsulHealthContributorTest.cs @@ -7,7 +7,6 @@ using Steeltoe.Common.HealthChecks; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; using HealthStatus = Steeltoe.Common.HealthChecks.HealthStatus; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/ConsulHeartbeatOptionsTest.cs b/src/Discovery/test/Consul.Test/Discovery/ConsulHeartbeatOptionsTest.cs index 8026b9776a..3b6bb3400b 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ConsulHeartbeatOptionsTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ConsulHeartbeatOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/ConsulRetryOptionsTest.cs b/src/Discovery/test/Consul.Test/Discovery/ConsulRetryOptionsTest.cs index dd203bb6ec..30546433e5 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ConsulRetryOptionsTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ConsulRetryOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/ConsulServiceInstanceTest.cs b/src/Discovery/test/Consul.Test/Discovery/ConsulServiceInstanceTest.cs index ef36367c87..e5838f5e2f 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ConsulServiceInstanceTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ConsulServiceInstanceTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Consul; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/PostConfigureConsulDiscoveryOptionsTest.cs b/src/Discovery/test/Consul.Test/Discovery/PostConfigureConsulDiscoveryOptionsTest.cs index ee114161b2..ffc961cd60 100644 --- a/src/Discovery/test/Consul.Test/Discovery/PostConfigureConsulDiscoveryOptionsTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/PostConfigureConsulDiscoveryOptionsTest.cs @@ -12,7 +12,6 @@ using Steeltoe.Common.Net; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/ThisServiceInstanceTest.cs b/src/Discovery/test/Consul.Test/Discovery/ThisServiceInstanceTest.cs index 9e8df51d62..c8e7825398 100644 --- a/src/Discovery/test/Consul.Test/Discovery/ThisServiceInstanceTest.cs +++ b/src/Discovery/test/Consul.Test/Discovery/ThisServiceInstanceTest.cs @@ -6,7 +6,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; using Steeltoe.Discovery.Consul.Registry; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; diff --git a/src/Discovery/test/Consul.Test/Discovery/TtlSchedulerTests.cs b/src/Discovery/test/Consul.Test/Discovery/TtlSchedulerTests.cs index 47cff63fcf..1405b7ade3 100644 --- a/src/Discovery/test/Consul.Test/Discovery/TtlSchedulerTests.cs +++ b/src/Discovery/test/Consul.Test/Discovery/TtlSchedulerTests.cs @@ -7,7 +7,6 @@ using Moq; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Discovery; @@ -57,6 +56,38 @@ public async Task Add_AddsTimer() await heartbeat.DisposeAsync(); } + [Fact] + public async Task Can_Change_Timer_Interval() + { + var agentMoq = new Mock(); + var clientMoq = new Mock(); + clientMoq.Setup(client => client.Agent).Returns(agentMoq.Object); + + var options = new ConsulDiscoveryOptions + { + InstanceId = "foobar", + Heartbeat = new ConsulHeartbeatOptions + { + TtlValue = 5 + } + }; + + TestOptionsMonitor optionsMonitor = TestOptionsMonitor.Create(options); + + await using var scheduler = new TtlScheduler(optionsMonitor, clientMoq.Object, NullLoggerFactory.Instance); + scheduler.Add(options.InstanceId); + + Assert.Contains(options.InstanceId, scheduler.ServiceHeartbeats); + PeriodicHeartbeat heartbeat = scheduler.ServiceHeartbeats[options.InstanceId]; + TimeSpan beforeInterval = heartbeat.Interval; + + options.Heartbeat.TtlValue = 10; + optionsMonitor.Change(options); + + TimeSpan afterInterval = heartbeat.Interval; + Assert.NotEqual(beforeInterval, afterInterval); + } + [Fact] public async Task Remove_Throws_Invalid_InstanceId() { diff --git a/src/Discovery/test/Consul.Test/Registry/ConsulRegistrationTest.cs b/src/Discovery/test/Consul.Test/Registry/ConsulRegistrationTest.cs index 5bf2df426b..fd6a74aae9 100644 --- a/src/Discovery/test/Consul.Test/Registry/ConsulRegistrationTest.cs +++ b/src/Discovery/test/Consul.Test/Registry/ConsulRegistrationTest.cs @@ -11,7 +11,6 @@ using Steeltoe.Discovery.Consul.Configuration; using Steeltoe.Discovery.Consul.Registry; using Steeltoe.Discovery.Consul.Util; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Registry; diff --git a/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistrarTest.cs b/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistrarTest.cs index 122b32f1d3..51fa55b946 100644 --- a/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistrarTest.cs +++ b/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistrarTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Consul; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Moq; @@ -11,7 +10,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; using Steeltoe.Discovery.Consul.Registry; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Registry; diff --git a/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistryTest.cs b/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistryTest.cs index 330db9e1ec..e825aa2250 100644 --- a/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistryTest.cs +++ b/src/Discovery/test/Consul.Test/Registry/ConsulServiceRegistryTest.cs @@ -10,7 +10,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul.Configuration; using Steeltoe.Discovery.Consul.Registry; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Registry; diff --git a/src/Discovery/test/Consul.Test/Steeltoe.Discovery.Consul.Test.csproj b/src/Discovery/test/Consul.Test/Steeltoe.Discovery.Consul.Test.csproj index 812e005b5c..afb9391add 100644 --- a/src/Discovery/test/Consul.Test/Steeltoe.Discovery.Consul.Test.csproj +++ b/src/Discovery/test/Consul.Test/Steeltoe.Discovery.Consul.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Discovery/test/Consul.Test/Util/ConsulServerUtilsTest.cs b/src/Discovery/test/Consul.Test/Util/ConsulServerUtilsTest.cs index 4a651c337d..a3c0e64321 100644 --- a/src/Discovery/test/Consul.Test/Util/ConsulServerUtilsTest.cs +++ b/src/Discovery/test/Consul.Test/Util/ConsulServerUtilsTest.cs @@ -4,7 +4,6 @@ using Consul; using Steeltoe.Discovery.Consul.Util; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Util; diff --git a/src/Discovery/test/Consul.Test/Util/DateTimeConversionsTest.cs b/src/Discovery/test/Consul.Test/Util/DateTimeConversionsTest.cs index 7b16c7f071..68f3920559 100644 --- a/src/Discovery/test/Consul.Test/Util/DateTimeConversionsTest.cs +++ b/src/Discovery/test/Consul.Test/Util/DateTimeConversionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Discovery.Consul.Util; -using Xunit; namespace Steeltoe.Discovery.Consul.Test.Util; diff --git a/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoCollectionTest.cs b/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoCollectionTest.cs index c282d0c6d3..a0a6bc0230 100644 --- a/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoCollectionTest.cs +++ b/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoCollectionTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.AppInfo; diff --git a/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoTest.cs b/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoTest.cs index ca2eb8d6ec..2f1189a494 100644 --- a/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoTest.cs +++ b/src/Discovery/test/Eureka.Test/AppInfo/ApplicationInfoTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.AppInfo; diff --git a/src/Discovery/test/Eureka.Test/AppInfo/DataCenterInfoTest.cs b/src/Discovery/test/Eureka.Test/AppInfo/DataCenterInfoTest.cs index edf5c03eaa..5fc2b725dc 100644 --- a/src/Discovery/test/Eureka.Test/AppInfo/DataCenterInfoTest.cs +++ b/src/Discovery/test/Eureka.Test/AppInfo/DataCenterInfoTest.cs @@ -5,7 +5,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.AppInfo; diff --git a/src/Discovery/test/Eureka.Test/AppInfo/InstanceInfoTest.cs b/src/Discovery/test/Eureka.Test/AppInfo/InstanceInfoTest.cs index d4e73bc5be..9d2f147bee 100644 --- a/src/Discovery/test/Eureka.Test/AppInfo/InstanceInfoTest.cs +++ b/src/Discovery/test/Eureka.Test/AppInfo/InstanceInfoTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.AppInfo; diff --git a/src/Discovery/test/Eureka.Test/AppInfo/LeaseInfoTest.cs b/src/Discovery/test/Eureka.Test/AppInfo/LeaseInfoTest.cs index 92e7f29bee..df7f48a365 100644 --- a/src/Discovery/test/Eureka.Test/AppInfo/LeaseInfoTest.cs +++ b/src/Discovery/test/Eureka.Test/AppInfo/LeaseInfoTest.cs @@ -6,7 +6,6 @@ using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; using Steeltoe.Discovery.Eureka.Util; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.AppInfo; diff --git a/src/Discovery/test/Eureka.Test/CloudFoundryTests.cs b/src/Discovery/test/Eureka.Test/CloudFoundryTests.cs index 2068005d56..e670a85062 100644 --- a/src/Discovery/test/Eureka.Test/CloudFoundryTests.cs +++ b/src/Discovery/test/Eureka.Test/CloudFoundryTests.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ using Steeltoe.Configuration.CloudFoundry; using Steeltoe.Configuration.CloudFoundry.ServiceBinding; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/DynamicPortAssignmentTest.cs b/src/Discovery/test/Eureka.Test/DynamicPortAssignmentTest.cs index 8096d78f8d..c2001d0783 100644 --- a/src/Discovery/test/Eureka.Test/DynamicPortAssignmentTest.cs +++ b/src/Discovery/test/Eureka.Test/DynamicPortAssignmentTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaApplicationInfoManagerTest.cs b/src/Discovery/test/Eureka.Test/EurekaApplicationInfoManagerTest.cs index a0321641bf..b61a62fe3a 100644 --- a/src/Discovery/test/Eureka.Test/EurekaApplicationInfoManagerTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaApplicationInfoManagerTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -10,7 +9,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaApplicationsHealthContributorTest.cs b/src/Discovery/test/Eureka.Test/EurekaApplicationsHealthContributorTest.cs index 32b04dd65c..f4eeb8758b 100644 --- a/src/Discovery/test/Eureka.Test/EurekaApplicationsHealthContributorTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaApplicationsHealthContributorTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; @@ -12,7 +11,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Management.Endpoint.Health; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaClientOptionsTest.cs b/src/Discovery/test/Eureka.Test/EurekaClientOptionsTest.cs index afe0d9f87b..fa5f86c4af 100644 --- a/src/Discovery/test/Eureka.Test/EurekaClientOptionsTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaClientOptionsTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Common.Utils.IO; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs b/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs index 8b510f4b6f..faea8b70ab 100644 --- a/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaDiscoveryClientTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -16,7 +15,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaHealthCheckHandlerTest.cs b/src/Discovery/test/Eureka.Test/EurekaHealthCheckHandlerTest.cs index e75ff43f78..df0279a98b 100644 --- a/src/Discovery/test/Eureka.Test/EurekaHealthCheckHandlerTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaHealthCheckHandlerTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +13,6 @@ using Steeltoe.Common.Http.HttpClientPooling; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Eureka.AppInfo; -using Xunit; using HealthCheckResult = Steeltoe.Common.HealthChecks.HealthCheckResult; using HealthStatus = Steeltoe.Common.HealthChecks.HealthStatus; diff --git a/src/Discovery/test/Eureka.Test/EurekaInstanceOptionsTest.cs b/src/Discovery/test/Eureka.Test/EurekaInstanceOptionsTest.cs index 9a0136447a..f9876f11c8 100644 --- a/src/Discovery/test/Eureka.Test/EurekaInstanceOptionsTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaInstanceOptionsTest.cs @@ -6,7 +6,6 @@ using Steeltoe.Common.Utils.IO; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaServerHealthContributorTest.cs b/src/Discovery/test/Eureka.Test/EurekaServerHealthContributorTest.cs index bc88421521..bea2e7c954 100644 --- a/src/Discovery/test/Eureka.Test/EurekaServerHealthContributorTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaServerHealthContributorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Globalization; -using FluentAssertions; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; @@ -12,7 +11,6 @@ using Steeltoe.Common.HealthChecks; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaServiceCollectionExtensionsTest.cs b/src/Discovery/test/Eureka.Test/EurekaServiceCollectionExtensionsTest.cs index 3f8e542121..36c2b27a5a 100644 --- a/src/Discovery/test/Eureka.Test/EurekaServiceCollectionExtensionsTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaServiceCollectionExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using FluentAssertions; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.Configuration; @@ -14,7 +13,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Management.Endpoint; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaServiceInstanceTest.cs b/src/Discovery/test/Eureka.Test/EurekaServiceInstanceTest.cs index 7eb96ce346..90c2acfcad 100644 --- a/src/Discovery/test/Eureka.Test/EurekaServiceInstanceTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaServiceInstanceTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/EurekaServiceUriStateManagerTest.cs b/src/Discovery/test/Eureka.Test/EurekaServiceUriStateManagerTest.cs index e257992b48..40365a06be 100644 --- a/src/Discovery/test/Eureka.Test/EurekaServiceUriStateManagerTest.cs +++ b/src/Discovery/test/Eureka.Test/EurekaServiceUriStateManagerTest.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; diff --git a/src/Discovery/test/Eureka.Test/GatedActionTest.cs b/src/Discovery/test/Eureka.Test/GatedActionTest.cs index 329e6de25b..4a5593c675 100644 --- a/src/Discovery/test/Eureka.Test/GatedActionTest.cs +++ b/src/Discovery/test/Eureka.Test/GatedActionTest.cs @@ -2,8 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using Xunit; - namespace Steeltoe.Discovery.Eureka.Test; public sealed class GatedActionTest diff --git a/src/Discovery/test/Eureka.Test/PostConfigureEurekaInstanceOptionsTest.cs b/src/Discovery/test/Eureka.Test/PostConfigureEurekaInstanceOptionsTest.cs index fbb3fdfd14..92226d0857 100644 --- a/src/Discovery/test/Eureka.Test/PostConfigureEurekaInstanceOptionsTest.cs +++ b/src/Discovery/test/Eureka.Test/PostConfigureEurekaInstanceOptionsTest.cs @@ -3,8 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Globalization; using System.Reflection; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; @@ -18,7 +18,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Management.Endpoint; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test; @@ -326,7 +325,7 @@ public void Adds_random_number_to_instance_ID_when_ports_are_zero() string[] parts = instanceOptions.InstanceId!.Split(':'); parts.Should().HaveCount(3); - int.TryParse(parts[2], out int number).Should().BeTrue(); + int.TryParse(parts[2], CultureInfo.InvariantCulture, out int number).Should().BeTrue(); number.Should().BeInRange(90_000, 99_999); } diff --git a/src/Discovery/test/Eureka.Test/Steeltoe.Discovery.Eureka.Test.csproj b/src/Discovery/test/Eureka.Test/Steeltoe.Discovery.Eureka.Test.csproj index 8f9d0a8516..b971a70bc7 100644 --- a/src/Discovery/test/Eureka.Test/Steeltoe.Discovery.Eureka.Test.csproj +++ b/src/Discovery/test/Eureka.Test/Steeltoe.Discovery.Eureka.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Discovery/test/Eureka.Test/Transport/EurekaClientTest.cs b/src/Discovery/test/Eureka.Test/Transport/EurekaClientTest.cs index 39f15ef616..0cc3592a50 100644 --- a/src/Discovery/test/Eureka.Test/Transport/EurekaClientTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/EurekaClientTest.cs @@ -5,7 +5,6 @@ using System.Net; using System.Text; using System.Text.Json; -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using RichardSzalay.MockHttp; @@ -13,7 +12,6 @@ using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationRootTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationRootTest.cs index d452e5fba0..267a7269d1 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationRootTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationRootTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationTest.cs index ffe0f29c17..4ec6333d12 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsRootTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsRootTest.cs index b98e48d5b5..28f4448ce1 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsRootTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsRootTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsTest.cs index 46e379eb97..169d7140be 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonApplicationsTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoRootTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoRootTest.cs index d56fd22c82..3ec28e0ee0 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoRootTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoRootTest.cs @@ -5,7 +5,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoTest.cs index 6a9bbbc343..49f16d9f95 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonInstanceInfoTest.cs @@ -5,7 +5,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonLeaseTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonLeaseTest.cs index 81007813d3..ff3a52c946 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonLeaseTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonLeaseTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Transport/JsonSerializationTest.cs b/src/Discovery/test/Eureka.Test/Transport/JsonSerializationTest.cs index 9620baf0a8..2fe606a6a9 100644 --- a/src/Discovery/test/Eureka.Test/Transport/JsonSerializationTest.cs +++ b/src/Discovery/test/Eureka.Test/Transport/JsonSerializationTest.cs @@ -4,7 +4,6 @@ using System.Text.Json; using Steeltoe.Discovery.Eureka.Transport; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Transport; diff --git a/src/Discovery/test/Eureka.Test/Util/DateTimeConversionsTest.cs b/src/Discovery/test/Eureka.Test/Util/DateTimeConversionsTest.cs index 304ebde13b..746a6403ec 100644 --- a/src/Discovery/test/Eureka.Test/Util/DateTimeConversionsTest.cs +++ b/src/Discovery/test/Eureka.Test/Util/DateTimeConversionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Discovery.Eureka.Util; -using Xunit; namespace Steeltoe.Discovery.Eureka.Test.Util; diff --git a/src/Discovery/test/HttpClients.Test/DiscoveryHostBuilderExtensionsTest.cs b/src/Discovery/test/HttpClients.Test/DiscoveryHostBuilderExtensionsTest.cs index bd43d2f9f6..85e39eaf3c 100644 --- a/src/Discovery/test/HttpClients.Test/DiscoveryHostBuilderExtensionsTest.cs +++ b/src/Discovery/test/HttpClients.Test/DiscoveryHostBuilderExtensionsTest.cs @@ -11,7 +11,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul; using Steeltoe.Discovery.Eureka; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test; diff --git a/src/Discovery/test/HttpClients.Test/DiscoveryWebApplicationBuilderExtensionsTest.cs b/src/Discovery/test/HttpClients.Test/DiscoveryWebApplicationBuilderExtensionsTest.cs index 13ad903804..c7312795e8 100644 --- a/src/Discovery/test/HttpClients.Test/DiscoveryWebApplicationBuilderExtensionsTest.cs +++ b/src/Discovery/test/HttpClients.Test/DiscoveryWebApplicationBuilderExtensionsTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul; using Steeltoe.Discovery.Eureka; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test; diff --git a/src/Discovery/test/HttpClients.Test/DiscoveryWebHostBuilderExtensionsTest.cs b/src/Discovery/test/HttpClients.Test/DiscoveryWebHostBuilderExtensionsTest.cs index fa74d79882..d53aa9516e 100644 --- a/src/Discovery/test/HttpClients.Test/DiscoveryWebHostBuilderExtensionsTest.cs +++ b/src/Discovery/test/HttpClients.Test/DiscoveryWebHostBuilderExtensionsTest.cs @@ -11,7 +11,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Consul; using Steeltoe.Discovery.Eureka; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test; diff --git a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientBuilderExtensionsTest.cs b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientBuilderExtensionsTest.cs index da275f58a0..31a8b91eef 100644 --- a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientBuilderExtensionsTest.cs +++ b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientBuilderExtensionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Steeltoe.Discovery.Configuration; using Steeltoe.Discovery.HttpClients.LoadBalancers; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test.LoadBalancers; diff --git a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientHandlerTest.cs b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientHandlerTest.cs index 9abff43a07..3cd035141b 100644 --- a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientHandlerTest.cs +++ b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpClientHandlerTest.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Data; -using FluentAssertions; using Steeltoe.Common; using Steeltoe.Discovery.HttpClients.LoadBalancers; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test.LoadBalancers; diff --git a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpDelegatingHandlerTest.cs b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpDelegatingHandlerTest.cs index 1fb11adeea..dd7756f040 100644 --- a/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpDelegatingHandlerTest.cs +++ b/src/Discovery/test/HttpClients.Test/LoadBalancers/DiscoveryHttpDelegatingHandlerTest.cs @@ -4,11 +4,9 @@ using System.Data; using System.Net; -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Common; using Steeltoe.Discovery.HttpClients.LoadBalancers; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test.LoadBalancers; diff --git a/src/Discovery/test/HttpClients.Test/LoadBalancers/RoundRobinLoadBalancerTest.cs b/src/Discovery/test/HttpClients.Test/LoadBalancers/RoundRobinLoadBalancerTest.cs index f7d3a8d247..20870832a3 100644 --- a/src/Discovery/test/HttpClients.Test/LoadBalancers/RoundRobinLoadBalancerTest.cs +++ b/src/Discovery/test/HttpClients.Test/LoadBalancers/RoundRobinLoadBalancerTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; @@ -10,7 +9,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Discovery.Configuration; using Steeltoe.Discovery.HttpClients.LoadBalancers; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test.LoadBalancers; diff --git a/src/Discovery/test/HttpClients.Test/RegisterMultipleDiscoveryClientsTest.cs b/src/Discovery/test/HttpClients.Test/RegisterMultipleDiscoveryClientsTest.cs index 4e022e1b47..cb7076e4b9 100644 --- a/src/Discovery/test/HttpClients.Test/RegisterMultipleDiscoveryClientsTest.cs +++ b/src/Discovery/test/HttpClients.Test/RegisterMultipleDiscoveryClientsTest.cs @@ -4,7 +4,6 @@ using System.Net; using Consul; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.TestHost; @@ -28,7 +27,6 @@ using Steeltoe.Discovery.Eureka; using Steeltoe.Discovery.Eureka.AppInfo; using Steeltoe.Discovery.Eureka.Configuration; -using Xunit; namespace Steeltoe.Discovery.HttpClients.Test; diff --git a/src/Discovery/test/HttpClients.Test/Steeltoe.Discovery.HttpClients.Test.csproj b/src/Discovery/test/HttpClients.Test/Steeltoe.Discovery.HttpClients.Test.csproj index 3acf2635bb..f05024b113 100644 --- a/src/Discovery/test/HttpClients.Test/Steeltoe.Discovery.HttpClients.Test.csproj +++ b/src/Discovery/test/HttpClients.Test/Steeltoe.Discovery.HttpClients.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj b/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj index 0a4f4bea32..d5b57e34e8 100644 --- a/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj +++ b/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe.Logging Abstractions for use with dynamic logging abstractions;logging;dynamic-logging;log-management diff --git a/src/Logging/src/DynamicLogger/LoggingBuilderExtensions.cs b/src/Logging/src/DynamicLogger/LoggingBuilderExtensions.cs index f2e8ab5c14..92505fdfa6 100644 --- a/src/Logging/src/DynamicLogger/LoggingBuilderExtensions.cs +++ b/src/Logging/src/DynamicLogger/LoggingBuilderExtensions.cs @@ -21,7 +21,7 @@ public static class LoggingBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static ILoggingBuilder AddDynamicConsole(this ILoggingBuilder builder) { diff --git a/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj b/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj index f79287c3c9..6bcf4b8d50 100644 --- a/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj +++ b/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe Dynamic Console Logger logging;dynamic-logging;console;log-management;monitoring true diff --git a/src/Logging/src/DynamicSerilog/PublicAPI.Unshipped.txt b/src/Logging/src/DynamicSerilog/PublicAPI.Unshipped.txt index e54286a698..1628612db3 100644 --- a/src/Logging/src/DynamicSerilog/PublicAPI.Unshipped.txt +++ b/src/Logging/src/DynamicSerilog/PublicAPI.Unshipped.txt @@ -1,21 +1,21 @@ #nullable enable override Steeltoe.Logging.DynamicSerilog.SerilogMessageProcessingLogger.Log(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, TState state, System.Exception? exception, System.Func! formatter) -> void -static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! hostBuilder) -> Microsoft.Extensions.Hosting.IHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! hostBuilder, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! hostBuilder, System.Action? configureLogger) -> Microsoft.Extensions.Hosting.IHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! hostBuilder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureLogger) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! builder, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Action? configureLogger) -> Microsoft.Extensions.Hosting.IHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Logging.DynamicSerilog.SerilogLoggingBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Logging.ILoggingBuilder! builder) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Steeltoe.Logging.DynamicSerilog.SerilogLoggingBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, bool preserveDefaultConsole) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Steeltoe.Logging.DynamicSerilog.SerilogLoggingBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Serilog.LoggerConfiguration? serilogConfiguration) -> Microsoft.Extensions.Logging.ILoggingBuilder! static Steeltoe.Logging.DynamicSerilog.SerilogLoggingBuilderExtensions.AddDynamicSerilog(this Microsoft.Extensions.Logging.ILoggingBuilder! builder, Serilog.LoggerConfiguration? serilogConfiguration, bool preserveDefaultConsole) -> Microsoft.Extensions.Logging.ILoggingBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! hostBuilder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! hostBuilder, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! hostBuilder, System.Action? configureLogger) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebApplicationBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! hostBuilder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, System.Action? configureLogger) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! -static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! hostBuilder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Action? configureLogger) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! +static Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions.AddDynamicSerilog(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Action? configureLogger, bool preserveDefaultConsole) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! Steeltoe.Logging.DynamicSerilog.DynamicSerilogLoggerProvider Steeltoe.Logging.DynamicSerilog.DynamicSerilogLoggerProvider.DynamicSerilogLoggerProvider(Microsoft.Extensions.Options.IOptionsMonitor! serilogOptionsMonitor, System.Collections.Generic.IEnumerable! messageProcessors) -> void Steeltoe.Logging.DynamicSerilog.MinimumLevel @@ -23,6 +23,7 @@ Steeltoe.Logging.DynamicSerilog.MinimumLevel.Default.get -> Serilog.Events.LogEv Steeltoe.Logging.DynamicSerilog.MinimumLevel.Default.set -> void Steeltoe.Logging.DynamicSerilog.MinimumLevel.MinimumLevel() -> void Steeltoe.Logging.DynamicSerilog.MinimumLevel.Override.get -> System.Collections.Generic.IDictionary! +Steeltoe.Logging.DynamicSerilog.SerilogHostApplicationBuilderExtensions Steeltoe.Logging.DynamicSerilog.SerilogHostBuilderExtensions Steeltoe.Logging.DynamicSerilog.SerilogLoggingBuilderExtensions Steeltoe.Logging.DynamicSerilog.SerilogMessageProcessingLogger @@ -31,5 +32,4 @@ Steeltoe.Logging.DynamicSerilog.SerilogOptions Steeltoe.Logging.DynamicSerilog.SerilogOptions.MinimumLevel.get -> Steeltoe.Logging.DynamicSerilog.MinimumLevel? Steeltoe.Logging.DynamicSerilog.SerilogOptions.MinimumLevel.set -> void Steeltoe.Logging.DynamicSerilog.SerilogOptions.SerilogOptions() -> void -Steeltoe.Logging.DynamicSerilog.SerilogWebApplicationBuilderExtensions Steeltoe.Logging.DynamicSerilog.SerilogWebHostBuilderExtensions diff --git a/src/Logging/src/DynamicSerilog/SerilogHostApplicationBuilderExtensions.cs b/src/Logging/src/DynamicSerilog/SerilogHostApplicationBuilderExtensions.cs new file mode 100644 index 0000000000..b7828b838f --- /dev/null +++ b/src/Logging/src/DynamicSerilog/SerilogHostApplicationBuilderExtensions.cs @@ -0,0 +1,88 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the Apache 2.0 License. +// See the LICENSE file in the project root for more information. + +using Microsoft.Extensions.Hosting; +using Serilog; +using Steeltoe.Common; +using Steeltoe.Common.Hosting; + +namespace Steeltoe.Logging.DynamicSerilog; + +public static class SerilogHostApplicationBuilderExtensions +{ + /// + /// Adds Serilog with Console sink, wrapped in a . + /// + /// + /// The to configure. + /// + /// + /// The incoming so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddDynamicSerilog(this IHostApplicationBuilder builder) + { + return AddDynamicSerilog(builder, null, false); + } + + /// + /// Adds Serilog with Console sink, wrapped in a . + /// + /// + /// The to configure. + /// + /// + /// Enables to configure Serilog from code instead of configuration. + /// + /// + /// The incoming so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddDynamicSerilog(this IHostApplicationBuilder builder, + Action? configureLogger) + { + return AddDynamicSerilog(builder, configureLogger, false); + } + + /// + /// Adds Serilog with Console sink, wrapped in a . + /// + /// + /// The to configure. + /// + /// + /// When set to true, does not remove existing logger providers. + /// + /// + /// The incoming so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddDynamicSerilog(this IHostApplicationBuilder builder, bool preserveDefaultConsole) + { + return AddDynamicSerilog(builder, null, preserveDefaultConsole); + } + + /// + /// Adds Serilog with Console sink, wrapped in a . + /// + /// + /// The to configure. + /// + /// + /// Enables to configure Serilog from code instead of configuration. + /// + /// + /// When set to true, does not remove existing logger providers. + /// + /// + /// The incoming so that additional calls can be chained. + /// + public static IHostApplicationBuilder AddDynamicSerilog(this IHostApplicationBuilder builder, + Action? configureLogger, bool preserveDefaultConsole) + { + ArgumentGuard.NotNull(builder); + + HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder); + wrapper.AddDynamicSerilog(HostBuilderContextWrapper.WrapAction(configureLogger), preserveDefaultConsole); + + return builder; + } +} diff --git a/src/Logging/src/DynamicSerilog/SerilogHostBuilderExtensions.cs b/src/Logging/src/DynamicSerilog/SerilogHostBuilderExtensions.cs index 4e96ae6e56..a05ab6c80a 100644 --- a/src/Logging/src/DynamicSerilog/SerilogHostBuilderExtensions.cs +++ b/src/Logging/src/DynamicSerilog/SerilogHostBuilderExtensions.cs @@ -14,55 +14,55 @@ public static class SerilogHostBuilderExtensions /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IHostBuilder AddDynamicSerilog(this IHostBuilder hostBuilder) + public static IHostBuilder AddDynamicSerilog(this IHostBuilder builder) { - return AddDynamicSerilog(hostBuilder, null, false); + return AddDynamicSerilog(builder, null, false); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// /// Enables to configure Serilog from code instead of configuration. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IHostBuilder AddDynamicSerilog(this IHostBuilder hostBuilder, Action? configureLogger) + public static IHostBuilder AddDynamicSerilog(this IHostBuilder builder, Action? configureLogger) { - return AddDynamicSerilog(hostBuilder, configureLogger, false); + return AddDynamicSerilog(builder, configureLogger, false); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IHostBuilder AddDynamicSerilog(this IHostBuilder hostBuilder, bool preserveDefaultConsole) + public static IHostBuilder AddDynamicSerilog(this IHostBuilder builder, bool preserveDefaultConsole) { - return AddDynamicSerilog(hostBuilder, null, preserveDefaultConsole); + return AddDynamicSerilog(builder, null, preserveDefaultConsole); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// @@ -72,16 +72,16 @@ public static IHostBuilder AddDynamicSerilog(this IHostBuilder hostBuilder, bool /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IHostBuilder AddDynamicSerilog(this IHostBuilder hostBuilder, Action? configureLogger, + public static IHostBuilder AddDynamicSerilog(this IHostBuilder builder, Action? configureLogger, bool preserveDefaultConsole) { - ArgumentGuard.NotNull(hostBuilder); + ArgumentGuard.NotNull(builder); - HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(hostBuilder); + HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder); wrapper.AddDynamicSerilog(HostBuilderContextWrapper.WrapAction(configureLogger), preserveDefaultConsole); - return hostBuilder; + return builder; } } diff --git a/src/Logging/src/DynamicSerilog/SerilogLoggingBuilderExtensions.cs b/src/Logging/src/DynamicSerilog/SerilogLoggingBuilderExtensions.cs index ee5b80f6ad..d956f405b8 100644 --- a/src/Logging/src/DynamicSerilog/SerilogLoggingBuilderExtensions.cs +++ b/src/Logging/src/DynamicSerilog/SerilogLoggingBuilderExtensions.cs @@ -20,7 +20,7 @@ public static class SerilogLoggingBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder) { @@ -37,7 +37,7 @@ public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder) /// Enables to configure Serilog from code instead of configuration. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, LoggerConfiguration? serilogConfiguration) { @@ -54,7 +54,7 @@ public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, Lo /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, bool preserveDefaultConsole) { @@ -74,7 +74,7 @@ public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, bo /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static ILoggingBuilder AddDynamicSerilog(this ILoggingBuilder builder, LoggerConfiguration? serilogConfiguration, bool preserveDefaultConsole) { diff --git a/src/Logging/src/DynamicSerilog/SerilogWebApplicationBuilderExtensions.cs b/src/Logging/src/DynamicSerilog/SerilogWebApplicationBuilderExtensions.cs deleted file mode 100644 index e291bd0b8c..0000000000 --- a/src/Logging/src/DynamicSerilog/SerilogWebApplicationBuilderExtensions.cs +++ /dev/null @@ -1,88 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the Apache 2.0 License. -// See the LICENSE file in the project root for more information. - -using Microsoft.AspNetCore.Builder; -using Serilog; -using Steeltoe.Common; -using Steeltoe.Common.Hosting; - -namespace Steeltoe.Logging.DynamicSerilog; - -public static class SerilogWebApplicationBuilderExtensions -{ - /// - /// Adds Serilog with Console sink, wrapped in a . - /// - /// - /// The to configure. - /// - /// - /// The incoming , so that additional calls can be chained. - /// - public static WebApplicationBuilder AddDynamicSerilog(this WebApplicationBuilder hostBuilder) - { - return AddDynamicSerilog(hostBuilder, null, false); - } - - /// - /// Adds Serilog with Console sink, wrapped in a . - /// - /// - /// The to configure. - /// - /// - /// Enables to configure Serilog from code instead of configuration. - /// - /// - /// The incoming , so that additional calls can be chained. - /// - public static WebApplicationBuilder AddDynamicSerilog(this WebApplicationBuilder hostBuilder, - Action? configureLogger) - { - return AddDynamicSerilog(hostBuilder, configureLogger, false); - } - - /// - /// Adds Serilog with Console sink, wrapped in a . - /// - /// - /// The to configure. - /// - /// - /// When set to true, does not remove existing logger providers. - /// - /// - /// The incoming , so that additional calls can be chained. - /// - public static WebApplicationBuilder AddDynamicSerilog(this WebApplicationBuilder hostBuilder, bool preserveDefaultConsole) - { - return AddDynamicSerilog(hostBuilder, null, preserveDefaultConsole); - } - - /// - /// Adds Serilog with Console sink, wrapped in a . - /// - /// - /// The to configure. - /// - /// - /// Enables to configure Serilog from code instead of configuration. - /// - /// - /// When set to true, does not remove existing logger providers. - /// - /// - /// The incoming , so that additional calls can be chained. - /// - public static WebApplicationBuilder AddDynamicSerilog(this WebApplicationBuilder hostBuilder, - Action? configureLogger, bool preserveDefaultConsole) - { - ArgumentGuard.NotNull(hostBuilder); - - HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(hostBuilder); - wrapper.AddDynamicSerilog(HostBuilderContextWrapper.WrapAction(configureLogger), preserveDefaultConsole); - - return hostBuilder; - } -} diff --git a/src/Logging/src/DynamicSerilog/SerilogWebHostBuilderExtensions.cs b/src/Logging/src/DynamicSerilog/SerilogWebHostBuilderExtensions.cs index c887c0df75..ea2d85c58c 100644 --- a/src/Logging/src/DynamicSerilog/SerilogWebHostBuilderExtensions.cs +++ b/src/Logging/src/DynamicSerilog/SerilogWebHostBuilderExtensions.cs @@ -14,55 +14,55 @@ public static class SerilogWebHostBuilderExtensions /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder hostBuilder) + public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder builder) { - return AddDynamicSerilog(hostBuilder, null, false); + return AddDynamicSerilog(builder, null, false); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// /// Enables to configure Serilog from code instead of configuration. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder hostBuilder, Action? configureLogger) + public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder builder, Action? configureLogger) { - return AddDynamicSerilog(hostBuilder, configureLogger, false); + return AddDynamicSerilog(builder, configureLogger, false); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder hostBuilder, bool preserveDefaultConsole) + public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder builder, bool preserveDefaultConsole) { - return AddDynamicSerilog(hostBuilder, null, preserveDefaultConsole); + return AddDynamicSerilog(builder, null, preserveDefaultConsole); } /// /// Adds Serilog with Console sink, wrapped in a . /// - /// + /// /// The to configure. /// /// @@ -72,16 +72,16 @@ public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder hostBuilder /// When set to true, does not remove existing logger providers. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder hostBuilder, Action? configureLogger, + public static IWebHostBuilder AddDynamicSerilog(this IWebHostBuilder builder, Action? configureLogger, bool preserveDefaultConsole) { - ArgumentGuard.NotNull(hostBuilder); + ArgumentGuard.NotNull(builder); - HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(hostBuilder); + HostBuilderWrapper wrapper = HostBuilderWrapper.Wrap(builder); wrapper.AddDynamicSerilog(HostBuilderContextWrapper.WrapAction(configureLogger), preserveDefaultConsole); - return hostBuilder; + return builder; } } diff --git a/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj b/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj index 918564847a..e900b5baa7 100644 --- a/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj +++ b/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe library for enabling dynamic management of Serilog. logging;dynamic-logging;serilog;log-management;monitoring true @@ -15,8 +15,8 @@ - - + + diff --git a/src/Logging/test/DynamicLogger.Test/DynamicConsoleLoggerProviderTest.cs b/src/Logging/test/DynamicLogger.Test/DynamicConsoleLoggerProviderTest.cs index c32d22e1ca..e9aa172f49 100644 --- a/src/Logging/test/DynamicLogger.Test/DynamicConsoleLoggerProviderTest.cs +++ b/src/Logging/test/DynamicLogger.Test/DynamicConsoleLoggerProviderTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using Xunit; namespace Steeltoe.Logging.DynamicLogger.Test; diff --git a/src/Logging/test/DynamicLogger.Test/DynamicLoggerHostBuilderExtensionsTest.cs b/src/Logging/test/DynamicLogger.Test/DynamicLoggerHostBuilderExtensionsTest.cs index 709d73ad2d..253dd1b45a 100644 --- a/src/Logging/test/DynamicLogger.Test/DynamicLoggerHostBuilderExtensionsTest.cs +++ b/src/Logging/test/DynamicLogger.Test/DynamicLoggerHostBuilderExtensionsTest.cs @@ -2,13 +2,11 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; -using Xunit; namespace Steeltoe.Logging.DynamicLogger.Test; diff --git a/src/Logging/test/DynamicLogger.Test/LoggingBuilderExtensionsTest.cs b/src/Logging/test/DynamicLogger.Test/LoggingBuilderExtensionsTest.cs index 95c2abfa51..c1f590cc73 100644 --- a/src/Logging/test/DynamicLogger.Test/LoggingBuilderExtensionsTest.cs +++ b/src/Logging/test/DynamicLogger.Test/LoggingBuilderExtensionsTest.cs @@ -3,14 +3,12 @@ // See the LICENSE file in the project root for more information. using A.B.C.D; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Logging.DynamicLogger.Test; diff --git a/src/Logging/test/DynamicLogger.Test/Steeltoe.Logging.DynamicLogger.Test.csproj b/src/Logging/test/DynamicLogger.Test/Steeltoe.Logging.DynamicLogger.Test.csproj index 0bb67671cc..bfbc03f95b 100644 --- a/src/Logging/test/DynamicLogger.Test/Steeltoe.Logging.DynamicLogger.Test.csproj +++ b/src/Logging/test/DynamicLogger.Test/Steeltoe.Logging.DynamicLogger.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Logging/test/DynamicSerilog.Test/DynamicSerilogLoggerProviderTest.cs b/src/Logging/test/DynamicSerilog.Test/DynamicSerilogLoggerProviderTest.cs index d3ad0e320c..fed7141d47 100644 --- a/src/Logging/test/DynamicSerilog.Test/DynamicSerilogLoggerProviderTest.cs +++ b/src/Logging/test/DynamicSerilog.Test/DynamicSerilogLoggerProviderTest.cs @@ -4,13 +4,11 @@ using System.Text.RegularExpressions; using A.B.C.D; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using Serilog.Context; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Logging.DynamicSerilog.Test; diff --git a/src/Logging/test/DynamicSerilog.Test/SerilogConfigurationExtensionsTest.cs b/src/Logging/test/DynamicSerilog.Test/SerilogConfigurationExtensionsTest.cs index 1eae85e444..1e53289557 100644 --- a/src/Logging/test/DynamicSerilog.Test/SerilogConfigurationExtensionsTest.cs +++ b/src/Logging/test/DynamicSerilog.Test/SerilogConfigurationExtensionsTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Serilog; using Serilog.Events; -using Xunit; namespace Steeltoe.Logging.DynamicSerilog.Test; diff --git a/src/Logging/test/DynamicSerilog.Test/SerilogDynamicLoggingBuilderTest.cs b/src/Logging/test/DynamicSerilog.Test/SerilogDynamicLoggingBuilderTest.cs index 234df8266c..1628f8d8d7 100644 --- a/src/Logging/test/DynamicSerilog.Test/SerilogDynamicLoggingBuilderTest.cs +++ b/src/Logging/test/DynamicSerilog.Test/SerilogDynamicLoggingBuilderTest.cs @@ -3,12 +3,10 @@ // See the LICENSE file in the project root for more information. using A.B.C.D; -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Console; -using Xunit; namespace Steeltoe.Logging.DynamicSerilog.Test; diff --git a/src/Logging/test/DynamicSerilog.Test/SerilogWebApplicationBuilderTest.cs b/src/Logging/test/DynamicSerilog.Test/SerilogWebApplicationBuilderTest.cs index 58ae5c2223..e513f89559 100644 --- a/src/Logging/test/DynamicSerilog.Test/SerilogWebApplicationBuilderTest.cs +++ b/src/Logging/test/DynamicSerilog.Test/SerilogWebApplicationBuilderTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ using Serilog.Events; using Serilog.Exceptions; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Logging.DynamicSerilog.Test; @@ -27,9 +25,12 @@ public void OnlyApplicableFilters_AreApplied() { var testSink = new TestSink(); - WebApplication host = TestHelpers.GetTestWebApplicationBuilder().AddDynamicSerilog((_, loggerConfiguration) => - loggerConfiguration.MinimumLevel.Error().Enrich.WithExceptionDetails().MinimumLevel.Override("Microsoft", LogEventLevel.Warning).WriteTo - .Sink(testSink)).Build(); + WebApplicationBuilder builder = TestHelpers.GetTestWebApplicationBuilder(); + + builder.AddDynamicSerilog((_, loggerConfiguration) => loggerConfiguration.MinimumLevel.Error().Enrich.WithExceptionDetails().MinimumLevel + .Override("Microsoft", LogEventLevel.Warning).WriteTo.Sink(testSink)); + + WebApplication host = builder.Build(); var startup = new Startup(host.Services.GetRequiredService>()); startup.ConfigureServices(null); diff --git a/src/Logging/test/DynamicSerilog.Test/SerilogWebHostBuilderTest.cs b/src/Logging/test/DynamicSerilog.Test/SerilogWebHostBuilderTest.cs index 29d5149714..b10c74dd5a 100644 --- a/src/Logging/test/DynamicSerilog.Test/SerilogWebHostBuilderTest.cs +++ b/src/Logging/test/DynamicSerilog.Test/SerilogWebHostBuilderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -11,7 +10,6 @@ using Serilog.Core; using Serilog.Events; using Serilog.Exceptions; -using Xunit; namespace Steeltoe.Logging.DynamicSerilog.Test; diff --git a/src/Logging/test/DynamicSerilog.Test/Steeltoe.Logging.DynamicSerilog.Test.csproj b/src/Logging/test/DynamicSerilog.Test/Steeltoe.Logging.DynamicSerilog.Test.csproj index e069747fc7..bb7bc5dadc 100644 --- a/src/Logging/test/DynamicSerilog.Test/Steeltoe.Logging.DynamicSerilog.Test.csproj +++ b/src/Logging/test/DynamicSerilog.Test/Steeltoe.Logging.DynamicSerilog.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj b/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj index 221d442277..215fa39aed 100644 --- a/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj +++ b/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe.Management Abstractions for application management and monitoring abstractions;log-management;monitoring;actuator diff --git a/src/Management/src/Endpoint/ManagementWebApplicationBuilderExtensions.cs b/src/Management/src/Endpoint/ManagementHostApplicationBuilderExtensions.cs old mode 100755 new mode 100644 similarity index 60% rename from src/Management/src/Endpoint/ManagementWebApplicationBuilderExtensions.cs rename to src/Management/src/Endpoint/ManagementHostApplicationBuilderExtensions.cs index 6bfdb7ba35..dbcc8c4386 --- a/src/Management/src/Endpoint/ManagementWebApplicationBuilderExtensions.cs +++ b/src/Management/src/Endpoint/ManagementHostApplicationBuilderExtensions.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Cors.Infrastructure; +using Microsoft.Extensions.Hosting; using Steeltoe.Common; using Steeltoe.Common.HealthChecks; using Steeltoe.Common.Hosting; @@ -11,18 +12,18 @@ namespace Steeltoe.Management.Endpoint; -public static class ManagementWebApplicationBuilderExtensions +public static class ManagementHostApplicationBuilderExtensions { /// /// Adds the Database Migrations actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddDbMigrationsActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddDbMigrationsActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -36,12 +37,12 @@ public static WebApplicationBuilder AddDbMigrationsActuator(this WebApplicationB /// Adds the Environment actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddEnvironmentActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddEnvironmentActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -55,12 +56,12 @@ public static WebApplicationBuilder AddEnvironmentActuator(this WebApplicationBu /// Adds the Health actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddHealthActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -74,15 +75,15 @@ public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder /// Adds the Health actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder builder, params Type[] contributorTypes) + public static IHostApplicationBuilder AddHealthActuator(this IHostApplicationBuilder builder, params Type[] contributorTypes) { ArgumentGuard.NotNull(builder); ArgumentGuard.NotNull(contributorTypes); @@ -97,7 +98,7 @@ public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder /// Adds the Health actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// Custom health aggregator. @@ -106,9 +107,9 @@ public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder builder, IHealthAggregator aggregator, params Type[] contributorTypes) + public static IHostApplicationBuilder AddHealthActuator(this IHostApplicationBuilder builder, IHealthAggregator aggregator, params Type[] contributorTypes) { ArgumentGuard.NotNull(builder); ArgumentGuard.NotNull(aggregator); @@ -124,12 +125,12 @@ public static WebApplicationBuilder AddHealthActuator(this WebApplicationBuilder /// Adds the HeapDump actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddHeapDumpActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddHeapDumpActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -143,12 +144,12 @@ public static WebApplicationBuilder AddHeapDumpActuator(this WebApplicationBuild /// Adds the Hypermedia actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddHypermediaActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddHypermediaActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -162,12 +163,12 @@ public static WebApplicationBuilder AddHypermediaActuator(this WebApplicationBui /// Adds the Info actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddInfoActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddInfoActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -181,15 +182,15 @@ public static WebApplicationBuilder AddInfoActuator(this WebApplicationBuilder b /// Adds the Info actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// Contributors to application information. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddInfoActuator(this WebApplicationBuilder builder, params IInfoContributor[] contributors) + public static IHostApplicationBuilder AddInfoActuator(this IHostApplicationBuilder builder, params IInfoContributor[] contributors) { ArgumentGuard.NotNull(builder); ArgumentGuard.NotNull(contributors); @@ -204,12 +205,12 @@ public static WebApplicationBuilder AddInfoActuator(this WebApplicationBuilder b /// Adds the Loggers actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddLoggersActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddLoggersActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -223,12 +224,12 @@ public static WebApplicationBuilder AddLoggersActuator(this WebApplicationBuilde /// Adds the Mappings actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddMappingsActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddMappingsActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -242,12 +243,12 @@ public static WebApplicationBuilder AddMappingsActuator(this WebApplicationBuild /// Adds the Metrics actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddMetricsActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddMetricsActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -261,12 +262,12 @@ public static WebApplicationBuilder AddMetricsActuator(this WebApplicationBuilde /// Adds the Refresh actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddRefreshActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddRefreshActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -280,12 +281,12 @@ public static WebApplicationBuilder AddRefreshActuator(this WebApplicationBuilde /// Adds the ThreadDump actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddThreadDumpActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddThreadDumpActuator(this IHostApplicationBuilder builder) { return AddThreadDumpActuator(builder, MediaTypeVersion.V2); } @@ -294,15 +295,15 @@ public static WebApplicationBuilder AddThreadDumpActuator(this WebApplicationBui /// Adds the ThreadDump actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddThreadDumpActuator(this WebApplicationBuilder builder, MediaTypeVersion mediaTypeVersion) + public static IHostApplicationBuilder AddThreadDumpActuator(this IHostApplicationBuilder builder, MediaTypeVersion mediaTypeVersion) { ArgumentGuard.NotNull(builder); @@ -316,12 +317,12 @@ public static WebApplicationBuilder AddThreadDumpActuator(this WebApplicationBui /// Adds the Trace actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddTraceActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddTraceActuator(this IHostApplicationBuilder builder) { return AddTraceActuator(builder, MediaTypeVersion.V2); } @@ -330,15 +331,15 @@ public static WebApplicationBuilder AddTraceActuator(this WebApplicationBuilder /// Adds the Trace actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddTraceActuator(this WebApplicationBuilder builder, MediaTypeVersion mediaTypeVersion) + public static IHostApplicationBuilder AddTraceActuator(this IHostApplicationBuilder builder, MediaTypeVersion mediaTypeVersion) { ArgumentGuard.NotNull(builder); @@ -352,12 +353,12 @@ public static WebApplicationBuilder AddTraceActuator(this WebApplicationBuilder /// Adds an actuator endpoint that lists all injectable services that are registered in the IoC container. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddServicesActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddServicesActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -371,12 +372,12 @@ public static WebApplicationBuilder AddServicesActuator(this WebApplicationBuild /// Adds the Cloud Foundry actuator to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddCloudFoundryActuator(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddCloudFoundryActuator(this IHostApplicationBuilder builder) { ArgumentGuard.NotNull(builder); @@ -390,12 +391,12 @@ public static WebApplicationBuilder AddCloudFoundryActuator(this WebApplicationB /// Adds all Steeltoe Actuators to the application. /// /// - /// The to configure. + /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder builder) + public static IHostApplicationBuilder AddAllActuators(this IHostApplicationBuilder builder) { return AddAllActuators(builder, null); } @@ -404,15 +405,15 @@ public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder b /// Adds all Steeltoe Actuators to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// . /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder builder, Action? configureEndpoints) + public static IHostApplicationBuilder AddAllActuators(this IHostApplicationBuilder builder, Action? configureEndpoints) { return AddAllActuators(builder, configureEndpoints, MediaTypeVersion.V2, null); } @@ -421,7 +422,7 @@ public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder b /// Adds all Steeltoe Actuators to the application. /// /// - /// The to configure. + /// The to configure. /// /// /// . @@ -433,9 +434,9 @@ public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder b /// Customize the CORS policy. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// - public static WebApplicationBuilder AddAllActuators(this WebApplicationBuilder builder, Action? configureEndpoints, + public static IHostApplicationBuilder AddAllActuators(this IHostApplicationBuilder builder, Action? configureEndpoints, MediaTypeVersion mediaTypeVersion, Action? buildCorsPolicy) { ArgumentGuard.NotNull(builder); diff --git a/src/Management/src/Endpoint/ManagementHostBuilderExtensions.cs b/src/Management/src/Endpoint/ManagementHostBuilderExtensions.cs index 3fb8b66b58..2f5024b0c6 100644 --- a/src/Management/src/Endpoint/ManagementHostBuilderExtensions.cs +++ b/src/Management/src/Endpoint/ManagementHostBuilderExtensions.cs @@ -21,7 +21,7 @@ public static class ManagementHostBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddDbMigrationsActuator(this IHostBuilder builder) { @@ -40,7 +40,7 @@ public static IHostBuilder AddDbMigrationsActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddEnvironmentActuator(this IHostBuilder builder) { @@ -59,7 +59,7 @@ public static IHostBuilder AddEnvironmentActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddHealthActuator(this IHostBuilder builder) { @@ -81,7 +81,7 @@ public static IHostBuilder AddHealthActuator(this IHostBuilder builder) /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddHealthActuator(this IHostBuilder builder, params Type[] contributorTypes) { @@ -107,7 +107,7 @@ public static IHostBuilder AddHealthActuator(this IHostBuilder builder, params T /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddHealthActuator(this IHostBuilder builder, IHealthAggregator aggregator, params Type[] contributorTypes) { @@ -128,7 +128,7 @@ public static IHostBuilder AddHealthActuator(this IHostBuilder builder, IHealthA /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddHeapDumpActuator(this IHostBuilder builder) { @@ -147,7 +147,7 @@ public static IHostBuilder AddHeapDumpActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddHypermediaActuator(this IHostBuilder builder) { @@ -166,7 +166,7 @@ public static IHostBuilder AddHypermediaActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddInfoActuator(this IHostBuilder builder) { @@ -188,7 +188,7 @@ public static IHostBuilder AddInfoActuator(this IHostBuilder builder) /// Contributors to application information. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddInfoActuator(this IHostBuilder builder, params IInfoContributor[] contributors) { @@ -208,7 +208,7 @@ public static IHostBuilder AddInfoActuator(this IHostBuilder builder, params IIn /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddLoggersActuator(this IHostBuilder builder) { @@ -227,7 +227,7 @@ public static IHostBuilder AddLoggersActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddMappingsActuator(this IHostBuilder builder) { @@ -246,7 +246,7 @@ public static IHostBuilder AddMappingsActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddMetricsActuator(this IHostBuilder builder) { @@ -265,7 +265,7 @@ public static IHostBuilder AddMetricsActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddRefreshActuator(this IHostBuilder builder) { @@ -284,7 +284,7 @@ public static IHostBuilder AddRefreshActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddThreadDumpActuator(this IHostBuilder builder) { @@ -301,7 +301,7 @@ public static IHostBuilder AddThreadDumpActuator(this IHostBuilder builder) /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddThreadDumpActuator(this IHostBuilder builder, MediaTypeVersion mediaTypeVersion) { @@ -320,7 +320,7 @@ public static IHostBuilder AddThreadDumpActuator(this IHostBuilder builder, Medi /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddTraceActuator(this IHostBuilder builder) { @@ -337,7 +337,7 @@ public static IHostBuilder AddTraceActuator(this IHostBuilder builder) /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddTraceActuator(this IHostBuilder builder, MediaTypeVersion mediaTypeVersion) { @@ -356,7 +356,7 @@ public static IHostBuilder AddTraceActuator(this IHostBuilder builder, MediaType /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddServicesActuator(this IHostBuilder builder) { @@ -375,7 +375,7 @@ public static IHostBuilder AddServicesActuator(this IHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddCloudFoundryActuator(this IHostBuilder builder) { @@ -397,7 +397,7 @@ public static IHostBuilder AddCloudFoundryActuator(this IHostBuilder builder) /// Does not add platform specific features (like for Cloud Foundry or Kubernetes). /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddAllActuators(this IHostBuilder builder) { @@ -417,7 +417,7 @@ public static IHostBuilder AddAllActuators(this IHostBuilder builder) /// Does not add platform specific features (like for Cloud Foundry or Kubernetes). /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddAllActuators(this IHostBuilder builder, Action? configureEndpoints) { @@ -443,7 +443,7 @@ public static IHostBuilder AddAllActuators(this IHostBuilder builder, Action /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IHostBuilder AddAllActuators(this IHostBuilder builder, Action? configureEndpoints, MediaTypeVersion mediaTypeVersion, Action? buildCorsPolicy) diff --git a/src/Management/src/Endpoint/ManagementPort/ManagementPortWebHostBuilderExtensions.cs b/src/Management/src/Endpoint/ManagementPort/ManagementPortWebHostBuilderExtensions.cs index 7f25c85249..48c7988d62 100644 --- a/src/Management/src/Endpoint/ManagementPort/ManagementPortWebHostBuilderExtensions.cs +++ b/src/Management/src/Endpoint/ManagementPort/ManagementPortWebHostBuilderExtensions.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. +using System.Globalization; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Steeltoe.Common; @@ -14,24 +15,24 @@ internal static class ManagementPortWebHostBuilderExtensions private const string ManagementPortKey = "management:endpoints:port"; private const string ManagementSslKey = "management:endpoints:sslenabled"; - public static IWebHostBuilder AddManagementPort(this IWebHostBuilder webHostBuilder) + public static IWebHostBuilder AddManagementPort(this IWebHostBuilder builder) { - (int? httpPort, int? httpsPort) = GetManagementPorts(webHostBuilder); + (int? httpPort, int? httpsPort) = GetManagementPorts(builder); if (httpPort.HasValue || httpsPort.HasValue) { - webHostBuilder.UseCloudHosting(httpPort, httpsPort); + builder.UseCloudHosting(httpPort, httpsPort); } - return webHostBuilder; + return builder; } - private static (int? HttpPort, int? HttpsPort) GetManagementPorts(this IWebHostBuilder webHostBuilder) + private static (int? HttpPort, int? HttpsPort) GetManagementPorts(this IWebHostBuilder builder) { - ArgumentGuard.NotNull(webHostBuilder); + ArgumentGuard.NotNull(builder); - string? portSetting = webHostBuilder.GetSetting(ManagementPortKey); - string? sslSetting = webHostBuilder.GetSetting(ManagementSslKey); + string? portSetting = builder.GetSetting(ManagementPortKey); + string? sslSetting = builder.GetSetting(ManagementSslKey); int? httpPort = null; int? httpsPort = null; @@ -43,7 +44,7 @@ private static (int? HttpPort, int? HttpsPort) GetManagementPorts(this IWebHostB sslSetting = configuration?[ManagementSslKey]; } - if (int.TryParse(portSetting, out int managementPort) && managementPort > 0) + if (int.TryParse(portSetting, CultureInfo.InvariantCulture, out int managementPort) && managementPort > 0) { if (bool.TryParse(sslSetting, out bool enableSsl) && enableSsl) { diff --git a/src/Management/src/Endpoint/ManagementWebHostBuilderExtensions.cs b/src/Management/src/Endpoint/ManagementWebHostBuilderExtensions.cs index c93e0c42d0..20e320b437 100755 --- a/src/Management/src/Endpoint/ManagementWebHostBuilderExtensions.cs +++ b/src/Management/src/Endpoint/ManagementWebHostBuilderExtensions.cs @@ -21,7 +21,7 @@ public static class ManagementWebHostBuilderExtensions /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddDbMigrationsActuator(this IWebHostBuilder builder) { @@ -40,7 +40,7 @@ public static IWebHostBuilder AddDbMigrationsActuator(this IWebHostBuilder build /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddEnvironmentActuator(this IWebHostBuilder builder) { @@ -59,7 +59,7 @@ public static IWebHostBuilder AddEnvironmentActuator(this IWebHostBuilder builde /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder) { @@ -81,7 +81,7 @@ public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder) /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder, params Type[] contributorTypes) { @@ -107,7 +107,7 @@ public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder, pa /// Types that contribute to the overall health of the app. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder, IHealthAggregator aggregator, params Type[] contributorTypes) { @@ -128,7 +128,7 @@ public static IWebHostBuilder AddHealthActuator(this IWebHostBuilder builder, IH /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddHeapDumpActuator(this IWebHostBuilder builder) { @@ -147,7 +147,7 @@ public static IWebHostBuilder AddHeapDumpActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddHypermediaActuator(this IWebHostBuilder builder) { @@ -166,7 +166,7 @@ public static IWebHostBuilder AddHypermediaActuator(this IWebHostBuilder builder /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddInfoActuator(this IWebHostBuilder builder) { @@ -188,7 +188,7 @@ public static IWebHostBuilder AddInfoActuator(this IWebHostBuilder builder) /// Contributors to application information. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddInfoActuator(this IWebHostBuilder builder, params IInfoContributor[] contributors) { @@ -208,7 +208,7 @@ public static IWebHostBuilder AddInfoActuator(this IWebHostBuilder builder, para /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddLoggersActuator(this IWebHostBuilder builder) { @@ -227,7 +227,7 @@ public static IWebHostBuilder AddLoggersActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddMappingsActuator(this IWebHostBuilder builder) { @@ -246,7 +246,7 @@ public static IWebHostBuilder AddMappingsActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddMetricsActuator(this IWebHostBuilder builder) { @@ -265,7 +265,7 @@ public static IWebHostBuilder AddMetricsActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddRefreshActuator(this IWebHostBuilder builder) { @@ -284,7 +284,7 @@ public static IWebHostBuilder AddRefreshActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddThreadDumpActuator(this IWebHostBuilder builder) { @@ -301,7 +301,7 @@ public static IWebHostBuilder AddThreadDumpActuator(this IWebHostBuilder builder /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddThreadDumpActuator(this IWebHostBuilder builder, MediaTypeVersion mediaTypeVersion) { @@ -320,7 +320,7 @@ public static IWebHostBuilder AddThreadDumpActuator(this IWebHostBuilder builder /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddTraceActuator(this IWebHostBuilder builder) { @@ -337,7 +337,7 @@ public static IWebHostBuilder AddTraceActuator(this IWebHostBuilder builder) /// Specify the media type version to use in the response. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddTraceActuator(this IWebHostBuilder builder, MediaTypeVersion mediaTypeVersion) { @@ -356,7 +356,7 @@ public static IWebHostBuilder AddTraceActuator(this IWebHostBuilder builder, Med /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddServicesActuator(this IWebHostBuilder builder) { @@ -375,7 +375,7 @@ public static IWebHostBuilder AddServicesActuator(this IWebHostBuilder builder) /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddCloudFoundryActuator(this IWebHostBuilder builder) { @@ -394,7 +394,7 @@ public static IWebHostBuilder AddCloudFoundryActuator(this IWebHostBuilder build /// The to configure. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddAllActuators(this IWebHostBuilder builder) { @@ -411,7 +411,7 @@ public static IWebHostBuilder AddAllActuators(this IWebHostBuilder builder) /// . /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddAllActuators(this IWebHostBuilder builder, Action? configureEndpoints) { @@ -434,7 +434,7 @@ public static IWebHostBuilder AddAllActuators(this IWebHostBuilder builder, Acti /// Customize the CORS policy. /// /// - /// The incoming , so that additional calls can be chained. + /// The incoming so that additional calls can be chained. /// public static IWebHostBuilder AddAllActuators(this IWebHostBuilder builder, Action? configureEndpoints, MediaTypeVersion mediaTypeVersion, Action? buildCorsPolicy) diff --git a/src/Management/src/Endpoint/PublicAPI.Unshipped.txt b/src/Management/src/Endpoint/PublicAPI.Unshipped.txt index 704bcba8a8..dd6b31c68e 100755 --- a/src/Management/src/Endpoint/PublicAPI.Unshipped.txt +++ b/src/Management/src/Endpoint/PublicAPI.Unshipped.txt @@ -41,6 +41,28 @@ static Steeltoe.Management.Endpoint.Info.EndpointServiceCollectionExtensions.Add static Steeltoe.Management.Endpoint.Info.ServiceCollectionExtensions.AddInfoActuatorServices(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! static Steeltoe.Management.Endpoint.Loggers.EndpointServiceCollectionExtensions.AddLoggersActuator(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void static Steeltoe.Management.Endpoint.Loggers.ServiceCollectionExtensions.AddLoggersActuatorServices(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureEndpoints) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, System.Action? configureEndpoints, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion, System.Action? buildCorsPolicy) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddCloudFoundryActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddDbMigrationsActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddEnvironmentActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddHealthActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddHealthActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, params System.Type![]! contributorTypes) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddHealthActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Steeltoe.Common.HealthChecks.IHealthAggregator! aggregator, params System.Type![]! contributorTypes) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddHeapDumpActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddHypermediaActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddInfoActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddInfoActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, params Steeltoe.Management.Info.IInfoContributor![]! contributors) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddLoggersActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddMappingsActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddMetricsActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddRefreshActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddServicesActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddThreadDumpActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddThreadDumpActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddTraceActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! +static Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions.AddTraceActuator(this Microsoft.Extensions.Hosting.IHostApplicationBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.Extensions.Hosting.IHostApplicationBuilder! static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Action? configureEndpoints) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddAllActuators(this Microsoft.Extensions.Hosting.IHostBuilder! builder, System.Action? configureEndpoints, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion, System.Action? buildCorsPolicy) -> Microsoft.Extensions.Hosting.IHostBuilder! @@ -63,28 +85,6 @@ static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddThreadDum static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddThreadDumpActuator(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddTraceActuator(this Microsoft.Extensions.Hosting.IHostBuilder! builder) -> Microsoft.Extensions.Hosting.IHostBuilder! static Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions.AddTraceActuator(this Microsoft.Extensions.Hosting.IHostBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.Extensions.Hosting.IHostBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureEndpoints) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, System.Action? configureEndpoints, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion, System.Action? buildCorsPolicy) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddCloudFoundryActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddDbMigrationsActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddEnvironmentActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddHealthActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddHealthActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, params System.Type![]! contributorTypes) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddHealthActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Steeltoe.Common.HealthChecks.IHealthAggregator! aggregator, params System.Type![]! contributorTypes) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddHeapDumpActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddHypermediaActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddInfoActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddInfoActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, params Steeltoe.Management.Info.IInfoContributor![]! contributors) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddLoggersActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddMappingsActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddMetricsActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddRefreshActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddServicesActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddThreadDumpActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddThreadDumpActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddTraceActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! -static Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions.AddTraceActuator(this Microsoft.AspNetCore.Builder.WebApplicationBuilder! builder, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion) -> Microsoft.AspNetCore.Builder.WebApplicationBuilder! static Steeltoe.Management.Endpoint.ManagementWebHostBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Management.Endpoint.ManagementWebHostBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Action? configureEndpoints) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! static Steeltoe.Management.Endpoint.ManagementWebHostBuilderExtensions.AddAllActuators(this Microsoft.AspNetCore.Hosting.IWebHostBuilder! builder, System.Action? configureEndpoints, Steeltoe.Management.Endpoint.MediaTypeVersion mediaTypeVersion, System.Action? buildCorsPolicy) -> Microsoft.AspNetCore.Hosting.IWebHostBuilder! @@ -266,8 +266,8 @@ Steeltoe.Management.Endpoint.Loggers.LoggersResponse.Data.get -> System.Collecti Steeltoe.Management.Endpoint.Loggers.LoggersResponse.HasError.get -> bool Steeltoe.Management.Endpoint.Loggers.LoggersResponse.LoggersResponse(System.Collections.Generic.IDictionary! data, bool hasError) -> void Steeltoe.Management.Endpoint.Loggers.ServiceCollectionExtensions +Steeltoe.Management.Endpoint.ManagementHostApplicationBuilderExtensions Steeltoe.Management.Endpoint.ManagementHostBuilderExtensions -Steeltoe.Management.Endpoint.ManagementWebApplicationBuilderExtensions Steeltoe.Management.Endpoint.ManagementWebHostBuilderExtensions Steeltoe.Management.Endpoint.MediaTypeVersion Steeltoe.Management.Endpoint.MediaTypeVersion.V1 = 0 -> Steeltoe.Management.Endpoint.MediaTypeVersion diff --git a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj index bae5b785ac..7887eea9bb 100755 --- a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj +++ b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Steeltoe management endpoints actuators;management;monitoring;Spring Cloud true diff --git a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj index 910e19eeb2..ca99fc748f 100644 --- a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj +++ b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Adds Prometheus support for Steeltoe management endpoints actuators;management;monitoring;distributed tracing;metrics;prometheus true diff --git a/src/Management/src/Task/Steeltoe.Management.Task.csproj b/src/Management/src/Task/Steeltoe.Management.Task.csproj index 4fbde1ff9e..46bf2064cc 100644 --- a/src/Management/src/Task/Steeltoe.Management.Task.csproj +++ b/src/Management/src/Task/Steeltoe.Management.Task.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Extensions for running tasks embedded in your ASP.NET Core application. Ideal for cf run-task in Cloud Foundry. tasks;management;monitoring;aspnetcore;Spring Cloud;cf run-task true diff --git a/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj b/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj index 795808854a..fac61c4fd0 100644 --- a/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj +++ b/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Enables request tracing in distributed systems. management;monitoring;distributed tracing true diff --git a/src/Management/src/Wavefront/Exporters/WavefrontTraceExporter.cs b/src/Management/src/Wavefront/Exporters/WavefrontTraceExporter.cs index 4a4befb96d..9dc1b6dd2b 100644 --- a/src/Management/src/Wavefront/Exporters/WavefrontTraceExporter.cs +++ b/src/Management/src/Wavefront/Exporters/WavefrontTraceExporter.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Globalization; using Microsoft.Extensions.Logging; using OpenTelemetry; using Steeltoe.Common; @@ -66,7 +67,8 @@ public override ExportResult Export(in Batch batch) if (!activity.Tags.Any(pair => pair.Key == "http.url" && pair.Value != null && pair.Value.Contains(_options.Uri!, StringComparison.Ordinal))) { _wavefrontSender.SendSpan(activity.OperationName, DateTimeUtils.UnixTimeMilliseconds(activity.StartTimeUtc), activity.Duration.Milliseconds, - _options.Source, Guid.Parse(activity.TraceId.ToString()), FromActivitySpanId(activity.SpanId), new List + _options.Source, Guid.Parse(activity.TraceId.ToString(), CultureInfo.InvariantCulture), FromActivitySpanId(activity.SpanId), + new List { FromActivitySpanId(activity.ParentSpanId) }, null, GetTags(activity.Tags), null); @@ -105,6 +107,6 @@ public override ExportResult Export(in Batch batch) private Guid FromActivitySpanId(ActivitySpanId spanId) { - return Guid.Parse($"0000000000000000{spanId}"); + return Guid.Parse($"0000000000000000{spanId}", CultureInfo.InvariantCulture); } } diff --git a/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj b/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj index 2ded7f80be..6bb7789419 100644 --- a/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj +++ b/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Adds Wavefront support for Steeltoe management endpoints actuators;management;monitoring;distributed tracing;metrics;wavefront true diff --git a/src/Management/test/Endpoint.Test/ActuatorRouteBuilderExtensionsTest.cs b/src/Management/test/Endpoint.Test/ActuatorRouteBuilderExtensionsTest.cs index c747f6856f..b6f0fc5859 100644 --- a/src/Management/test/Endpoint.Test/ActuatorRouteBuilderExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/ActuatorRouteBuilderExtensionsTest.cs @@ -14,7 +14,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; @@ -79,9 +78,9 @@ private static IHostBuilder GetHostBuilder(Action po }).ConfigureAppConfiguration(configure => configure.AddInMemoryCollection(appSettings)); } - private async Task ActAndAssertAsync(IHostBuilder hostBuilder, EndpointOptions options, bool expectedSuccess) + private async Task ActAndAssertAsync(IHostBuilder builder, EndpointOptions options, bool expectedSuccess) { - using IHost host = await hostBuilder.StartAsync(); + using IHost host = await builder.StartAsync(); using TestServer server = host.GetTestServer(); ManagementOptions managementOptions = host.Services.GetRequiredService>().CurrentValue; diff --git a/src/Management/test/Endpoint.Test/ActuatorServiceCollectionExtensionsTest.cs b/src/Management/test/Endpoint.Test/ActuatorServiceCollectionExtensionsTest.cs index 4ecd6ac78b..14ab054011 100644 --- a/src/Management/test/Endpoint.Test/ActuatorServiceCollectionExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/ActuatorServiceCollectionExtensionsTest.cs @@ -10,7 +10,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Configuration.CloudFoundry; using Steeltoe.Management.Endpoint.CloudFoundry; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointOptionsTest.cs index ac40aeee52..8c9a076384 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointTest.cs index a481d4cf32..11c69651d5 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryEndpointTest.cs @@ -7,7 +7,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Test.Infrastructure; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryManagementOptionsTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryManagementOptionsTest.cs index 63683b207f..dc72133e9b 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryManagementOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundryManagementOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs index 9f11b4d410..b3de0af695 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs @@ -13,7 +13,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/EndpointMiddlewareTest.cs index 40ec48e863..907a82d3f6 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/EndpointMiddlewareTest.cs @@ -11,7 +11,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/EndpointServiceCollectionTest.cs index 9e46a45121..1806cac4de 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/EndpointServiceCollectionTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.CloudFoundry; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/SecurityUtilsTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/SecurityUtilsTest.cs index 0f83d10a1b..fd57fa0312 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/SecurityUtilsTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/SecurityUtilsTest.cs @@ -6,7 +6,6 @@ using System.Net.Http.Json; using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Management.Endpoint.CloudFoundry; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.CloudFoundry; diff --git a/src/Management/test/Endpoint.Test/ContentNegotiation/ContentNegotiationTests.cs b/src/Management/test/Endpoint.Test/ContentNegotiation/ContentNegotiationTests.cs index d519cd5310..afbbee8a23 100644 --- a/src/Management/test/Endpoint.Test/ContentNegotiation/ContentNegotiationTests.cs +++ b/src/Management/test/Endpoint.Test/ContentNegotiation/ContentNegotiationTests.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Logging; using Steeltoe.Common.TestResources; using Steeltoe.Logging.DynamicLogger; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.ContentNegotiation; diff --git a/src/Management/test/Endpoint.Test/DbMigrations/DbMigrationsEndpointTests.cs b/src/Management/test/Endpoint.Test/DbMigrations/DbMigrationsEndpointTests.cs index e456e794b1..077fe4bdae 100644 --- a/src/Management/test/Endpoint.Test/DbMigrations/DbMigrationsEndpointTests.cs +++ b/src/Management/test/Endpoint.Test/DbMigrations/DbMigrationsEndpointTests.cs @@ -3,11 +3,9 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.DbMigrations; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.DbMigrations; diff --git a/src/Management/test/Endpoint.Test/DbMigrations/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/DbMigrations/EndpointMiddlewareTest.cs index 97d578dea0..89b41a01fc 100644 --- a/src/Management/test/Endpoint.Test/DbMigrations/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/DbMigrations/EndpointMiddlewareTest.cs @@ -15,7 +15,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.DbMigrations; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.DbMigrations; diff --git a/src/Management/test/Endpoint.Test/DbMigrations/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/DbMigrations/EndpointServiceCollectionTest.cs index e4c577abe5..0a6b84b06f 100644 --- a/src/Management/test/Endpoint.Test/DbMigrations/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/DbMigrations/EndpointServiceCollectionTest.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.DbMigrations; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.DbMigrations; diff --git a/src/Management/test/Endpoint.Test/Environment/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Environment/EndpointMiddlewareTest.cs index c83a3ad9ce..750288c3ce 100644 --- a/src/Management/test/Endpoint.Test/Environment/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/EndpointMiddlewareTest.cs @@ -16,7 +16,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Environment; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Environment/EndpointServiceCollectionTest.cs index e0661ef4d4..ca8fff1730 100644 --- a/src/Management/test/Endpoint.Test/Environment/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/EndpointServiceCollectionTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.Environment; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/EnvironmentDescriptorTest.cs b/src/Management/test/Endpoint.Test/Environment/EnvironmentDescriptorTest.cs index a2c210717a..423a768b04 100644 --- a/src/Management/test/Endpoint.Test/Environment/EnvironmentDescriptorTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/EnvironmentDescriptorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Environment; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointOptionsTest.cs index 54fcd78d33..f23cc89bf6 100644 --- a/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Environment; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointTest.cs b/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointTest.cs index 86d899df90..c9dc817694 100644 --- a/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/EnvironmentEndpointTest.cs @@ -8,7 +8,6 @@ using Steeltoe.Configuration.Placeholder; using Steeltoe.Management.Endpoint.Environment; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/PropertySourceDescriptorTest.cs b/src/Management/test/Endpoint.Test/Environment/PropertySourceDescriptorTest.cs index 0ddb66dcba..22c690d87e 100644 --- a/src/Management/test/Endpoint.Test/Environment/PropertySourceDescriptorTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/PropertySourceDescriptorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Environment; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/Environment/PropertyValueDescriptorTest.cs b/src/Management/test/Endpoint.Test/Environment/PropertyValueDescriptorTest.cs index fab5cd2fa7..72c084bc08 100644 --- a/src/Management/test/Endpoint.Test/Environment/PropertyValueDescriptorTest.cs +++ b/src/Management/test/Endpoint.Test/Environment/PropertyValueDescriptorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Environment; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Environment; diff --git a/src/Management/test/Endpoint.Test/ExposureTest.cs b/src/Management/test/Endpoint.Test/ExposureTest.cs index e931a6f5c6..140a57875f 100644 --- a/src/Management/test/Endpoint.Test/ExposureTest.cs +++ b/src/Management/test/Endpoint.Test/ExposureTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; diff --git a/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorOptionsTest.cs b/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorOptionsTest.cs index 5fbe561198..3a3fd152f4 100644 --- a/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Health.Contributor; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health.Contributor; diff --git a/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorTest.cs b/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorTest.cs index 0957fc93b2..19e9696175 100644 --- a/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorTest.cs +++ b/src/Management/test/Endpoint.Test/Health/Contributor/DiskSpaceContributorTest.cs @@ -2,12 +2,10 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.Options; using Steeltoe.Common.HealthChecks; using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.Health.Contributor; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health.Contributor; diff --git a/src/Management/test/Endpoint.Test/Health/DefaultHealthAggregatorTest.cs b/src/Management/test/Endpoint.Test/Health/DefaultHealthAggregatorTest.cs index e502a9269b..9db6faca82 100644 --- a/src/Management/test/Endpoint.Test/Health/DefaultHealthAggregatorTest.cs +++ b/src/Management/test/Endpoint.Test/Health/DefaultHealthAggregatorTest.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; -using FluentAssertions; using Steeltoe.Common.HealthChecks; using Steeltoe.Management.Endpoint.Test.Health.TestContributors; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health; diff --git a/src/Management/test/Endpoint.Test/Health/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Health/EndpointMiddlewareTest.cs index b3681db89b..9f35ea1a73 100644 --- a/src/Management/test/Endpoint.Test/Health/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Health/EndpointMiddlewareTest.cs @@ -10,7 +10,6 @@ using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.Health; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health; diff --git a/src/Management/test/Endpoint.Test/Health/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Health/EndpointServiceCollectionTest.cs index 26aebf761a..dd7b3d31ce 100644 --- a/src/Management/test/Endpoint.Test/Health/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Health/EndpointServiceCollectionTest.cs @@ -10,7 +10,6 @@ using Steeltoe.Management.Endpoint.Health; using Steeltoe.Management.Endpoint.Health.Contributor; using Steeltoe.Management.Endpoint.Test.Health.TestContributors; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health; diff --git a/src/Management/test/Endpoint.Test/Health/HealthEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Health/HealthEndpointOptionsTest.cs index 49d188d98a..0d3aba9db4 100644 --- a/src/Management/test/Endpoint.Test/Health/HealthEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Health/HealthEndpointOptionsTest.cs @@ -4,7 +4,6 @@ using System.Security.Claims; using Steeltoe.Management.Endpoint.Health; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health; diff --git a/src/Management/test/Endpoint.Test/Health/HealthEndpointTest.cs b/src/Management/test/Endpoint.Test/Health/HealthEndpointTest.cs index 16a80067a7..e98baa91ce 100644 --- a/src/Management/test/Endpoint.Test/Health/HealthEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Health/HealthEndpointTest.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Options; @@ -12,7 +11,6 @@ using Steeltoe.Management.Endpoint.Health.Contributor; using Steeltoe.Management.Endpoint.Test.Health.TestContributors; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; using MicrosoftHealth = Microsoft.Extensions.Diagnostics.HealthChecks; diff --git a/src/Management/test/Endpoint.Test/Health/HealthTest.cs b/src/Management/test/Endpoint.Test/Health/HealthTest.cs index 273a6e02c2..1954886ba9 100644 --- a/src/Management/test/Endpoint.Test/Health/HealthTest.cs +++ b/src/Management/test/Endpoint.Test/Health/HealthTest.cs @@ -6,7 +6,6 @@ using System.Text.Json.Serialization; using Steeltoe.Common.HealthChecks; using Steeltoe.Management.Endpoint.Health; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Health; diff --git a/src/Management/test/Endpoint.Test/HeapDump/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/HeapDump/EndpointMiddlewareTest.cs index e43f0b6a65..3b038525ab 100644 --- a/src/Management/test/Endpoint.Test/HeapDump/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/HeapDump/EndpointMiddlewareTest.cs @@ -14,7 +14,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.HeapDump; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.HeapDump; diff --git a/src/Management/test/Endpoint.Test/HeapDump/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/HeapDump/EndpointServiceCollectionTest.cs index 5e6b9c4d3f..57308917ef 100644 --- a/src/Management/test/Endpoint.Test/HeapDump/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/HeapDump/EndpointServiceCollectionTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.HeapDump; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.HeapDump; diff --git a/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointOptionsTest.cs index 7f52f85f2e..3d1bfed91a 100644 --- a/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointOptionsTest.cs @@ -5,7 +5,6 @@ using Steeltoe.Common; using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.HeapDump; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.HeapDump; diff --git a/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointTest.cs b/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointTest.cs index dcd1249370..a172391151 100644 --- a/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/HeapDump/HeapDumpEndpointTest.cs @@ -9,7 +9,6 @@ using Steeltoe.Common; using Steeltoe.Management.Endpoint.HeapDump; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.HeapDump; diff --git a/src/Management/test/Endpoint.Test/Hypermedia/ActuatorManagementOptionsTest.cs b/src/Management/test/Endpoint.Test/Hypermedia/ActuatorManagementOptionsTest.cs index 8bacd0b221..6be179ca9b 100644 --- a/src/Management/test/Endpoint.Test/Hypermedia/ActuatorManagementOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Hypermedia/ActuatorManagementOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Hypermedia; diff --git a/src/Management/test/Endpoint.Test/Hypermedia/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Hypermedia/EndpointMiddlewareTest.cs index a08b75926a..32fe03723b 100644 --- a/src/Management/test/Endpoint.Test/Hypermedia/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Hypermedia/EndpointMiddlewareTest.cs @@ -8,7 +8,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Hypermedia; diff --git a/src/Management/test/Endpoint.Test/Hypermedia/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Hypermedia/EndpointServiceCollectionTest.cs index 62b7c4b7f4..3cd3e541fa 100644 --- a/src/Management/test/Endpoint.Test/Hypermedia/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Hypermedia/EndpointServiceCollectionTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Hypermedia; diff --git a/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointOptionsTest.cs index c45e9b767c..fcb73bb5f6 100644 --- a/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Hypermedia; diff --git a/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointTest.cs b/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointTest.cs index abd85357b7..80ce9eeb88 100644 --- a/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Hypermedia/HypermediaEndpointTest.cs @@ -6,7 +6,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Test.Infrastructure; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Hypermedia; diff --git a/src/Management/test/Endpoint.Test/Info/AppSettingsInfoContributorTest.cs b/src/Management/test/Endpoint.Test/Info/AppSettingsInfoContributorTest.cs index 13a6a12cf4..f7ac7274ab 100644 --- a/src/Management/test/Endpoint.Test/Info/AppSettingsInfoContributorTest.cs +++ b/src/Management/test/Endpoint.Test/Info/AppSettingsInfoContributorTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.Info.Contributor; using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Info/Contributor/AppSettingsInfoContributorTest.cs b/src/Management/test/Endpoint.Test/Info/Contributor/AppSettingsInfoContributorTest.cs index 33e44495b8..e1f20af9e7 100644 --- a/src/Management/test/Endpoint.Test/Info/Contributor/AppSettingsInfoContributorTest.cs +++ b/src/Management/test/Endpoint.Test/Info/Contributor/AppSettingsInfoContributorTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.Info.Contributor; using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info.Contributor; diff --git a/src/Management/test/Endpoint.Test/Info/Contributor/BuildInfoContributorTest.cs b/src/Management/test/Endpoint.Test/Info/Contributor/BuildInfoContributorTest.cs index a54771d2b9..e8e6950d5d 100644 --- a/src/Management/test/Endpoint.Test/Info/Contributor/BuildInfoContributorTest.cs +++ b/src/Management/test/Endpoint.Test/Info/Contributor/BuildInfoContributorTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Endpoint.Info.Contributor; using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info.Contributor; diff --git a/src/Management/test/Endpoint.Test/Info/Contributor/GitInfoContributorTest.cs b/src/Management/test/Endpoint.Test/Info/Contributor/GitInfoContributorTest.cs index 7ce5bea718..685689ff50 100755 --- a/src/Management/test/Endpoint.Test/Info/Contributor/GitInfoContributorTest.cs +++ b/src/Management/test/Endpoint.Test/Info/Contributor/GitInfoContributorTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging.Abstractions; using Steeltoe.Management.Endpoint.Info.Contributor; using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info.Contributor; diff --git a/src/Management/test/Endpoint.Test/Info/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Info/EndpointMiddlewareTest.cs index cd5c0bdd3d..36dc718f6f 100644 --- a/src/Management/test/Endpoint.Test/Info/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Info/EndpointMiddlewareTest.cs @@ -9,7 +9,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Info/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Info/EndpointServiceCollectionTest.cs index e6f6d1a187..315690613f 100644 --- a/src/Management/test/Endpoint.Test/Info/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Info/EndpointServiceCollectionTest.cs @@ -7,7 +7,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Info.Contributor; using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Info/InfoBuilderTest.cs b/src/Management/test/Endpoint.Test/Info/InfoBuilderTest.cs index 80c82dfffd..bd6589acee 100644 --- a/src/Management/test/Endpoint.Test/Info/InfoBuilderTest.cs +++ b/src/Management/test/Endpoint.Test/Info/InfoBuilderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Info/InfoEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Info/InfoEndpointOptionsTest.cs index 4e5fc0f239..78d39d1c7f 100644 --- a/src/Management/test/Endpoint.Test/Info/InfoEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Info/InfoEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Info; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Info/InfoEndpointTest.cs b/src/Management/test/Endpoint.Test/Info/InfoEndpointTest.cs index d743be6665..a8f2a3c45a 100644 --- a/src/Management/test/Endpoint.Test/Info/InfoEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Info/InfoEndpointTest.cs @@ -6,7 +6,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Test.Infrastructure; using Steeltoe.Management.Info; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Info; diff --git a/src/Management/test/Endpoint.Test/Loggers/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Loggers/EndpointMiddlewareTest.cs index 81849763c6..5a62becb46 100644 --- a/src/Management/test/Endpoint.Test/Loggers/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/EndpointMiddlewareTest.cs @@ -12,7 +12,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Loggers; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/Loggers/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Loggers/EndpointServiceCollectionTest.cs index c281b23ca2..e50fb94833 100644 --- a/src/Management/test/Endpoint.Test/Loggers/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/EndpointServiceCollectionTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Logging; using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Loggers; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/Loggers/LoggerLevelsTest.cs b/src/Management/test/Endpoint.Test/Loggers/LoggerLevelsTest.cs index c3f7bd5ef2..f30b4eba1b 100644 --- a/src/Management/test/Endpoint.Test/Loggers/LoggerLevelsTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/LoggerLevelsTest.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Logging; using Steeltoe.Management.Endpoint.Loggers; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointOptionsTest.cs index e439812aad..c94e7de8dd 100644 --- a/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointOptionsTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.Loggers; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointTest.cs b/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointTest.cs index 87a7b96eed..b5283bebf6 100644 --- a/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/LoggersEndpointTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Steeltoe.Logging; using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Loggers; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/Loggers/LoggersRequestTest.cs b/src/Management/test/Endpoint.Test/Loggers/LoggersRequestTest.cs index 169343d492..88d2a49ad9 100644 --- a/src/Management/test/Endpoint.Test/Loggers/LoggersRequestTest.cs +++ b/src/Management/test/Endpoint.Test/Loggers/LoggersRequestTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Loggers; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Loggers; diff --git a/src/Management/test/Endpoint.Test/ManagementHostBuilderExtensionsTest.cs b/src/Management/test/Endpoint.Test/ManagementHostBuilderExtensionsTest.cs index fc5b4915da..ae2d9f5fdf 100755 --- a/src/Management/test/Endpoint.Test/ManagementHostBuilderExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/ManagementHostBuilderExtensionsTest.cs @@ -32,7 +32,6 @@ using Steeltoe.Management.Endpoint.ThreadDump; using Steeltoe.Management.Endpoint.Trace; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; diff --git a/src/Management/test/Endpoint.Test/ManagementOptionsTest.cs b/src/Management/test/Endpoint.Test/ManagementOptionsTest.cs index 5a8caf168d..83f0c849bc 100644 --- a/src/Management/test/Endpoint.Test/ManagementOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/ManagementOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Endpoint.Info; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; diff --git a/src/Management/test/Endpoint.Test/ManagementPort/ManagementEndpointServedOnDifferentPortTest.cs b/src/Management/test/Endpoint.Test/ManagementPort/ManagementEndpointServedOnDifferentPortTest.cs index 9c40054ccd..130168d02f 100644 --- a/src/Management/test/Endpoint.Test/ManagementPort/ManagementEndpointServedOnDifferentPortTest.cs +++ b/src/Management/test/Endpoint.Test/ManagementPort/ManagementEndpointServedOnDifferentPortTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting.Server; @@ -14,7 +13,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Common.Hosting; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.ManagementPort; diff --git a/src/Management/test/Endpoint.Test/ManagementWebApplicationBuilderExtensionsTest.cs b/src/Management/test/Endpoint.Test/ManagementWebApplicationBuilderExtensionsTest.cs index a2f82dfec4..81647376bb 100755 --- a/src/Management/test/Endpoint.Test/ManagementWebApplicationBuilderExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/ManagementWebApplicationBuilderExtensionsTest.cs @@ -31,7 +31,6 @@ using Steeltoe.Management.Endpoint.ThreadDump; using Steeltoe.Management.Endpoint.Trace; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; @@ -41,8 +40,9 @@ public sealed class ManagementWebApplicationBuilderExtensionsTest public async Task AddDbMigrationsActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddDbMigrationsActuator(); - await using WebApplication host = hostBuilder.AddDbMigrationsActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -56,8 +56,9 @@ public async Task AddDbMigrationsActuator_WebApplicationBuilder_IStartupFilterFi public async Task AddEnvironmentActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddEnvironmentActuator(); - await using WebApplication host = hostBuilder.AddEnvironmentActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -71,8 +72,9 @@ public async Task AddEnvironmentActuator_WebApplicationBuilder_IStartupFilterFir public async Task AddHealthActuator_WebApplicationBuilder() { WebApplicationBuilder hostBuilder = TestHelpers.GetTestWebApplicationBuilder(); + hostBuilder.AddHealthActuator(); - await using WebApplication host = hostBuilder.AddHealthActuator().Build(); + await using WebApplication host = hostBuilder.Build(); await using AsyncServiceScope scope = host.Services.CreateAsyncScope(); Assert.Single(scope.ServiceProvider.GetServices()); @@ -83,8 +85,9 @@ public async Task AddHealthActuator_WebApplicationBuilder() public async Task AddHealthActuator_WebApplicationBuilder_WithTypes() { WebApplicationBuilder hostBuilder = TestHelpers.GetTestWebApplicationBuilder(); + hostBuilder.AddHealthActuator(typeof(DownContributor)); - await using WebApplication host = hostBuilder.AddHealthActuator(typeof(DownContributor)).Build(); + await using WebApplication host = hostBuilder.Build(); await using AsyncServiceScope scope = host.Services.CreateAsyncScope(); Assert.Single(scope.ServiceProvider.GetServices()); @@ -95,8 +98,9 @@ public async Task AddHealthActuator_WebApplicationBuilder_WithTypes() public async Task AddHealthActuator_WebApplicationBuilder_WithAggregator() { WebApplicationBuilder hostBuilder = TestHelpers.GetTestWebApplicationBuilder(); + hostBuilder.AddHealthActuator(new DefaultHealthAggregator(), typeof(DownContributor)); - await using WebApplication host = hostBuilder.AddHealthActuator(new DefaultHealthAggregator(), typeof(DownContributor)).Build(); + await using WebApplication host = hostBuilder.Build(); await using AsyncServiceScope scope = host.Services.CreateAsyncScope(); Assert.Single(scope.ServiceProvider.GetServices()); @@ -107,9 +111,10 @@ public async Task AddHealthActuator_WebApplicationBuilder_WithAggregator() public async Task AddHealthActuator_WebApplicationBuilder_IStartupFilterFireRegistersAvailabilityEvents() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddHealthActuator(); // start the server, get a client - await using WebApplication host = hostBuilder.AddHealthActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); HttpClient client = host.GetTestClient(); @@ -136,8 +141,9 @@ public async Task AddHeapDumpActuator_WebApplicationBuilder_IStartupFilterFires( if (Platform.IsWindows) { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddHeapDumpActuator(); - await using WebApplication host = hostBuilder.AddHeapDumpActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -152,8 +158,9 @@ public async Task AddHeapDumpActuator_WebApplicationBuilder_IStartupFilterFires( public async Task AddHypermediaActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddHypermediaActuator(); - await using WebApplication host = hostBuilder.AddHypermediaActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -167,8 +174,9 @@ public async Task AddHypermediaActuator_WebApplicationBuilder_IStartupFilterFire public async Task AddInfoActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddInfoActuator(new AppSettingsInfoContributor(hostBuilder.Configuration)); - await using WebApplication host = hostBuilder.AddInfoActuator(new AppSettingsInfoContributor(hostBuilder.Configuration)).Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -183,8 +191,9 @@ public async Task AddInfoActuator_WebApplicationBuilder_IStartupFilterFires() public async Task AddLoggersActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddLoggersActuator(); - await using WebApplication host = hostBuilder.AddLoggersActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -201,8 +210,9 @@ public async Task AddLoggers_WebApplicationBuilder_MultipleLoggersScenario1() WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); hostBuilder.Logging.AddDynamicSerilog(); hostBuilder.Logging.AddDynamicConsole(); + hostBuilder.AddLoggersActuator(); - await using WebApplication host = hostBuilder.AddLoggersActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -215,8 +225,9 @@ public async Task AddMappingsActuator_WebApplicationBuilder_IStartupFilterFires( { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); hostBuilder.Services.AddActionDescriptorCollectionProvider(); + hostBuilder.AddMappingsActuator(); - await using WebApplication host = hostBuilder.AddMappingsActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -230,8 +241,9 @@ public async Task AddMappingsActuator_WebApplicationBuilder_IStartupFilterFires( public async Task AddMetricsActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddMetricsActuator(); - await using WebApplication host = hostBuilder.AddMetricsActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -246,8 +258,9 @@ public async Task AddMetricsActuator_WebApplicationBuilder_IStartupFilterFires() public async Task AddRefreshActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddRefreshActuator(); - await using WebApplication host = hostBuilder.AddRefreshActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -263,8 +276,9 @@ public async Task AddThreadDumpActuator_WebApplicationBuilder_IStartupFilterFire if (Platform.IsWindows) { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddThreadDumpActuator(); - await using WebApplication host = hostBuilder.AddThreadDumpActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -279,8 +293,9 @@ public async Task AddThreadDumpActuator_WebApplicationBuilder_IStartupFilterFire public async Task AddTraceActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddTraceActuator(); - await using WebApplication host = hostBuilder.AddTraceActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -294,8 +309,9 @@ public async Task AddTraceActuator_WebApplicationBuilder_IStartupFilterFires() public async Task AddServicesActuator_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); + hostBuilder.AddServicesActuator(); - await using WebApplication host = hostBuilder.AddServicesActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); @@ -309,8 +325,9 @@ public async Task AddServicesActuator_WebApplicationBuilder_IStartupFilterFires( public async Task AddCloudFoundryActuator_WebApplicationBuilder() { WebApplicationBuilder hostBuilder = TestHelpers.GetTestWebApplicationBuilder(); + hostBuilder.AddCloudFoundryActuator(); - await using WebApplication host = hostBuilder.AddCloudFoundryActuator().Build(); + await using WebApplication host = hostBuilder.Build(); Assert.NotNull(host.Services.GetService()); Assert.Single(host.Services.GetServices().Where(filter => filter is AllActuatorsStartupFilter)); @@ -321,8 +338,9 @@ public async Task AddAllActuators_WebApplicationBuilder_IStartupFilterFires() { WebApplicationBuilder hostBuilder = GetTestServerWithRouting(); hostBuilder.Services.AddActionDescriptorCollectionProvider(); + hostBuilder.AddAllActuators(); - await using WebApplication host = hostBuilder.AddAllActuators().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); HttpClient client = host.GetTestClient(); @@ -365,8 +383,9 @@ public async Task AddCloudFoundryActuator_WebApplicationBuilder_IStartupFilterFi WebApplicationBuilder hostBuilder = WebApplication.CreateBuilder(); hostBuilder.Host.UseDefaultServiceProvider(options => options.ValidateScopes = true); hostBuilder.WebHost.UseTestServer(); + hostBuilder.AddCloudFoundryActuator(); - await using WebApplication host = hostBuilder.AddCloudFoundryActuator().Build(); + await using WebApplication host = hostBuilder.Build(); host.UseRouting(); await host.StartAsync(); diff --git a/src/Management/test/Endpoint.Test/ManagementWebHostBuilderExtensionsTest.cs b/src/Management/test/Endpoint.Test/ManagementWebHostBuilderExtensionsTest.cs index 27d74638a2..4e6a7bbb32 100755 --- a/src/Management/test/Endpoint.Test/ManagementWebHostBuilderExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/ManagementWebHostBuilderExtensionsTest.cs @@ -31,7 +31,6 @@ using Steeltoe.Management.Endpoint.ThreadDump; using Steeltoe.Management.Endpoint.Trace; using Steeltoe.Management.Endpoint.Web.Hypermedia; -using Xunit; namespace Steeltoe.Management.Endpoint.Test; diff --git a/src/Management/test/Endpoint.Test/Metrics/AspNetCoreHostingObserverTest.cs b/src/Management/test/Endpoint.Test/Metrics/AspNetCoreHostingObserverTest.cs index 6ec4e03fcb..fdb087184e 100644 --- a/src/Management/test/Endpoint.Test/Metrics/AspNetCoreHostingObserverTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/AspNetCoreHostingObserverTest.cs @@ -9,7 +9,6 @@ using Steeltoe.Management.Diagnostics; using Steeltoe.Management.Endpoint.Metrics; using Steeltoe.Management.Endpoint.Metrics.Observer; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/EndpointServiceCollectionExtensionsTest.cs b/src/Management/test/Endpoint.Test/Metrics/EndpointServiceCollectionExtensionsTest.cs index 7d01c89fb0..6b3eaf134b 100644 --- a/src/Management/test/Endpoint.Test/Metrics/EndpointServiceCollectionExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/EndpointServiceCollectionExtensionsTest.cs @@ -9,7 +9,6 @@ using Steeltoe.Common.TestResources; using Steeltoe.Management.Diagnostics; using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricSampleTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricSampleTest.cs index f5e79d65d8..f30277bbe4 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricSampleTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricSampleTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricTagTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricTagTest.cs index 9bca02ae05..f3612fd118 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricTagTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricTagTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointMiddlewareTest.cs index 3100ffffc4..18c8d41a42 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointMiddlewareTest.cs @@ -9,7 +9,6 @@ using Steeltoe.Management.Endpoint.Metrics; using Steeltoe.Management.Endpoint.Metrics.SystemDiagnosticsMetrics; using Steeltoe.Management.Endpoint.Options; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointOptionsTest.cs index e138545068..0bf18784a3 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointTest.cs index 2326d6d56a..1ad27eca34 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsEndpointTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Hosting; using Steeltoe.Management.Endpoint.Metrics; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsListNamesResponseTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsListNamesResponseTest.cs index e9ec4fc789..4f0aefadc0 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsListNamesResponseTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsListNamesResponseTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsObserverOptionsTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsObserverOptionsTest.cs index 69e7b85bb9..3bb7e72898 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsObserverOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsObserverOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Diagnostics; using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsRequestTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsRequestTest.cs index baa61da949..963340f8d4 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsRequestTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsRequestTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/MetricsResponseTest.cs b/src/Management/test/Endpoint.Test/Metrics/MetricsResponseTest.cs index 29fe751d10..9db15d5157 100644 --- a/src/Management/test/Endpoint.Test/Metrics/MetricsResponseTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/MetricsResponseTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Metrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics; diff --git a/src/Management/test/Endpoint.Test/Metrics/Observer/EventCounterListenerTest.cs b/src/Management/test/Endpoint.Test/Metrics/Observer/EventCounterListenerTest.cs index b66e4208ec..f8720ca4b0 100644 --- a/src/Management/test/Endpoint.Test/Metrics/Observer/EventCounterListenerTest.cs +++ b/src/Management/test/Endpoint.Test/Metrics/Observer/EventCounterListenerTest.cs @@ -8,7 +8,6 @@ using Steeltoe.Management.Endpoint.Metrics; using Steeltoe.Management.Endpoint.Metrics.Observer; using Steeltoe.Management.Endpoint.Metrics.SystemDiagnosticsMetrics; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Metrics.Observer; diff --git a/src/Management/test/Endpoint.Test/Refresh/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Refresh/EndpointMiddlewareTest.cs index 3163decd7b..7cee2f8e3d 100644 --- a/src/Management/test/Endpoint.Test/Refresh/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Refresh/EndpointMiddlewareTest.cs @@ -15,7 +15,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.Refresh; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Refresh; diff --git a/src/Management/test/Endpoint.Test/Refresh/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Refresh/EndpointServiceCollectionTest.cs index 0b7e1d77c3..4b0c3a96fe 100644 --- a/src/Management/test/Endpoint.Test/Refresh/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Refresh/EndpointServiceCollectionTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.Refresh; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Refresh; diff --git a/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointOptionsTest.cs index 6958be81b4..8cc9e78886 100644 --- a/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Refresh; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Refresh; diff --git a/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointTest.cs b/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointTest.cs index 39806b2986..ac0fb12385 100644 --- a/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Refresh/RefreshEndpointTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Management.Endpoint.Refresh; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Refresh; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/ApplicationMappingsTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/ApplicationMappingsTest.cs index f037d1327d..30ce71eb28 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/ApplicationMappingsTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/ApplicationMappingsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/ContextMappingsTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/ContextMappingsTest.cs index 6bc4e24f74..b19d90df88 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/ContextMappingsTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/ContextMappingsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/EndpointMiddlewareTest.cs index c42e6b2425..3e3d88424e 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/EndpointMiddlewareTest.cs @@ -4,7 +4,6 @@ using System.Net; using System.Text; -using FluentAssertions; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc.Abstractions; @@ -20,7 +19,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/EndpointServiceCollectionTest.cs index 27d03ec3be..4bc7ac1855 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/EndpointServiceCollectionTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/MappingDescriptionTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/MappingDescriptionTest.cs index 9fd53647df..e416d5e07d 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/MappingDescriptionTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/MappingDescriptionTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/RouteMappings/MappingsEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/RouteMappings/MappingsEndpointOptionsTest.cs index 11a54e1b0f..1d0d498557 100644 --- a/src/Management/test/Endpoint.Test/RouteMappings/MappingsEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/RouteMappings/MappingsEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.RouteMappings; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.RouteMappings; diff --git a/src/Management/test/Endpoint.Test/Services/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Services/EndpointMiddlewareTest.cs index bf1c9f8e6f..152df0e1ae 100644 --- a/src/Management/test/Endpoint.Test/Services/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Services/EndpointMiddlewareTest.cs @@ -5,7 +5,6 @@ using System.Net; using System.Text; using System.Text.Json; -using FluentAssertions; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.TestHost; @@ -17,7 +16,6 @@ using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.Services; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Services; diff --git a/src/Management/test/Endpoint.Test/Services/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Services/EndpointServiceCollectionTest.cs index df36ed1b99..20f870ef04 100644 --- a/src/Management/test/Endpoint.Test/Services/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Services/EndpointServiceCollectionTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.Services; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Services; diff --git a/src/Management/test/Endpoint.Test/Services/ServicesEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Services/ServicesEndpointOptionsTest.cs index 2cff8c2c92..7c478f336e 100644 --- a/src/Management/test/Endpoint.Test/Services/ServicesEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Services/ServicesEndpointOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.Services; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Services; diff --git a/src/Management/test/Endpoint.Test/Services/ServicesEndpointTest.cs b/src/Management/test/Endpoint.Test/Services/ServicesEndpointTest.cs index 2d83f8f574..6f0bfdcdbd 100644 --- a/src/Management/test/Endpoint.Test/Services/ServicesEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Services/ServicesEndpointTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.Services; using Steeltoe.Management.Endpoint.Test.Infrastructure; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Services; diff --git a/src/Management/test/Endpoint.Test/SpringBootAdminClient/ServiceCollectionExtensionsTest.cs b/src/Management/test/Endpoint.Test/SpringBootAdminClient/ServiceCollectionExtensionsTest.cs index e4d10ed381..34a5ed2210 100644 --- a/src/Management/test/Endpoint.Test/SpringBootAdminClient/ServiceCollectionExtensionsTest.cs +++ b/src/Management/test/Endpoint.Test/SpringBootAdminClient/ServiceCollectionExtensionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Steeltoe.Management.Endpoint.SpringBootAdminClient; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.SpringBootAdminClient; diff --git a/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientHostedServiceTest.cs b/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientHostedServiceTest.cs index ef5d3850ad..ea418385ad 100644 --- a/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientHostedServiceTest.cs +++ b/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientHostedServiceTest.cs @@ -9,7 +9,6 @@ using Steeltoe.Management.Endpoint.Health; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.SpringBootAdminClient; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.SpringBootAdminClient; diff --git a/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientOptionsTest.cs b/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientOptionsTest.cs index e5175bb38c..d3c495237f 100644 --- a/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/SpringBootAdminClient/SpringBootAdminClientOptionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Steeltoe.Management.Endpoint.SpringBootAdminClient; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.SpringBootAdminClient; diff --git a/src/Management/test/Endpoint.Test/Steeltoe.Management.Endpoint.Test.csproj b/src/Management/test/Endpoint.Test/Steeltoe.Management.Endpoint.Test.csproj index 905249bfa0..d03481e118 100644 --- a/src/Management/test/Endpoint.Test/Steeltoe.Management.Endpoint.Test.csproj +++ b/src/Management/test/Endpoint.Test/Steeltoe.Management.Endpoint.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/test/Endpoint.Test/TestAuthHandler.cs b/src/Management/test/Endpoint.Test/TestAuthHandler.cs index d472964746..472efd82d7 100644 --- a/src/Management/test/Endpoint.Test/TestAuthHandler.cs +++ b/src/Management/test/Endpoint.Test/TestAuthHandler.cs @@ -14,13 +14,8 @@ public sealed class TestAuthHandler : AuthenticationHandler optionsMonitor, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) - : base(optionsMonitor, logger, encoder, clock) -#else public TestAuthHandler(IOptionsMonitor optionsMonitor, ILoggerFactory logger, UrlEncoder encoder) : base(optionsMonitor, logger, encoder) -#endif { } diff --git a/src/Management/test/Endpoint.Test/ThreadDump/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/ThreadDump/EndpointMiddlewareTest.cs index b97253290c..442d6c749f 100644 --- a/src/Management/test/Endpoint.Test/ThreadDump/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/ThreadDump/EndpointMiddlewareTest.cs @@ -14,7 +14,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.ThreadDump; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.ThreadDump; diff --git a/src/Management/test/Endpoint.Test/ThreadDump/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/ThreadDump/EndpointServiceCollectionTest.cs index 0786ecbb0c..726282d1a4 100644 --- a/src/Management/test/Endpoint.Test/ThreadDump/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/ThreadDump/EndpointServiceCollectionTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.ThreadDump; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.ThreadDump; diff --git a/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointOptionsTest.cs index 14df6fe820..ae2a423b6c 100644 --- a/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointOptionsTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.ThreadDump; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.ThreadDump; diff --git a/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointTest.cs b/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointTest.cs index 9cfd2094f1..7391688e05 100644 --- a/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/ThreadDump/ThreadDumpEndpointTest.cs @@ -2,11 +2,9 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.Test.Infrastructure; using Steeltoe.Management.Endpoint.ThreadDump; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.ThreadDump; diff --git a/src/Management/test/Endpoint.Test/Trace/EndpointMiddlewareTest.cs b/src/Management/test/Endpoint.Test/Trace/EndpointMiddlewareTest.cs index 07be1a0614..0cab122601 100644 --- a/src/Management/test/Endpoint.Test/Trace/EndpointMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/EndpointMiddlewareTest.cs @@ -10,7 +10,6 @@ using Steeltoe.Logging.DynamicLogger; using Steeltoe.Management.Endpoint.Options; using Steeltoe.Management.Endpoint.Trace; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Trace; diff --git a/src/Management/test/Endpoint.Test/Trace/EndpointServiceCollectionTest.cs b/src/Management/test/Endpoint.Test/Trace/EndpointServiceCollectionTest.cs index db222b9620..c2f65cca27 100644 --- a/src/Management/test/Endpoint.Test/Trace/EndpointServiceCollectionTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/EndpointServiceCollectionTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Options; using Steeltoe.Management.Diagnostics; using Steeltoe.Management.Endpoint.Trace; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Trace; diff --git a/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs b/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs index fa0043d845..ae70a4d431 100644 --- a/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs @@ -11,7 +11,6 @@ using Microsoft.Extensions.Options; using Microsoft.Extensions.Primitives; using Steeltoe.Management.Endpoint.Trace; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Trace; diff --git a/src/Management/test/Endpoint.Test/Trace/TraceEndpointOptionsTest.cs b/src/Management/test/Endpoint.Test/Trace/TraceEndpointOptionsTest.cs index fb14a0f432..ed62fbb89b 100644 --- a/src/Management/test/Endpoint.Test/Trace/TraceEndpointOptionsTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/TraceEndpointOptionsTest.cs @@ -4,7 +4,6 @@ using Steeltoe.Management.Endpoint.CloudFoundry; using Steeltoe.Management.Endpoint.Trace; -using Xunit; namespace Steeltoe.Management.Endpoint.Test.Trace; diff --git a/src/Management/test/Endpoint.Test/Trace/TraceEndpointTest.cs b/src/Management/test/Endpoint.Test/Trace/TraceEndpointTest.cs index 1b45215fd8..4037b77f43 100644 --- a/src/Management/test/Endpoint.Test/Trace/TraceEndpointTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/TraceEndpointTest.cs @@ -5,7 +5,6 @@ using Microsoft.Extensions.DependencyInjection; using Steeltoe.Management.Endpoint.Test.Infrastructure; using Steeltoe.Management.Endpoint.Trace; -using Xunit; using Xunit.Abstractions; namespace Steeltoe.Management.Endpoint.Test.Trace; diff --git a/src/Management/test/Prometheus.Test/PrometheusTests.cs b/src/Management/test/Prometheus.Test/PrometheusTests.cs index 4f79b345f8..051a56265f 100644 --- a/src/Management/test/Prometheus.Test/PrometheusTests.cs +++ b/src/Management/test/Prometheus.Test/PrometheusTests.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; -using Xunit; namespace Steeltoe.Management.Prometheus.Test; diff --git a/src/Management/test/Prometheus.Test/Steeltoe.Management.Prometheus.Test.csproj b/src/Management/test/Prometheus.Test/Steeltoe.Management.Prometheus.Test.csproj index 98963064d9..93e8d0d23f 100644 --- a/src/Management/test/Prometheus.Test/Steeltoe.Management.Prometheus.Test.csproj +++ b/src/Management/test/Prometheus.Test/Steeltoe.Management.Prometheus.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/test/Task.Test/Steeltoe.Management.Task.Test.csproj b/src/Management/test/Task.Test/Steeltoe.Management.Task.Test.csproj index 45eb8b56b6..33497ab5d5 100644 --- a/src/Management/test/Task.Test/Steeltoe.Management.Task.Test.csproj +++ b/src/Management/test/Task.Test/Steeltoe.Management.Task.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/test/Task.Test/TaskRunTest.cs b/src/Management/test/Task.Test/TaskRunTest.cs index f1cce51c18..ece7c43a6b 100644 --- a/src/Management/test/Task.Test/TaskRunTest.cs +++ b/src/Management/test/Task.Test/TaskRunTest.cs @@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Hosting; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Management.Task.Test; diff --git a/src/Management/test/Tracing.Test/Steeltoe.Management.Tracing.Test.csproj b/src/Management/test/Tracing.Test/Steeltoe.Management.Tracing.Test.csproj index c0ee48d312..ad252f4422 100644 --- a/src/Management/test/Tracing.Test/Steeltoe.Management.Tracing.Test.csproj +++ b/src/Management/test/Tracing.Test/Steeltoe.Management.Tracing.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/test/Tracing.Test/TestBase.cs b/src/Management/test/Tracing.Test/TestBase.cs index 849dd17537..8c8a3e46b7 100644 --- a/src/Management/test/Tracing.Test/TestBase.cs +++ b/src/Management/test/Tracing.Test/TestBase.cs @@ -10,7 +10,6 @@ using OpenTelemetry.Trace; using Steeltoe.Common; using Steeltoe.Logging; -using Xunit; using B3Propagator = OpenTelemetry.Extensions.Propagators.B3Propagator; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingBaseHostBuilderExtensionsTest.cs b/src/Management/test/Tracing.Test/TracingBaseHostBuilderExtensionsTest.cs index ea1a26282f..50755ad8e3 100644 --- a/src/Management/test/Tracing.Test/TracingBaseHostBuilderExtensionsTest.cs +++ b/src/Management/test/Tracing.Test/TracingBaseHostBuilderExtensionsTest.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingBaseServiceCollectionExtensionsTest.cs b/src/Management/test/Tracing.Test/TracingBaseServiceCollectionExtensionsTest.cs index e364912c04..e21eb787e5 100644 --- a/src/Management/test/Tracing.Test/TracingBaseServiceCollectionExtensionsTest.cs +++ b/src/Management/test/Tracing.Test/TracingBaseServiceCollectionExtensionsTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Options; using OpenTelemetry.Exporter; using OpenTelemetry.Trace; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingCoreHostBuilderExtensionsTest.cs b/src/Management/test/Tracing.Test/TracingCoreHostBuilderExtensionsTest.cs index 31c56a9df2..b40fe9c5d0 100644 --- a/src/Management/test/Tracing.Test/TracingCoreHostBuilderExtensionsTest.cs +++ b/src/Management/test/Tracing.Test/TracingCoreHostBuilderExtensionsTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingCoreServiceCollectionExtensionsTest.cs b/src/Management/test/Tracing.Test/TracingCoreServiceCollectionExtensionsTest.cs index 18213e649b..765d85466e 100644 --- a/src/Management/test/Tracing.Test/TracingCoreServiceCollectionExtensionsTest.cs +++ b/src/Management/test/Tracing.Test/TracingCoreServiceCollectionExtensionsTest.cs @@ -7,7 +7,6 @@ using Microsoft.Extensions.Options; using OpenTelemetry.Exporter; using OpenTelemetry.Trace; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingLogProcessorTest.cs b/src/Management/test/Tracing.Test/TracingLogProcessorTest.cs index b9cd62f199..3d5c405edd 100644 --- a/src/Management/test/Tracing.Test/TracingLogProcessorTest.cs +++ b/src/Management/test/Tracing.Test/TracingLogProcessorTest.cs @@ -7,7 +7,6 @@ using OpenTelemetry.Trace; using Steeltoe.Common; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Tracing.Test/TracingOptionsTest.cs b/src/Management/test/Tracing.Test/TracingOptionsTest.cs index 9c205f2856..e549581b62 100644 --- a/src/Management/test/Tracing.Test/TracingOptionsTest.cs +++ b/src/Management/test/Tracing.Test/TracingOptionsTest.cs @@ -6,7 +6,6 @@ using Microsoft.Extensions.Configuration; using Steeltoe.Common; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Management.Tracing.Test; diff --git a/src/Management/test/Wavefront.Test/Steeltoe.Management.Wavefront.Test.csproj b/src/Management/test/Wavefront.Test/Steeltoe.Management.Wavefront.Test.csproj index 9507353d6b..1e86d72ede 100644 --- a/src/Management/test/Wavefront.Test/Steeltoe.Management.Wavefront.Test.csproj +++ b/src/Management/test/Wavefront.Test/Steeltoe.Management.Wavefront.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/src/Management/test/Wavefront.Test/WavefrontMetricsTests.cs b/src/Management/test/Wavefront.Test/WavefrontMetricsTests.cs index dd4ea1dac4..ffab1eab2f 100644 --- a/src/Management/test/Wavefront.Test/WavefrontMetricsTests.cs +++ b/src/Management/test/Wavefront.Test/WavefrontMetricsTests.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Reflection; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; @@ -16,7 +15,6 @@ using Steeltoe.Management.Diagnostics; using Steeltoe.Management.Endpoint.Diagnostics; using Steeltoe.Management.Wavefront.Exporters; -using Xunit; namespace Steeltoe.Management.Wavefront.Test; diff --git a/src/Security/src/DataProtection.Redis/Steeltoe.Security.DataProtection.Redis.csproj b/src/Security/src/DataProtection.Redis/Steeltoe.Security.DataProtection.Redis.csproj index 66e6623bb5..b16f8405ed 100644 --- a/src/Security/src/DataProtection.Redis/Steeltoe.Security.DataProtection.Redis.csproj +++ b/src/Security/src/DataProtection.Redis/Steeltoe.Security.DataProtection.Redis.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 Support for storing data protection keys in Redis. CloudFoundry;aspnetcore;security;dataprotection;redis true diff --git a/src/Security/test/Authentication.JwtBearer.Test/JwtBearerAuthenticationBuilderExtensionsTest.cs b/src/Security/test/Authentication.JwtBearer.Test/JwtBearerAuthenticationBuilderExtensionsTest.cs index 93ca9b1f2d..432616a6e2 100644 --- a/src/Security/test/Authentication.JwtBearer.Test/JwtBearerAuthenticationBuilderExtensionsTest.cs +++ b/src/Security/test/Authentication.JwtBearer.Test/JwtBearerAuthenticationBuilderExtensionsTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Security.Authentication.JwtBearer.Test; diff --git a/src/Security/test/Authentication.JwtBearer.Test/PostConfigureJwtBearerOptionsTest.cs b/src/Security/test/Authentication.JwtBearer.Test/PostConfigureJwtBearerOptionsTest.cs index df876a19a4..75765979b0 100644 --- a/src/Security/test/Authentication.JwtBearer.Test/PostConfigureJwtBearerOptionsTest.cs +++ b/src/Security/test/Authentication.JwtBearer.Test/PostConfigureJwtBearerOptionsTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.CloudFoundry.ServiceBinding; -using Xunit; namespace Steeltoe.Security.Authentication.JwtBearer.Test; diff --git a/src/Security/test/Authentication.JwtBearer.Test/TokenKeyResolverTest.cs b/src/Security/test/Authentication.JwtBearer.Test/TokenKeyResolverTest.cs index e9d5466e76..442afe3709 100644 --- a/src/Security/test/Authentication.JwtBearer.Test/TokenKeyResolverTest.cs +++ b/src/Security/test/Authentication.JwtBearer.Test/TokenKeyResolverTest.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.IdentityModel.Tokens; using Moq; -using Xunit; namespace Steeltoe.Security.Authentication.JwtBearer.Test; diff --git a/src/Security/test/Authentication.OpenIdConnect.Test/OpenIdConnectAuthenticationBuilderExtensionsTest.cs b/src/Security/test/Authentication.OpenIdConnect.Test/OpenIdConnectAuthenticationBuilderExtensionsTest.cs index 96a412af8a..f8d7ffca1c 100644 --- a/src/Security/test/Authentication.OpenIdConnect.Test/OpenIdConnectAuthenticationBuilderExtensionsTest.cs +++ b/src/Security/test/Authentication.OpenIdConnect.Test/OpenIdConnectAuthenticationBuilderExtensionsTest.cs @@ -2,10 +2,8 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Authentication; using Microsoft.Extensions.DependencyInjection; -using Xunit; namespace Steeltoe.Security.Authentication.OpenIdConnect.Test; diff --git a/src/Security/test/Authentication.OpenIdConnect.Test/PostConfigureOpenIdConnectOptionsTest.cs b/src/Security/test/Authentication.OpenIdConnect.Test/PostConfigureOpenIdConnectOptionsTest.cs index 2a5bf2ca66..9becefb9fa 100644 --- a/src/Security/test/Authentication.OpenIdConnect.Test/PostConfigureOpenIdConnectOptionsTest.cs +++ b/src/Security/test/Authentication.OpenIdConnect.Test/PostConfigureOpenIdConnectOptionsTest.cs @@ -2,14 +2,12 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Steeltoe.Common.TestResources; using Steeltoe.Configuration.CloudFoundry.ServiceBinding; -using Xunit; namespace Steeltoe.Security.Authentication.OpenIdConnect.Test; diff --git a/src/Security/test/Authentication.OpenIdConnect.Test/TokenKeyResolverTest.cs b/src/Security/test/Authentication.OpenIdConnect.Test/TokenKeyResolverTest.cs index 13bbae1af3..4d811135f0 100644 --- a/src/Security/test/Authentication.OpenIdConnect.Test/TokenKeyResolverTest.cs +++ b/src/Security/test/Authentication.OpenIdConnect.Test/TokenKeyResolverTest.cs @@ -3,10 +3,8 @@ // See the LICENSE file in the project root for more information. using System.Net; -using FluentAssertions; using Microsoft.IdentityModel.Tokens; using Moq; -using Xunit; namespace Steeltoe.Security.Authentication.OpenIdConnect.Test; diff --git a/src/Security/test/Authorization.Certificate.Test/ApplicationInstanceCertificateTest.cs b/src/Security/test/Authorization.Certificate.Test/ApplicationInstanceCertificateTest.cs index c33a66c394..040c2dac53 100644 --- a/src/Security/test/Authorization.Certificate.Test/ApplicationInstanceCertificateTest.cs +++ b/src/Security/test/Authorization.Certificate.Test/ApplicationInstanceCertificateTest.cs @@ -2,9 +2,6 @@ // The .NET Foundation licenses this file to you under the Apache 2.0 License. // See the LICENSE file in the project root for more information. -using FluentAssertions; -using Xunit; - namespace Steeltoe.Security.Authorization.Certificate.Test; public sealed class ApplicationInstanceCertificateTest diff --git a/src/Security/test/Authorization.Certificate.Test/CertificateAuthorizationTest.cs b/src/Security/test/Authorization.Certificate.Test/CertificateAuthorizationTest.cs index d04e9cd717..be54573b68 100644 --- a/src/Security/test/Authorization.Certificate.Test/CertificateAuthorizationTest.cs +++ b/src/Security/test/Authorization.Certificate.Test/CertificateAuthorizationTest.cs @@ -13,7 +13,6 @@ using Steeltoe.Common.Certificates; using Steeltoe.Common.Configuration; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Security.Authorization.Certificate.Test; diff --git a/src/Security/test/Authorization.Certificate.Test/CertificateHttpClientBuilderExtensionsTest.cs b/src/Security/test/Authorization.Certificate.Test/CertificateHttpClientBuilderExtensionsTest.cs index 9614390d5e..df0bc8da58 100644 --- a/src/Security/test/Authorization.Certificate.Test/CertificateHttpClientBuilderExtensionsTest.cs +++ b/src/Security/test/Authorization.Certificate.Test/CertificateHttpClientBuilderExtensionsTest.cs @@ -3,14 +3,12 @@ // See the LICENSE file in the project root for more information. using System.Security.Cryptography.X509Certificates; -using FluentAssertions; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.TestHost; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Steeltoe.Common.Certificates; using Steeltoe.Common.TestResources; -using Xunit; namespace Steeltoe.Security.Authorization.Certificate.Test; diff --git a/src/Security/test/DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs b/src/Security/test/DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs index 57aaffd074..45ed514bfd 100644 --- a/src/Security/test/DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs +++ b/src/Security/test/DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs @@ -4,7 +4,6 @@ using System.Net; using System.Text; -using FluentAssertions; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.DataProtection; using Microsoft.AspNetCore.Http; @@ -16,7 +15,6 @@ using Moq; using StackExchange.Redis; using Steeltoe.Connectors.Redis; -using Xunit; namespace Steeltoe.Security.DataProtection.Redis.Test; diff --git a/src/Security/test/DataProtection.Redis.Test/Steeltoe.Security.DataProtection.Redis.Test.csproj b/src/Security/test/DataProtection.Redis.Test/Steeltoe.Security.DataProtection.Redis.Test.csproj index 61ad898174..04194b3502 100644 --- a/src/Security/test/DataProtection.Redis.Test/Steeltoe.Security.DataProtection.Redis.Test.csproj +++ b/src/Security/test/DataProtection.Redis.Test/Steeltoe.Security.DataProtection.Redis.Test.csproj @@ -1,6 +1,6 @@ - net8.0;net6.0 + net8.0 enable diff --git a/versions.props b/versions.props index c42d76f27e..ebb7c67c16 100644 --- a/versions.props +++ b/versions.props @@ -5,48 +5,34 @@ It's safe to update these at any time, so wildcards are allowed. --> + 8.0.* 6.0.* - 7.0.* + 8.0.* 6.1.* 6.12.* - 3.35.* - 5.1.* - 6.0.* - 2.22.* + 3.41.* + 5.2.* + 7.0.* + 2.27.* 4.20.69 - 2.2.* - - - 7.0.5 - - 8.1.* + 2.3.* + 9.0.* 3.6.* - 7.0.* 3.3.* - 6.5.* - 3.1.* + 6.8.* + 4.0.* 8.4.* 9.25.* 8.0.* - 2.7.* + 2.8.* 1.2.0-beta.556 4.8.* - 17.8.* + 17.10.* 2.0.* - 2.6.* - - - 2.5.4 - + 2.8.* - - 7.0.* - - - - 6.0.* - + 2.2.* - 1.6.10.* + 1.7.14.* 0.2.* 3.1.* - 6.0.* + 8.0.* 8.0.* - 7.5.* + 7.6.* 1.6.*-* - 1.8.*-* - 1.8.* - 7.0.* - 7.0.* - 4.1.* + 1.9.*-* + 1.9.* + 8.0.* + 6.0.* 1.6.* 2.0.* - 1.8.0-beta + 1.8.*-* @@ -90,15 +75,4 @@ 8.0.* - - - - - 6.0.* - -