diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 7185a3d812..c5cec96cc3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "jetbrains.resharper.globaltools": { - "version": "2023.2.1", + "version": "2023.3.0-eap08", "commands": [ "jb" ] }, "regitlint": { - "version": "6.3.10", + "version": "6.3.12", "commands": [ "regitlint" ] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b996490ea3..88bada225f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -36,7 +36,10 @@ jobs: displayName: Install .NET 6 inputs: version: 6.0.x - includePreviewVersions: true + - task: UseDotNet@2 + displayName: Install .NET 8 + inputs: + version: 8.0.x - task: DotNetCoreCLI@2 displayName: Install Nerdbank.GitVersioning tool condition: eq(variables['imageName'], 'macOS-latest') @@ -87,6 +90,13 @@ jobs: 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 + inputs: + command: test + projects: '**/*.csproj' + arguments: '--blame-hang-timeout 3m -f net8.0 --no-build -c $(buildConfiguration) -maxcpucount:1 $(skipFilter) --collect "XPlat Code Coverage" --settings coverlet.runsettings --logger trx --results-directory $(Build.SourcesDirectory)' + publishTestResults: false - task: CopyFiles@2 condition: failed() inputs: diff --git a/build/package.yml b/build/package.yml index aece1db4de..584ea6cc97 100644 --- a/build/package.yml +++ b/build/package.yml @@ -19,6 +19,14 @@ 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: + version: 8.0.x - task: PowerShell@2 displayName: Set package version env: diff --git a/build/pr-code-cleanup.yml b/build/pr-code-cleanup.yml index ee3237602b..08f5184b8f 100644 --- a/build/pr-code-cleanup.yml +++ b/build/pr-code-cleanup.yml @@ -17,6 +17,14 @@ jobs: if (-not $env:SYSTEM_PULLREQUEST_TARGETBRANCH) { throw 'This pipeline can only be run from pull requests. Use "/azp run cleanup-code" in a GitHub PR comment.' } + - task: UseDotNet@2 + displayName: Install .NET 6 + inputs: + version: 6.0.x + - task: UseDotNet@2 + displayName: Install .NET 8 + inputs: + version: 8.0.x - checkout: self fetchDepth: 0 persistCredentials: true @@ -62,7 +70,7 @@ jobs: if ($baseCommitHash -ne $headCommitHash) { Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $headCommitHash -b $baseCommitHash } - task: PowerShell@2 displayName: Detect changes diff --git a/build/sonar-analyze.yml b/build/sonar-analyze.yml index 007d53d214..a19640df87 100644 --- a/build/sonar-analyze.yml +++ b/build/sonar-analyze.yml @@ -16,6 +16,14 @@ 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: + version: 8.0.x - task: DotNetCoreCLI@2 displayName: dotnet restore inputs: @@ -57,6 +65,13 @@ jobs: 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 + inputs: + command: test + projects: '**/*.csproj' + arguments: '--blame-hang-timeout 3m -f net8.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: CopyFiles@2 condition: failed() inputs: diff --git a/build/templates/component-build.yaml b/build/templates/component-build.yaml index a218252671..2ccbac2638 100644 --- a/build/templates/component-build.yaml +++ b/build/templates/component-build.yaml @@ -21,7 +21,10 @@ jobs: displayName: Install .NET 6 inputs: version: 6.0.x - includePreviewVersions: true + - task: UseDotNet@2 + displayName: Install .NET 8 + inputs: + version: 8.0.x - task: DotNetCoreCLI@2 displayName: Install Nerdbank.GitVersioning tool condition: eq('${{parameters.OS}}', 'macOS') @@ -62,6 +65,13 @@ jobs: projects: $(SolutionFile) arguments: -f net6.0 ${{parameters.skipFilter}} $(CommonTestArgs) publishTestResults: false + - task: DotNetCoreCLI@2 + displayName: dotnet test 8.0 + inputs: + command: test + projects: $(SolutionFile) + arguments: -f net8.0 ${{parameters.skipFilter}} $(CommonTestArgs) + publishTestResults: false - task: CopyFiles@2 condition: failed() inputs: diff --git a/build/verify-code-style.yml b/build/verify-code-style.yml index b693b92576..58fa9599b7 100644 --- a/build/verify-code-style.yml +++ b/build/verify-code-style.yml @@ -13,6 +13,14 @@ jobs: pool: vmImage: ubuntu-latest steps: + - task: UseDotNet@2 + displayName: Install .NET 6 + inputs: + version: 6.0.x + - task: UseDotNet@2 + displayName: Install .NET 8 + inputs: + version: 8.0.x - checkout: self persistCredentials: true fetchDepth: 0 @@ -41,7 +49,7 @@ jobs: script: | if (-not $env:SYSTEM_PULLREQUEST_TARGETBRANCH) { Write-Output "Running code cleanup on all files in branch." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff } else { # We are in detached head (the merge result), so there's no need to account for an out-of-date PR. @@ -52,5 +60,5 @@ jobs: if ($LastExitCode -ne 0) { throw "Command 'git rev-parse (2)' failed with exit code $LastExitCode." } Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash in pull request." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff -f commits -a $headCommitHash -b $baseCommitHash + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN --fail-on-diff --print-diff -f commits -a $headCommitHash -b $baseCommitHash } diff --git a/cleanupcode.ps1 b/cleanupcode.ps1 index 3d1fe66edf..2c140ddac0 100644 --- a/cleanupcode.ps1 +++ b/cleanupcode.ps1 @@ -28,17 +28,17 @@ if ($revision) { if ($baseCommitHash -eq $headCommitHash) { Write-Output "Running code cleanup on staged/unstaged files." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified VerifySuccessExitCode } else { Write-Output "Running code cleanup on commit range $baseCommitHash..$headCommitHash, including staged/unstaged files." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN -f staged,modified,commits -a $headCommitHash -b $baseCommitHash VerifySuccessExitCode } } else { Write-Output "Running code cleanup on all files." - dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN + dotnet regitlint -s src/Steeltoe.All.sln --print-command --skip-tool-check --jb --dotnetcoresdk=$(dotnet --version) --jb-profile="Steeltoe Full Cleanup" --jb --properties:Configuration=Release --jb --verbosity=WARN VerifySuccessExitCode } diff --git a/shared.props b/shared.props index bd976f21ec..a391137aca 100644 --- a/shared.props +++ b/shared.props @@ -19,6 +19,15 @@ $(MSBuildThisFileDirectory)\Steeltoe.Release.ruleset + + + $(NoWarn);S4056 + + diff --git a/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj b/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj index 1689654c93..39eb33e85e 100644 --- a/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj +++ b/src/Bootstrap/src/AutoConfiguration/Steeltoe.Bootstrap.AutoConfiguration.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj b/src/Bootstrap/test/AutoConfiguration.Test/Steeltoe.Bootstrap.AutoConfiguration.Test.csproj index 4a17c9a822..4e0baf6a63 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 @@ - net6.0 + net8.0;net6.0 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 e4e9effb8c..c89d5699f3 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj b/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj index 5436ff57da..9ff893302b 100644 --- a/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj +++ b/src/Common/src/Abstractions/Steeltoe.Common.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Common Abstractions commonly used across Steeltoe components diff --git a/src/Common/src/Common.Expression/Steeltoe.Common.Expression.csproj b/src/Common/src/Common.Expression/Steeltoe.Common.Expression.csproj index 325919e866..b694b21360 100644 --- a/src/Common/src/Common.Expression/Steeltoe.Common.Expression.csproj +++ b/src/Common/src/Common.Expression/Steeltoe.Common.Expression.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe common expression language library NET Core;Expression;SPEL true diff --git a/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj b/src/Common/src/Common.Hosting/Steeltoe.Common.Hosting.csproj index 382e44ec43..6abedcf2e2 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 @@ - net6.0 + net8.0;net6.0 Steeltoe library for common hosting-related utilities NET Core;Cloud Hosting; true diff --git a/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj b/src/Common/src/Common.Http/Steeltoe.Common.Http.csproj index 88eeeaf48d..ca77270ea8 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 @@ - net6.0 + net8.0;net6.0 Steeltoe common library for HTTP true diff --git a/src/Common/src/Common.Kubernetes/Steeltoe.Common.Kubernetes.csproj b/src/Common/src/Common.Kubernetes/Steeltoe.Common.Kubernetes.csproj index 1e1a483390..c3ac824c1b 100644 --- a/src/Common/src/Common.Kubernetes/Steeltoe.Common.Kubernetes.csproj +++ b/src/Common/src/Common.Kubernetes/Steeltoe.Common.Kubernetes.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe common library for Kubernetes Kubernetes true diff --git a/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj b/src/Common/src/Common.Net/Steeltoe.Common.Net.csproj index 50dac25e6e..e531e274e2 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 @@ - net6.0 + net8.0;net6.0 Steeltoe common library for network interaction true diff --git a/src/Common/src/Common.RetryPolly/Steeltoe.Common.RetryPolly.csproj b/src/Common/src/Common.RetryPolly/Steeltoe.Common.RetryPolly.csproj index d926a6daee..5e86af26ca 100644 --- a/src/Common/src/Common.RetryPolly/Steeltoe.Common.RetryPolly.csproj +++ b/src/Common/src/Common.RetryPolly/Steeltoe.Common.RetryPolly.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe library for handling retries NET Core;Retry; true diff --git a/src/Common/src/Common.Security/Steeltoe.Common.Security.csproj b/src/Common/src/Common.Security/Steeltoe.Common.Security.csproj index 70945ef399..095a13972e 100644 --- a/src/Common/src/Common.Security/Steeltoe.Common.Security.csproj +++ b/src/Common/src/Common.Security/Steeltoe.Common.Security.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe common library for security true diff --git a/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj b/src/Common/src/Common.Utils/Steeltoe.Common.Utils.csproj index 3a1d36a4b5..e834a513e9 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 @@ - net6.0 + net8.0;net6.0 Steeltoe common utility libraries true diff --git a/src/Common/src/Common/Steeltoe.Common.csproj b/src/Common/src/Common/Steeltoe.Common.csproj index dee2ef1f34..4c0b25a34c 100644 --- a/src/Common/src/Common/Steeltoe.Common.csproj +++ b/src/Common/src/Common/Steeltoe.Common.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe common library true diff --git a/src/Common/test/Common.Expression.Test/Steeltoe.Common.Expression.Test.csproj b/src/Common/test/Common.Expression.Test/Steeltoe.Common.Expression.Test.csproj index c0b447166b..f464c2774c 100644 --- a/src/Common/test/Common.Expression.Test/Steeltoe.Common.Expression.Test.csproj +++ b/src/Common/test/Common.Expression.Test/Steeltoe.Common.Expression.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 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 8fe2310b1f..8c1840d19d 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 @@ - net6.0 + net8.0;net6.0 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 df599b4065..e5e12e6c3d 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Common/test/Common.Kubernetes.Test/Steeltoe.Common.Kubernetes.Test.csproj b/src/Common/test/Common.Kubernetes.Test/Steeltoe.Common.Kubernetes.Test.csproj index 703696555a..673826804c 100644 --- a/src/Common/test/Common.Kubernetes.Test/Steeltoe.Common.Kubernetes.Test.csproj +++ b/src/Common/test/Common.Kubernetes.Test/Steeltoe.Common.Kubernetes.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 84c6af08b4..b12b124c5c 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Common/test/Common.Security.Test/Steeltoe.Common.Security.Test.csproj b/src/Common/test/Common.Security.Test/Steeltoe.Common.Security.Test.csproj index 90f6d9e295..c559bd1bf0 100644 --- a/src/Common/test/Common.Security.Test/Steeltoe.Common.Security.Test.csproj +++ b/src/Common/test/Common.Security.Test/Steeltoe.Common.Security.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj b/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj index 674f027876..3df9b8abe2 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj b/src/Common/test/Common.TestResources/Steeltoe.Common.TestResources.csproj index c8f49d7cdc..e29d836787 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 @@ - net6.0 + net8.0;net6.0 false 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 cc0af7d7c4..38696eedce 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj b/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj index 23c686e9ef..d0b93e534f 100644 --- a/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj +++ b/src/Configuration/src/Abstractions/Steeltoe.Configuration.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Configuration Abstractions used in Steeltoe Configuration libraries 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 787eef13b0..1ce172b14f 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 @@ - net6.0 + net8.0;net6.0 Configuration Provider for reading CloudFoundry Service Bindings Configuration;CloudFoundry;Services;Bindings true diff --git a/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj b/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj index 05a263486a..a52d3a2342 100644 --- a/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj +++ b/src/Configuration/src/CloudFoundry/Steeltoe.Configuration.CloudFoundry.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Configuration Provider for reading Cloud Foundry Environment Variables configuration;CloudFoundry;vcap true diff --git a/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj b/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj index 7b06afb75b..a92c6ca6b3 100644 --- a/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj +++ b/src/Configuration/src/ConfigServer/Steeltoe.Configuration.ConfigServer.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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/Steeltoe.Configuration.Encryption.csproj b/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj index 2ebb2377f6..af8f2a5f59 100644 --- a/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj +++ b/src/Configuration/src/Encryption/Steeltoe.Configuration.Encryption.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 4e3d1b384e..be129152d9 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 @@ - net6.0 + net8.0;net6.0 Configuration Provider for reading Kubernetes Service Bindings Configuration;Kubernetes;Services;Bindings true diff --git a/src/Configuration/src/Kubernetes/Steeltoe.Configuration.Kubernetes.csproj b/src/Configuration/src/Kubernetes/Steeltoe.Configuration.Kubernetes.csproj index 7c56405257..5d035edb03 100644 --- a/src/Configuration/src/Kubernetes/Steeltoe.Configuration.Kubernetes.csproj +++ b/src/Configuration/src/Kubernetes/Steeltoe.Configuration.Kubernetes.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Configuration Provider for reading Cloud Foundry Environment Variables configuration;Kubernetes true diff --git a/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj b/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj index c419b33b66..da4c1e4886 100644 --- a/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj +++ b/src/Configuration/src/Placeholder/Steeltoe.Configuration.Placeholder.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Configuration provider for resolving property placeholders in configuration values configuration;placeholders;spring boot true diff --git a/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj b/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj index 7a695e6b95..adffdb355a 100644 --- a/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj +++ b/src/Configuration/src/RandomValue/Steeltoe.Configuration.RandomValue.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 647a09d91d..627f5f5b40 100644 --- a/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj +++ b/src/Configuration/src/SpringBoot/Steeltoe.Configuration.SpringBoot.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Configuration provider for reading Spring Boot style configuration configuration;springboot true 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 0a8fa784d3..c88a33b2bd 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 @@ - net6.0 + net8.0;net6.0 enable 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 a4f0cf04ba..e85a06af2a 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 @@ - net6.0 + net8.0;net6.0 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 c60efa7264..32abf61744 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 @@ - net6.0 + net8.0;net6.0 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 2daef49e31..b27ea4495e 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Configuration/test/ConfigServer.Test/TestConfigServerStartup.cs b/src/Configuration/test/ConfigServer.Test/TestConfigServerStartup.cs index 15ccb3fb2f..d74c126f90 100644 --- a/src/Configuration/test/ConfigServer.Test/TestConfigServerStartup.cs +++ b/src/Configuration/test/ConfigServer.Test/TestConfigServerStartup.cs @@ -53,7 +53,7 @@ public void Configure(IApplicationBuilder app) if (context.Response.StatusCode == 200) { - context.Response.Headers.Add("content-type", "application/json"); + context.Response.Headers.Append("content-type", "application/json"); await context.Response.WriteAsync(Response); } 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 893b198aa5..fdef010f39 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 @@ - net6.0 + net8.0;net6.0 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 0feebb3a1d..d96ad1dcd0 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 @@ - net6.0 + net8.0;net6.0 enable diff --git a/src/Configuration/test/Kubernetes.Test/Steeltoe.Configuration.Kubernetes.Test.csproj b/src/Configuration/test/Kubernetes.Test/Steeltoe.Configuration.Kubernetes.Test.csproj index d842e799cd..d7793b5232 100644 --- a/src/Configuration/test/Kubernetes.Test/Steeltoe.Configuration.Kubernetes.Test.csproj +++ b/src/Configuration/test/Kubernetes.Test/Steeltoe.Configuration.Kubernetes.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 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 9482d27d5d..f3074a8cf8 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 @@ - net6.0 + net8.0;net6.0 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 dfe53a4e8c..03f3098f8e 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 @@ - net6.0 + net8.0;net6.0 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 a68c183076..bd0fa36c6e 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Connectors/src/Abstractions/Steeltoe.Connectors.Abstractions.csproj b/src/Connectors/src/Abstractions/Steeltoe.Connectors.Abstractions.csproj index a5d280e066..aba769b737 100644 --- a/src/Connectors/src/Abstractions/Steeltoe.Connectors.Abstractions.csproj +++ b/src/Connectors/src/Abstractions/Steeltoe.Connectors.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Connectors Abstractions for working with backing services diff --git a/src/Connectors/src/CloudFoundry/Steeltoe.Connectors.CloudFoundry.csproj b/src/Connectors/src/CloudFoundry/Steeltoe.Connectors.CloudFoundry.csproj index 804d276b05..5a39e3a1b8 100644 --- a/src/Connectors/src/CloudFoundry/Steeltoe.Connectors.CloudFoundry.csproj +++ b/src/Connectors/src/CloudFoundry/Steeltoe.Connectors.CloudFoundry.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Package for enabling Steeltoe Connectors on Cloud Foundry CloudFoundry;vcap;connectors true diff --git a/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj b/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj index 550f6de479..d4b0c86eb7 100644 --- a/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj +++ b/src/Connectors/src/Connectors/Steeltoe.Connectors.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 11b675fde8..839a1304a0 100644 --- a/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj +++ b/src/Connectors/src/EntityFrameworkCore/Steeltoe.Connectors.EntityFrameworkCore.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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/CloudFoundry.Test/Steeltoe.Connectors.CloudFoundry.Test.csproj b/src/Connectors/test/CloudFoundry.Test/Steeltoe.Connectors.CloudFoundry.Test.csproj index dcf94faa28..342fe4f65f 100644 --- a/src/Connectors/test/CloudFoundry.Test/Steeltoe.Connectors.CloudFoundry.Test.csproj +++ b/src/Connectors/test/CloudFoundry.Test/Steeltoe.Connectors.CloudFoundry.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj b/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj index 746c6d9308..d171fef66e 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 @@ - net6.0 + net8.0;net6.0 enable 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 c67979e925..c01e45ec8d 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 @@ - net6.0 + net8.0;net6.0 enable diff --git a/src/Discovery/src/Abstractions/Steeltoe.Discovery.Abstractions.csproj b/src/Discovery/src/Abstractions/Steeltoe.Discovery.Abstractions.csproj index 5c6ecf9517..3b4b19dffa 100644 --- a/src/Discovery/src/Abstractions/Steeltoe.Discovery.Abstractions.csproj +++ b/src/Discovery/src/Abstractions/Steeltoe.Discovery.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Discovery Abstractions for service registration and discovery diff --git a/src/Discovery/src/Client/Steeltoe.Discovery.Client.csproj b/src/Discovery/src/Client/Steeltoe.Discovery.Client.csproj index 1f37047cb1..05a3834da1 100644 --- a/src/Discovery/src/Client/Steeltoe.Discovery.Client.csproj +++ b/src/Discovery/src/Client/Steeltoe.Discovery.Client.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Base package for using Steeltoe Service Discovery service discovery;service registry;Spring Cloud;eureka;consul;kubernetes true diff --git a/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj b/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj index 1aef24d9da..0ff85a7854 100644 --- a/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj +++ b/src/Discovery/src/Consul/Steeltoe.Discovery.Consul.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe compatibility package for service discovery and registration with Hashicorp Consul aspnetcore;Consul;Spring;Spring Cloud true diff --git a/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj b/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj index bd806dab79..203884ece2 100644 --- a/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj +++ b/src/Discovery/src/Eureka/Steeltoe.Discovery.Eureka.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Client for service discovery and registration with Neflix Eureka aspnetcore;Netflix Eureka;Spring;Spring Cloud true diff --git a/src/Discovery/src/Kubernetes/Steeltoe.Discovery.Kubernetes.csproj b/src/Discovery/src/Kubernetes/Steeltoe.Discovery.Kubernetes.csproj index 6262223654..fb56416d93 100644 --- a/src/Discovery/src/Kubernetes/Steeltoe.Discovery.Kubernetes.csproj +++ b/src/Discovery/src/Kubernetes/Steeltoe.Discovery.Kubernetes.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Client for service discovery with Kubernetes native service discovery aspnetcore;Kubernetes;Spring;Spring Cloud true diff --git a/src/Discovery/test/Client.Test/Steeltoe.Discovery.Client.Test.csproj b/src/Discovery/test/Client.Test/Steeltoe.Discovery.Client.Test.csproj index fbbcb7bddb..ac08046f0b 100644 --- a/src/Discovery/test/Client.Test/Steeltoe.Discovery.Client.Test.csproj +++ b/src/Discovery/test/Client.Test/Steeltoe.Discovery.Client.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 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 070ffc59e4..498af56319 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 @@ - net6.0 + net8.0;net6.0 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 4df0349659..e8c52ffa31 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Discovery/test/Eureka.Test/TestConfigServerStartup.cs b/src/Discovery/test/Eureka.Test/TestConfigServerStartup.cs index a4533e2eed..5afacafbff 100644 --- a/src/Discovery/test/Eureka.Test/TestConfigServerStartup.cs +++ b/src/Discovery/test/Eureka.Test/TestConfigServerStartup.cs @@ -34,7 +34,7 @@ public void Configure(IApplicationBuilder app) LastRequest = await HttpRequestInfo.CreateAsync(context.Request); context.Response.StatusCode = ReturnStatus; - context.Response.Headers.Add("content-type", "application/json"); + context.Response.Headers.Append("content-type", "application/json"); await context.Response.WriteAsync(Response); }); } diff --git a/src/Discovery/test/Kubernetes.Test/Steeltoe.Discovery.Kubernetes.Test.csproj b/src/Discovery/test/Kubernetes.Test/Steeltoe.Discovery.Kubernetes.Test.csproj index 707a5eb9bd..8f67cd8f92 100644 --- a/src/Discovery/test/Kubernetes.Test/Steeltoe.Discovery.Kubernetes.Test.csproj +++ b/src/Discovery/test/Kubernetes.Test/Steeltoe.Discovery.Kubernetes.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 enable diff --git a/src/Integration/src/Abstractions/Steeltoe.Integration.Abstractions.csproj b/src/Integration/src/Abstractions/Steeltoe.Integration.Abstractions.csproj index ce5c43abbd..3460054492 100644 --- a/src/Integration/src/Abstractions/Steeltoe.Integration.Abstractions.csproj +++ b/src/Integration/src/Abstractions/Steeltoe.Integration.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Integration Abstractions for use with Steeltoe Integration libraries diff --git a/src/Integration/src/Integration/Steeltoe.Integration.csproj b/src/Integration/src/Integration/Steeltoe.Integration.csproj index ce528e1033..b077dcafb6 100644 --- a/src/Integration/src/Integration/Steeltoe.Integration.csproj +++ b/src/Integration/src/Integration/Steeltoe.Integration.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Integration Base **PLEASE NOTE** The public API of this package is subject to change and is not recommended for direct use outside of Steeltoe. diff --git a/src/Integration/src/RabbitMQ/Steeltoe.Integration.RabbitMQ.csproj b/src/Integration/src/RabbitMQ/Steeltoe.Integration.RabbitMQ.csproj index 6bae54a64a..69a4818b17 100644 --- a/src/Integration/src/RabbitMQ/Steeltoe.Integration.RabbitMQ.csproj +++ b/src/Integration/src/RabbitMQ/Steeltoe.Integration.RabbitMQ.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Integration RabbitMQ **PLEASE NOTE** The public API of this package is subject to change and is not recommended for direct use outside of Steeltoe. diff --git a/src/Integration/test/Benchmark/Benchmark.csproj b/src/Integration/test/Benchmark/Benchmark.csproj index 67039d6017..e6fea5206e 100644 --- a/src/Integration/test/Benchmark/Benchmark.csproj +++ b/src/Integration/test/Benchmark/Benchmark.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + net8.0;net6.0 false diff --git a/src/Integration/test/Integration.Test/Steeltoe.Integration.Test.csproj b/src/Integration/test/Integration.Test/Steeltoe.Integration.Test.csproj index 65b21fe57d..a7635739fd 100644 --- a/src/Integration/test/Integration.Test/Steeltoe.Integration.Test.csproj +++ b/src/Integration/test/Integration.Test/Steeltoe.Integration.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Integration/test/RabbitMQ.Test/Steeltoe.Integration.RabbitMQ.Test.csproj b/src/Integration/test/RabbitMQ.Test/Steeltoe.Integration.RabbitMQ.Test.csproj index 4981dd189a..3a383214c5 100644 --- a/src/Integration/test/RabbitMQ.Test/Steeltoe.Integration.RabbitMQ.Test.csproj +++ b/src/Integration/test/RabbitMQ.Test/Steeltoe.Integration.RabbitMQ.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj b/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj index 43c1fa0f07..6eb5532d1a 100644 --- a/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj +++ b/src/Logging/src/Abstractions/Steeltoe.Logging.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Logging Abstractions for use with dynamic logging diff --git a/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj b/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj index c95389b896..dd57d8dd55 100644 --- a/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj +++ b/src/Logging/src/DynamicLogger/Steeltoe.Logging.DynamicLogger.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Dynamic Console Logger logging;dynamic logging;console;management;monitoring;Spring Cloud; true diff --git a/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj b/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj index 894808aa58..7cd29e01e5 100644 --- a/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj +++ b/src/Logging/src/DynamicSerilog/Steeltoe.Logging.DynamicSerilog.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe library for enabling dynamic management of Serilog. logging;dynamic logging;serilog;management;monitoring;Spring Cloud; true 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 b4be1df053..0bb67671cc 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 @@ - net6.0 + net8.0;net6.0 enable 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 eb66495f9f..e069747fc7 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 @@ - net6.0 + net8.0;net6.0 enable diff --git a/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj b/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj index f961ce10d8..296e9a127f 100644 --- a/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj +++ b/src/Management/src/Abstractions/Steeltoe.Management.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Management Abstractions for application management and monitoring management;monitoring diff --git a/src/Management/src/Endpoint/CloudFoundry/CloudFoundrySecurityMiddleware.cs b/src/Management/src/Endpoint/CloudFoundry/CloudFoundrySecurityMiddleware.cs index 9bf7610606..9dea7cce80 100644 --- a/src/Management/src/Endpoint/CloudFoundry/CloudFoundrySecurityMiddleware.cs +++ b/src/Management/src/Endpoint/CloudFoundry/CloudFoundrySecurityMiddleware.cs @@ -153,7 +153,7 @@ internal Task GetPermissionsAsync(HttpContext context) private async Task ReturnErrorAsync(HttpContext context, SecurityResult error) { LogError(context, error); - context.Response.Headers.Add("Content-Type", "application/json;charset=UTF-8"); + context.Response.Headers.Append("Content-Type", "application/json;charset=UTF-8"); // allowing override of 400-level errors is more likely to cause confusion than to be useful if (_managementOptionsMonitor.CurrentValue.UseStatusCodeFromResponse || (int)error.Code < 500) diff --git a/src/Management/src/Endpoint/ContentNegotiation/ContentNegotiationExtensions.cs b/src/Management/src/Endpoint/ContentNegotiation/ContentNegotiationExtensions.cs index b4a6f42f26..328b376078 100644 --- a/src/Management/src/Endpoint/ContentNegotiation/ContentNegotiationExtensions.cs +++ b/src/Management/src/Endpoint/ContentNegotiation/ContentNegotiationExtensions.cs @@ -28,7 +28,7 @@ private static void SetContentType(IHeaderDictionary responseHeaders, IHeaderDic string contentType = ActuatorMediaTypes.GetContentHeaders(acceptMediaTypes, version); - responseHeaders.Add("Content-Type", contentType); + responseHeaders.Append("Content-Type", contentType); LogContentType(logger, requestHeaders, contentType); } diff --git a/src/Management/src/Endpoint/HeapDump/HeapDumpEndpointMiddleware.cs b/src/Management/src/Endpoint/HeapDump/HeapDumpEndpointMiddleware.cs index 121024f58f..7b40d8c7c2 100644 --- a/src/Management/src/Endpoint/HeapDump/HeapDumpEndpointMiddleware.cs +++ b/src/Management/src/Endpoint/HeapDump/HeapDumpEndpointMiddleware.cs @@ -38,7 +38,7 @@ protected override async Task WriteResponseAsync(string? fileName, HttpContext c } context.Response.ContentType = "application/octet-stream"; - context.Response.Headers.Add("Content-Disposition", $"attachment; filename=\"{Path.GetFileName(fileName)}.gz\""); + context.Response.Headers.Append("Content-Disposition", $"attachment; filename=\"{Path.GetFileName(fileName)}.gz\""); context.Response.StatusCode = StatusCodes.Status200OK; try diff --git a/src/Management/src/Endpoint/ManagementPort/ManagementPortMiddleware.cs b/src/Management/src/Endpoint/ManagementPort/ManagementPortMiddleware.cs index 9f43dd196d..cfc2bba6a3 100644 --- a/src/Management/src/Endpoint/ManagementPort/ManagementPortMiddleware.cs +++ b/src/Management/src/Endpoint/ManagementPort/ManagementPortMiddleware.cs @@ -60,7 +60,7 @@ private Task ReturnErrorAsync(HttpContext context, string? managementPort) _logger.LogError("ManagementMiddleWare Error: Access denied on {port} since Management Port is set to {managementPort}", context.Request.Host.Port, managementPort); - context.Response.Headers.Add("Content-Type", "application/json;charset=UTF-8"); + context.Response.Headers.Append("Content-Type", "application/json;charset=UTF-8"); context.Response.StatusCode = StatusCodes.Status404NotFound; return context.Response.WriteAsJsonAsync(errorResponse); diff --git a/src/Management/src/Endpoint/Metrics/Observer/ClrRuntimeSource.cs b/src/Management/src/Endpoint/Metrics/Observer/ClrRuntimeSource.cs index 2e9865939f..b8f31403d4 100644 --- a/src/Management/src/Endpoint/Metrics/Observer/ClrRuntimeSource.cs +++ b/src/Management/src/Endpoint/Metrics/Observer/ClrRuntimeSource.cs @@ -33,7 +33,10 @@ public record struct HeapMetrics(long TotalMemory, IList CollectionCounts) public readonly IList CollectionCounts = CollectionCounts; } - public record struct ThreadMetrics(long AvailableThreadPoolWorkers, long AvailableThreadCompletionPort, long MaxThreadPoolWorkers, + public record struct ThreadMetrics( + long AvailableThreadPoolWorkers, + long AvailableThreadCompletionPort, + long MaxThreadPoolWorkers, long MaxThreadCompletionPort) { public readonly long AvailableThreadPoolWorkers = AvailableThreadPoolWorkers; diff --git a/src/Management/src/Endpoint/SpringBootAdminClient/SpringBootAdminClientHostedService.cs b/src/Management/src/Endpoint/SpringBootAdminClient/SpringBootAdminClientHostedService.cs index 8de55891a4..2ff2b87a41 100644 --- a/src/Management/src/Endpoint/SpringBootAdminClient/SpringBootAdminClientHostedService.cs +++ b/src/Management/src/Endpoint/SpringBootAdminClient/SpringBootAdminClientHostedService.cs @@ -67,7 +67,7 @@ public async Task StartAsync(CancellationToken cancellationToken) if (response is { IsSuccessStatusCode: true }) { - RegistrationResult = await response.Content.ReadFromJsonAsync(cancellationToken: cancellationToken); + RegistrationResult = await response.Content.ReadFromJsonAsync(cancellationToken); } else { diff --git a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj index 470d97029b..a8f66e8953 100755 --- a/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj +++ b/src/Management/src/Endpoint/Steeltoe.Management.Endpoint.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe management endpoints actuators;management;monitoring;Spring Cloud true diff --git a/src/Management/src/Kubernetes/Steeltoe.Management.Kubernetes.csproj b/src/Management/src/Kubernetes/Steeltoe.Management.Kubernetes.csproj index 973e0f9189..40b143fc22 100755 --- a/src/Management/src/Kubernetes/Steeltoe.Management.Kubernetes.csproj +++ b/src/Management/src/Kubernetes/Steeltoe.Management.Kubernetes.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Package for using Steeltoe management endpoints with ASP.NET Core on Kubernetes. actuators;management;monitoring;aspnetcore;Kubernetes;Spring Cloud;k8s true diff --git a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj index 1b8749a128..a812eb96c4 100644 --- a/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj +++ b/src/Management/src/Prometheus/Steeltoe.Management.Prometheus.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 449dae085e..4fbde1ff9e 100644 --- a/src/Management/src/Task/Steeltoe.Management.Task.csproj +++ b/src/Management/src/Task/Steeltoe.Management.Task.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 1ae9471aa6..3782efa3f4 100644 --- a/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj +++ b/src/Management/src/Tracing/Steeltoe.Management.Tracing.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0;net6.0 Enables request tracing in distributed systems. management;monitoring;distributed tracing true diff --git a/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj b/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj index 15a6a7d330..2ded7f80be 100644 --- a/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj +++ b/src/Management/src/Wavefront/Steeltoe.Management.Wavefront.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Adds Wavefront support for Steeltoe management endpoints actuators;management;monitoring;distributed tracing;metrics;wavefront true diff --git a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs index d3728359ab..9f11b4d410 100644 --- a/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs +++ b/src/Management/test/Endpoint.Test/CloudFoundry/CloudFoundrySecurityMiddlewareTest.cs @@ -335,7 +335,7 @@ public void GetAccessToken_ReturnsExpected() Assert.Empty(token); HttpContext context2 = CreateRequest("GET", "/"); - context2.Request.Headers.Add("Authorization", new StringValues("Bearer foobar")); + context2.Request.Headers.Append("Authorization", new StringValues("Bearer foobar")); string token2 = middleware.GetAccessToken(context2.Request); Assert.Equal("foobar", token2); } diff --git a/src/Management/test/Endpoint.Test/SpringBootAdminClient/TestMiddleware.cs b/src/Management/test/Endpoint.Test/SpringBootAdminClient/TestMiddleware.cs index 4e958afc8f..5e79dc3018 100644 --- a/src/Management/test/Endpoint.Test/SpringBootAdminClient/TestMiddleware.cs +++ b/src/Management/test/Endpoint.Test/SpringBootAdminClient/TestMiddleware.cs @@ -23,7 +23,7 @@ public async Task InvokeAsync(HttpContext context, RequestDelegate next) if (context.Request.Path.Value?.EndsWith("instances", StringComparison.Ordinal) == true) { var dictionary = await JsonSerializer.DeserializeAsync>(context.Request.Body); - context.Response.Headers.Add("Content-Type", "application/json"); + context.Response.Headers.Append("Content-Type", "application/json"); bool isValid = dictionary != null && KeyNames.All(dictionary.ContainsKey); 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 9c1a0114d7..0411f60b04 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 @@ - net6.0 + net8.0;net6.0 enable @@ -27,7 +27,7 @@ - + diff --git a/src/Management/test/Endpoint.Test/TestAuthHandler.cs b/src/Management/test/Endpoint.Test/TestAuthHandler.cs index 2928d700e9..d472964746 100644 --- a/src/Management/test/Endpoint.Test/TestAuthHandler.cs +++ b/src/Management/test/Endpoint.Test/TestAuthHandler.cs @@ -14,8 +14,13 @@ 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/Trace/TraceDiagnosticObserverTest.cs b/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs index dce25f6c06..717e671665 100644 --- a/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs +++ b/src/Management/test/Endpoint.Test/Trace/TraceDiagnosticObserverTest.cs @@ -382,8 +382,8 @@ private HttpContext CreateRequest() context.Request.Scheme = "http"; context.Request.Host = new HostString("localhost:1111"); context.Request.QueryString = new QueryString("?foo=bar&bar=foo"); - context.Request.Headers.Add("Header1", new StringValues("header1Value")); - context.Request.Headers.Add("Header2", new StringValues("header2Value")); + context.Request.Headers.Append("Header1", new StringValues("header1Value")); + context.Request.Headers.Append("Header2", new StringValues("header2Value")); return context; } } diff --git a/src/Management/test/Kubernetes.Test/Steeltoe.Management.Kubernetes.Test.csproj b/src/Management/test/Kubernetes.Test/Steeltoe.Management.Kubernetes.Test.csproj index 843ae1ecbb..1ac0ece178 100644 --- a/src/Management/test/Kubernetes.Test/Steeltoe.Management.Kubernetes.Test.csproj +++ b/src/Management/test/Kubernetes.Test/Steeltoe.Management.Kubernetes.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.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 ba5ffea85c..45eb8b56b6 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 @@ - net6.0 + net8.0;net6.0 enable 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 e64b004c53..c0ee48d312 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 @@ - net6.0 + net8.0;net6.0 enable diff --git a/src/Messaging/src/Abstractions/Steeltoe.Messaging.Abstractions.csproj b/src/Messaging/src/Abstractions/Steeltoe.Messaging.Abstractions.csproj index 8884402c7d..ffa4b8eb03 100644 --- a/src/Messaging/src/Abstractions/Steeltoe.Messaging.Abstractions.csproj +++ b/src/Messaging/src/Abstractions/Steeltoe.Messaging.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Messaging Abstractions for use with Steeltoe Messaging diff --git a/src/Messaging/src/Messaging/Steeltoe.Messaging.csproj b/src/Messaging/src/Messaging/Steeltoe.Messaging.csproj index ff70d9531c..b725df7f72 100644 --- a/src/Messaging/src/Messaging/Steeltoe.Messaging.csproj +++ b/src/Messaging/src/Messaging/Steeltoe.Messaging.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Messaging Base Messaging, NET Core, Spring, Spring Cloud true diff --git a/src/Messaging/src/RabbitMQ/Listener/Adapters/MessageListenerAdapter.cs b/src/Messaging/src/RabbitMQ/Listener/Adapters/MessageListenerAdapter.cs index 766266fe53..b588145f37 100644 --- a/src/Messaging/src/RabbitMQ/Listener/Adapters/MessageListenerAdapter.cs +++ b/src/Messaging/src/RabbitMQ/Listener/Adapters/MessageListenerAdapter.cs @@ -7,11 +7,11 @@ using Microsoft.Extensions.Logging; using Steeltoe.Common; using Steeltoe.Common.Contexts; -using Steeltoe.Common.Util; using Steeltoe.Messaging.Converter; using Steeltoe.Messaging.RabbitMQ.Extensions; using Steeltoe.Messaging.RabbitMQ.Listener.Exceptions; using RC = RabbitMQ.Client; +using SteeltoeMethodInvoker = Steeltoe.Common.Util.MethodInvoker; namespace Steeltoe.Messaging.RabbitMQ.Listener.Adapters; @@ -152,7 +152,7 @@ protected virtual object InvokeListenerMethod(string methodName, object[] argume { try { - var methodInvoker = new MethodInvoker(); + var methodInvoker = new SteeltoeMethodInvoker(); methodInvoker.SetTargetObject(Instance); methodInvoker.TargetMethod = methodName; methodInvoker.SetArguments(arguments); diff --git a/src/Messaging/src/RabbitMQ/Steeltoe.Messaging.RabbitMQ.csproj b/src/Messaging/src/RabbitMQ/Steeltoe.Messaging.RabbitMQ.csproj index 9e962a4781..96fd57109a 100644 --- a/src/Messaging/src/RabbitMQ/Steeltoe.Messaging.RabbitMQ.csproj +++ b/src/Messaging/src/RabbitMQ/Steeltoe.Messaging.RabbitMQ.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Messaging RabbitMQ Messaging, ASPNET Core, Spring, Spring Cloud true diff --git a/src/Messaging/src/RabbitMQ/Support/Converter/SimpleMessageConverter.cs b/src/Messaging/src/RabbitMQ/Support/Converter/SimpleMessageConverter.cs index 67f367c0fb..a22508a82a 100644 --- a/src/Messaging/src/RabbitMQ/Support/Converter/SimpleMessageConverter.cs +++ b/src/Messaging/src/RabbitMQ/Support/Converter/SimpleMessageConverter.cs @@ -56,10 +56,9 @@ public override object FromMessage(IMessage message, Type targetType, object con { try { +#pragma warning disable SYSLIB0011 // Type or member is obsolete var formatter = new BinaryFormatter(); using var stream = new MemoryStream(bytesMessage.Payload); - -#pragma warning disable SYSLIB0011 // Type or member is obsolete content = formatter.Deserialize(stream); #pragma warning restore SYSLIB0011 // Type or member is obsolete } @@ -111,7 +110,9 @@ protected override IMessage CreateMessage(object payload, IMessageHeaders header break; } default: +#pragma warning disable SYSLIB0050 // Type or member is obsolete if (payload != null && payload.GetType().IsSerializable) +#pragma warning restore SYSLIB0050 // Type or member is obsolete { bytes = SerializeObject(payload); accessor.ContentType = MessageHeaders.ContentTypeDotNetSerializedObject; @@ -136,10 +137,9 @@ private static byte[] SerializeObject(object payload) { try { +#pragma warning disable SYSLIB0011 // Type or member is obsolete var formatter = new BinaryFormatter(); using var stream = new MemoryStream(512); - -#pragma warning disable SYSLIB0011 // Type or member is obsolete formatter.Serialize(stream, payload); #pragma warning restore SYSLIB0011 // Type or member is obsolete return stream.ToArray(); diff --git a/src/Messaging/test/Benchmarks/Channel/ChannelBenchmark.csproj b/src/Messaging/test/Benchmarks/Channel/ChannelBenchmark.csproj index d7ae44e0f5..8cebc189f7 100644 --- a/src/Messaging/test/Benchmarks/Channel/ChannelBenchmark.csproj +++ b/src/Messaging/test/Benchmarks/Channel/ChannelBenchmark.csproj @@ -1,7 +1,7 @@ Exe - net6.0 + net8.0;net6.0 false diff --git a/src/Messaging/test/Messaging.Test/Steeltoe.Messaging.Test.csproj b/src/Messaging/test/Messaging.Test/Steeltoe.Messaging.Test.csproj index 3b0d5270c4..59d3971bcb 100644 --- a/src/Messaging/test/Messaging.Test/Steeltoe.Messaging.Test.csproj +++ b/src/Messaging/test/Messaging.Test/Steeltoe.Messaging.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Messaging/test/RabbitMQ.Test/Core/RabbitTemplateIntegrationTest.cs b/src/Messaging/test/RabbitMQ.Test/Core/RabbitTemplateIntegrationTest.cs index 97dd0272ea..d7f931190c 100644 --- a/src/Messaging/test/RabbitMQ.Test/Core/RabbitTemplateIntegrationTest.cs +++ b/src/Messaging/test/RabbitMQ.Test/Core/RabbitTemplateIntegrationTest.cs @@ -955,10 +955,10 @@ public async Task TestSymmetricalReceiveAndReply() ContentType = MessageHeaders.ContentTypeDotNetSerializedObject }; +#pragma warning disable SYSLIB0011 // Type or member is obsolete var formatter = new BinaryFormatter(); using var requestStream = new MemoryStream(512); -#pragma warning disable SYSLIB0011 // Type or member is obsolete formatter.Serialize(requestStream, request); byte[] bytes = requestStream.ToArray(); IMessage reply = rabbitTemplate.SendAndReceive(Message.Create(bytes, messageHeaders.MessageHeaders)); diff --git a/src/Messaging/test/RabbitMQ.Test/Steeltoe.Messaging.RabbitMQ.Test.csproj b/src/Messaging/test/RabbitMQ.Test/Steeltoe.Messaging.RabbitMQ.Test.csproj index b126ea0c85..6076fb8214 100644 --- a/src/Messaging/test/RabbitMQ.Test/Steeltoe.Messaging.RabbitMQ.Test.csproj +++ b/src/Messaging/test/RabbitMQ.Test/Steeltoe.Messaging.RabbitMQ.Test.csproj @@ -1,6 +1,7 @@ - net6.0 + net8.0;net6.0 + true diff --git a/src/Security/src/Authentication.CloudFoundry/CloudFoundryOAuthHandler.cs b/src/Security/src/Authentication.CloudFoundry/CloudFoundryOAuthHandler.cs index 0b3e10c5d4..b9a7102459 100644 --- a/src/Security/src/Authentication.CloudFoundry/CloudFoundryOAuthHandler.cs +++ b/src/Security/src/Authentication.CloudFoundry/CloudFoundryOAuthHandler.cs @@ -19,8 +19,13 @@ public class CloudFoundryOAuthHandler : OAuthHandler { private readonly ILogger _logger; +#if NET6_0 public CloudFoundryOAuthHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock) +#else + public CloudFoundryOAuthHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) + : base(options, logger, encoder) +#endif { _logger = logger.CreateLogger(); } diff --git a/src/Security/src/Authentication.CloudFoundry/Steeltoe.Security.Authentication.CloudFoundry.csproj b/src/Security/src/Authentication.CloudFoundry/Steeltoe.Security.Authentication.CloudFoundry.csproj index d70b2a8116..94611801e7 100644 --- a/src/Security/src/Authentication.CloudFoundry/Steeltoe.Security.Authentication.CloudFoundry.csproj +++ b/src/Security/src/Authentication.CloudFoundry/Steeltoe.Security.Authentication.CloudFoundry.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Base Security Provider for CloudFoundry CloudFoundry;security;oauth2;sso;openid true diff --git a/src/Security/src/Authentication.Mtls/MutualTlsAuthenticationHandler.cs b/src/Security/src/Authentication.Mtls/MutualTlsAuthenticationHandler.cs index f3cd2a79ba..910c67d2e0 100644 --- a/src/Security/src/Authentication.Mtls/MutualTlsAuthenticationHandler.cs +++ b/src/Security/src/Authentication.Mtls/MutualTlsAuthenticationHandler.cs @@ -28,9 +28,14 @@ internal sealed class MutualTlsAuthenticationHandler : AuthenticationHandler private new CertificateAuthenticationEvents Events => (CertificateAuthenticationEvents)base.Events; +#if NET6_0 public MutualTlsAuthenticationHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock) +#else + public MutualTlsAuthenticationHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) + : base(options, logger, encoder) +#endif { } diff --git a/src/Security/src/Authentication.Mtls/Steeltoe.Security.Authentication.Mtls.csproj b/src/Security/src/Authentication.Mtls/Steeltoe.Security.Authentication.Mtls.csproj index 7445bdd722..1d3d38f43c 100644 --- a/src/Security/src/Authentication.Mtls/Steeltoe.Security.Authentication.Mtls.csproj +++ b/src/Security/src/Authentication.Mtls/Steeltoe.Security.Authentication.Mtls.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 ASP.NET Core middleware that enables an application to support certificate authentication. aspnetcore;authentication;security;x509;certificate;mtls true 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 2468e92571..9274e67175 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 @@ - net6.0 + net8.0;net6.0 Support for storing data protection keys in Redis. CloudFoundry;aspnetcore;security;dataprotection;redis true diff --git a/src/Security/test/Authentication.CloudFoundry.Test/CloudFoundryOAuthHandlerTest.cs b/src/Security/test/Authentication.CloudFoundry.Test/CloudFoundryOAuthHandlerTest.cs index a8e4617d9e..90fc386dcf 100644 --- a/src/Security/test/Authentication.CloudFoundry.Test/CloudFoundryOAuthHandlerTest.cs +++ b/src/Security/test/Authentication.CloudFoundry.Test/CloudFoundryOAuthHandlerTest.cs @@ -199,8 +199,12 @@ private MyTestCloudFoundryHandler GetTestHandler(CloudFoundryOAuthOptions option var loggerFactory = new LoggerFactory(); IOptionsMonitor monitor = new MonitorWrapper(options); var encoder = UrlEncoder.Default; - var clock = new TestClock(); - var testHandler = new MyTestCloudFoundryHandler(monitor, loggerFactory, encoder, clock); + +#if NET6_0 + var testHandler = new MyTestCloudFoundryHandler(monitor, loggerFactory, encoder, new TestClock()); +#else + var testHandler = new MyTestCloudFoundryHandler(monitor, loggerFactory, encoder); +#endif testHandler.InitializeAsync( new AuthenticationScheme(CloudFoundryDefaults.AuthenticationScheme, CloudFoundryDefaults.AuthenticationScheme, typeof(CloudFoundryOAuthHandler)), diff --git a/src/Security/test/Authentication.CloudFoundry.Test/MyTestCloudFoundryHandler.cs b/src/Security/test/Authentication.CloudFoundry.Test/MyTestCloudFoundryHandler.cs index 25ded5225a..0f02a6e33f 100644 --- a/src/Security/test/Authentication.CloudFoundry.Test/MyTestCloudFoundryHandler.cs +++ b/src/Security/test/Authentication.CloudFoundry.Test/MyTestCloudFoundryHandler.cs @@ -11,10 +11,15 @@ namespace Steeltoe.Security.Authentication.CloudFoundry.Test; -public sealed class MyTestCloudFoundryHandler : CloudFoundryOAuthHandler +internal sealed class MyTestCloudFoundryHandler : CloudFoundryOAuthHandler { +#if NET6_0 public MyTestCloudFoundryHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock) +#else + public MyTestCloudFoundryHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) + : base(options, logger, encoder) +#endif { } diff --git a/src/Security/test/Authentication.CloudFoundry.Test/Steeltoe.Security.Authentication.CloudFoundry.Test.csproj b/src/Security/test/Authentication.CloudFoundry.Test/Steeltoe.Security.Authentication.CloudFoundry.Test.csproj index a46756d025..5bc8545b6a 100644 --- a/src/Security/test/Authentication.CloudFoundry.Test/Steeltoe.Security.Authentication.CloudFoundry.Test.csproj +++ b/src/Security/test/Authentication.CloudFoundry.Test/Steeltoe.Security.Authentication.CloudFoundry.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Security/test/Authentication.CloudFoundry.Test/TestClock.cs b/src/Security/test/Authentication.CloudFoundry.Test/TestClock.cs index d168d9bcee..b526f50d57 100644 --- a/src/Security/test/Authentication.CloudFoundry.Test/TestClock.cs +++ b/src/Security/test/Authentication.CloudFoundry.Test/TestClock.cs @@ -6,14 +6,13 @@ namespace Steeltoe.Security.Authentication.CloudFoundry.Test; +#if !NET6_0 +#pragma warning disable CS0618 // Type or member is obsolete +#endif + public sealed class TestClock : ISystemClock { - public DateTimeOffset UtcNow { get; set; } - - public TestClock() - { - UtcNow = new DateTimeOffset(2013, 6, 11, 12, 34, 56, 789, TimeSpan.Zero); - } + public DateTimeOffset UtcNow { get; set; } = new(2013, 6, 11, 12, 34, 56, 789, TimeSpan.Zero); public void Add(TimeSpan timeSpan) { diff --git a/src/Security/test/Authentication.Mtls.Test/Steeltoe.Security.Authentication.Mtls.Test.csproj b/src/Security/test/Authentication.Mtls.Test/Steeltoe.Security.Authentication.Mtls.Test.csproj index d60b99ccc5..fb6e2ff299 100644 --- a/src/Security/test/Authentication.Mtls.Test/Steeltoe.Security.Authentication.Mtls.Test.csproj +++ b/src/Security/test/Authentication.Mtls.Test/Steeltoe.Security.Authentication.Mtls.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 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 2bf6e4da81..5b356f46cb 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 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Steeltoe.All.sln.DotSettings b/src/Steeltoe.All.sln.DotSettings index 43922676f6..807ead186c 100644 --- a/src/Steeltoe.All.sln.DotSettings +++ b/src/Steeltoe.All.sln.DotSettings @@ -596,6 +596,7 @@ See the LICENSE file in the project root for more information. <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Protected, PrivateProtected" Description="Protected fields"><ElementKinds><Kind Name="FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> + True True True True diff --git a/src/Stream/src/Abstractions/Steeltoe.Stream.Abstractions.csproj b/src/Stream/src/Abstractions/Steeltoe.Stream.Abstractions.csproj index 8fb065236f..a52c794258 100644 --- a/src/Stream/src/Abstractions/Steeltoe.Stream.Abstractions.csproj +++ b/src/Stream/src/Abstractions/Steeltoe.Stream.Abstractions.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe.Stream Abstractions for use with Steeltoe Stream diff --git a/src/Stream/src/BinderRabbitMQ/Steeltoe.Stream.Binder.RabbitMQ.csproj b/src/Stream/src/BinderRabbitMQ/Steeltoe.Stream.Binder.RabbitMQ.csproj index 79f865b59b..4a5a960e8b 100644 --- a/src/Stream/src/BinderRabbitMQ/Steeltoe.Stream.Binder.RabbitMQ.csproj +++ b/src/Stream/src/BinderRabbitMQ/Steeltoe.Stream.Binder.RabbitMQ.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Stream RabbitMQ Binder Streams, ASPNET Core, Spring, Spring Cloud, RabbitMQ, Binder true diff --git a/src/Stream/src/Stream/Steeltoe.Stream.csproj b/src/Stream/src/Stream/Steeltoe.Stream.csproj index 0d5a63dbfe..08f2e7ae7e 100644 --- a/src/Stream/src/Stream/Steeltoe.Stream.csproj +++ b/src/Stream/src/Stream/Steeltoe.Stream.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Steeltoe Stream Base Streams, NET Core, Spring, Spring Cloud true diff --git a/src/Stream/test/Binder.Test/Steeltoe.Stream.Binder.Test.csproj b/src/Stream/test/Binder.Test/Steeltoe.Stream.Binder.Test.csproj index 367a6222e3..6ba6d7111e 100644 --- a/src/Stream/test/Binder.Test/Steeltoe.Stream.Binder.Test.csproj +++ b/src/Stream/test/Binder.Test/Steeltoe.Stream.Binder.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Stream/test/BinderRabbitMQ.Test/Steeltoe.Stream.Binder.RabbitMQ.Test.csproj b/src/Stream/test/BinderRabbitMQ.Test/Steeltoe.Stream.Binder.RabbitMQ.Test.csproj index 1974c365b7..6db0a0589c 100644 --- a/src/Stream/test/BinderRabbitMQ.Test/Steeltoe.Stream.Binder.RabbitMQ.Test.csproj +++ b/src/Stream/test/BinderRabbitMQ.Test/Steeltoe.Stream.Binder.RabbitMQ.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 Exe diff --git a/src/Stream/test/MockBinder/Steeltoe.Stream.MockBinder.csproj b/src/Stream/test/MockBinder/Steeltoe.Stream.MockBinder.csproj index ad8b96aec0..77e758e5ac 100644 --- a/src/Stream/test/MockBinder/Steeltoe.Stream.MockBinder.csproj +++ b/src/Stream/test/MockBinder/Steeltoe.Stream.MockBinder.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 False diff --git a/src/Stream/test/Stream.Test/Steeltoe.Stream.Test.csproj b/src/Stream/test/Stream.Test/Steeltoe.Stream.Test.csproj index 685cb7cb78..106d9a1136 100644 --- a/src/Stream/test/Stream.Test/Steeltoe.Stream.Test.csproj +++ b/src/Stream/test/Stream.Test/Steeltoe.Stream.Test.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 diff --git a/src/Stream/test/StubBinder1/Steeltoe.Stream.StubBinder1.csproj b/src/Stream/test/StubBinder1/Steeltoe.Stream.StubBinder1.csproj index 9112ac5a07..05a990de1c 100644 --- a/src/Stream/test/StubBinder1/Steeltoe.Stream.StubBinder1.csproj +++ b/src/Stream/test/StubBinder1/Steeltoe.Stream.StubBinder1.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 False diff --git a/src/Stream/test/StubBinder2/Steeltoe.Stream.StubBinder2.csproj b/src/Stream/test/StubBinder2/Steeltoe.Stream.StubBinder2.csproj index 9112ac5a07..05a990de1c 100644 --- a/src/Stream/test/StubBinder2/Steeltoe.Stream.StubBinder2.csproj +++ b/src/Stream/test/StubBinder2/Steeltoe.Stream.StubBinder2.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 False diff --git a/src/Stream/test/TestBinder/Steeltoe.Stream.TestBinder.csproj b/src/Stream/test/TestBinder/Steeltoe.Stream.TestBinder.csproj index 9112ac5a07..05a990de1c 100644 --- a/src/Stream/test/TestBinder/Steeltoe.Stream.TestBinder.csproj +++ b/src/Stream/test/TestBinder/Steeltoe.Stream.TestBinder.csproj @@ -1,6 +1,6 @@ - net6.0 + net8.0;net6.0 False diff --git a/versions.props b/versions.props index 3798a1b1c7..255f761f4d 100644 --- a/versions.props +++ b/versions.props @@ -38,6 +38,14 @@ 2.5.* + + 7.0.* + + + + 6.0.* + + - 7.0.* + 8.0.* 13.0.* 12.1.* 4.7.* - - - 6.0.* - 7.0.* 1.5.* 1.4.0-rc.3 @@ -86,4 +86,26 @@ 2.0.* 1.8.0-beta + + + + + 8.0.* + + + + + + + 6.0.* + +