diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 90ed289166..096bee7fba 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "jetbrains.resharper.globaltools": { - "version": "2026.2.4", + "version": "2026.3.0", "commands": [ "jb" ], @@ -24,4 +24,4 @@ "rollForward": false } } -} +} \ No newline at end of file diff --git a/.github/workflows/Steeltoe.All.yml b/.github/workflows/Steeltoe.All.yml index 051fc9ec7d..5786dc8b41 100644 --- a/.github/workflows/Steeltoe.All.yml +++ b/.github/workflows/Steeltoe.All.yml @@ -72,6 +72,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Turn off dev certificate (macOS only) if: ${{ matrix.os == 'macos-latest' }} diff --git a/.github/workflows/component-shared-workflow.yml b/.github/workflows/component-shared-workflow.yml index d39c3f5f1b..87cace0564 100644 --- a/.github/workflows/component-shared-workflow.yml +++ b/.github/workflows/component-shared-workflow.yml @@ -62,6 +62,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Turn off dev certificate (macOS only) if: ${{ inputs.OS == 'macos' }} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index e16a503cfd..994f4d521a 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -38,6 +38,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Git checkout uses: actions/checkout@v7 @@ -149,7 +150,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.* + dotnet-version: 11.0.* - name: Install code signing tool run: dotnet tool install --global sign --prerelease @@ -209,7 +210,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.* + dotnet-version: 11.0.* source-url: ${{ vars.AZURE_ARTIFACTS_FEED_URL }} env: NUGET_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -242,7 +243,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v6 with: - dotnet-version: 10.0.* + dotnet-version: 11.0.* - name: Download signed packages uses: actions/download-artifact@v8 diff --git a/.github/workflows/scan-vulnerable-dependencies.yml b/.github/workflows/scan-vulnerable-dependencies.yml index ff7f4da03f..33e891e7b2 100644 --- a/.github/workflows/scan-vulnerable-dependencies.yml +++ b/.github/workflows/scan-vulnerable-dependencies.yml @@ -34,6 +34,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Git checkout uses: actions/checkout@v7 diff --git a/.github/workflows/sonarcube.yml b/.github/workflows/sonarcube.yml index ba17c0aaaa..111fd27bd5 100644 --- a/.github/workflows/sonarcube.yml +++ b/.github/workflows/sonarcube.yml @@ -65,6 +65,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Install Sonar .NET Scanner run: dotnet tool install --global dotnet-sonarscanner diff --git a/.github/workflows/verify-code-style.yml b/.github/workflows/verify-code-style.yml index b55281c0ff..0a7f33bf99 100644 --- a/.github/workflows/verify-code-style.yml +++ b/.github/workflows/verify-code-style.yml @@ -33,6 +33,7 @@ jobs: 8.0.* 9.0.* 10.0.* + 11.0.* - name: Git checkout uses: actions/checkout@v7 diff --git a/README.md b/README.md index cdd0c1db15..222a6da534 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ In addition to the [feature documentation](https://steeltoe.io/api), we have bui | Steeltoe Branch | .NET Version | Status | | --- | --- | --- | -| main | .NET 8 - 10 | Unstable | +| main | .NET 8 - 11 | Unstable | | 4.x | .NET 8 - 10 | Stable | | 3.x | .NET 8 | Stable | | 2.x | .NET Framework 4.6.1+ | Out of Support | diff --git a/shared-test.props b/shared-test.props index ae3739e172..baa191ece1 100644 --- a/shared-test.props +++ b/shared-test.props @@ -31,4 +31,8 @@ PreserveNewest + + + + 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 eee10bda4b..54e1212701 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 @@ -12,7 +12,7 @@ - + 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 8b5c6233b2..0958a9de4f 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Certificates.Test/CertificateCollector.cs b/src/Common/test/Certificates.Test/CertificateCollector.cs index 2719c4b29e..7429fd9f24 100644 --- a/src/Common/test/Certificates.Test/CertificateCollector.cs +++ b/src/Common/test/Certificates.Test/CertificateCollector.cs @@ -13,7 +13,10 @@ namespace Steeltoe.Common.Certificates.Test; /// internal sealed class CertificateCollector : IDisposable { +#pragma warning disable IDE0028 // Simplify collection initialization + // Justification: workaround for bug https://youtrack.jetbrains.com/issue/RSRP-505438/Collection-expression-with-with-expression-requires-language-version-preview private readonly HashSet _certificatesToDispose = new(ReferenceEqualityComparer.Instance); +#pragma warning restore IDE0028 // Simplify collection initialization private IOptionsMonitor? _optionsMonitor; private string? _certificateName; private IDisposable? _changeListener; diff --git a/src/Common/test/Certificates.Test/Steeltoe.Common.Certificates.Test.csproj b/src/Common/test/Certificates.Test/Steeltoe.Common.Certificates.Test.csproj index 3397fd9de8..98a6f867e9 100644 --- a/src/Common/test/Certificates.Test/Steeltoe.Common.Certificates.Test.csproj +++ b/src/Common/test/Certificates.Test/Steeltoe.Common.Certificates.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj b/src/Common/test/Common.Test/Steeltoe.Common.Test.csproj index 11c155dabe..a9b3ee8d61 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Hosting.Test/Steeltoe.Common.Hosting.Test.csproj b/src/Common/test/Hosting.Test/Steeltoe.Common.Hosting.Test.csproj index c64bb90b71..1e6617cf91 100644 --- a/src/Common/test/Hosting.Test/Steeltoe.Common.Hosting.Test.csproj +++ b/src/Common/test/Hosting.Test/Steeltoe.Common.Hosting.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Http.Test/Steeltoe.Common.Http.Test.csproj b/src/Common/test/Http.Test/Steeltoe.Common.Http.Test.csproj index b119974f75..cd0939de74 100644 --- a/src/Common/test/Http.Test/Steeltoe.Common.Http.Test.csproj +++ b/src/Common/test/Http.Test/Steeltoe.Common.Http.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Logging.Test/Steeltoe.Common.Logging.Test.csproj b/src/Common/test/Logging.Test/Steeltoe.Common.Logging.Test.csproj index d6a1a9d34e..089579374f 100644 --- a/src/Common/test/Logging.Test/Steeltoe.Common.Logging.Test.csproj +++ b/src/Common/test/Logging.Test/Steeltoe.Common.Logging.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/Net.Test/Steeltoe.Common.Net.Test.csproj b/src/Common/test/Net.Test/Steeltoe.Common.Net.Test.csproj index 1b0953f58f..270d3dd4ea 100644 --- a/src/Common/test/Net.Test/Steeltoe.Common.Net.Test.csproj +++ b/src/Common/test/Net.Test/Steeltoe.Common.Net.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Common/test/TestResources/DelegateToMockHttpClientHandler.cs b/src/Common/test/TestResources/DelegateToMockHttpClientHandler.cs index 3721e86f6c..e7df3c0645 100644 --- a/src/Common/test/TestResources/DelegateToMockHttpClientHandler.cs +++ b/src/Common/test/TestResources/DelegateToMockHttpClientHandler.cs @@ -16,7 +16,12 @@ public sealed class DelegateToMockHttpClientHandler : HttpClientHandler { // We want to forward to another HttpClient, but that fails because the outer client has already marked the message as sent. // To avoid the error "The request message was already sent...", we need to revert that mark. +#if NET11_0_OR_GREATER + private static readonly FieldInfo FlagsField = typeof(HttpRequestMessage).GetField("_flags", BindingFlags.NonPublic | BindingFlags.Instance)!; + private const int AlreadySentBit = 0x01; +#else private static readonly FieldInfo SendStatusField = typeof(HttpRequestMessage).GetField("_sendStatus", BindingFlags.NonPublic | BindingFlags.Instance)!; +#endif public MockHttpMessageHandler Mock { get; } = new(); @@ -79,6 +84,12 @@ protected override HttpResponseMessage Send(HttpRequestMessage request, Cancella private static void MarkMessageAsNotYetSent(HttpRequestMessage request) { +#if NET11_0_OR_GREATER + int flags = (int)FlagsField.GetValue(request)!; + flags &= ~AlreadySentBit; + FlagsField.SetValue(request, flags); +#else SendStatusField.SetValue(request, 0); +#endif } } diff --git a/src/Common/test/TestResources/MemoryFileProvider.cs b/src/Common/test/TestResources/MemoryFileProvider.cs index e28f45a91d..c8ae1f4745 100644 --- a/src/Common/test/TestResources/MemoryFileProvider.cs +++ b/src/Common/test/TestResources/MemoryFileProvider.cs @@ -172,7 +172,10 @@ private sealed class MemoryFileSystemEntry : IDirectoryContents, IFileInfo public long Length => _fileContents?.Length ?? -1; public DateTimeOffset LastModified => default; +#pragma warning disable IDE0028 // Simplify collection initialization + // Justification: workaround for bug https://youtrack.jetbrains.com/issue/RSRP-505438/Collection-expression-with-with-expression-requires-language-version-preview public Dictionary Children { get; } = new(StringComparer.OrdinalIgnoreCase); +#pragma warning restore IDE0028 // Simplify collection initialization private MemoryFileSystemEntry(string name, byte[]? fileContents) { diff --git a/src/Common/test/TestResources/Steeltoe.Common.TestResources.csproj b/src/Common/test/TestResources/Steeltoe.Common.TestResources.csproj index 0cb65d3bcc..94c7e09b7b 100644 --- a/src/Common/test/TestResources/Steeltoe.Common.TestResources.csproj +++ b/src/Common/test/TestResources/Steeltoe.Common.TestResources.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 false diff --git a/src/Common/test/TestResources/TestContextExtensions.cs b/src/Common/test/TestResources/TestContextExtensions.cs index 69af9953fc..7c6852a7bc 100644 --- a/src/Common/test/TestResources/TestContextExtensions.cs +++ b/src/Common/test/TestResources/TestContextExtensions.cs @@ -8,11 +8,11 @@ namespace Steeltoe.Common.TestResources; public static class TestContextExtensions { - // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Global public static bool IsRunningOnBuildServer(this ITestContext testContext) { ArgumentNullException.ThrowIfNull(testContext); + _ = testContext; return Environment.GetEnvironmentVariable("CI") == "true"; } } 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 095019fc55..d5083e1d3d 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 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 3d62140336..82da66a23b 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 017de0c119..0fb40ec0aa 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Concurrency.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Concurrency.cs index 0de7872aee..4712cee223 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Concurrency.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.Concurrency.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using FluentAssertions.Extensions; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Primitives; diff --git a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs index 3b88c846c2..0b55e8b842 100644 --- a/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs +++ b/src/Configuration/test/ConfigServer.Test/ConfigServerConfigurationProviderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using System.Text; using FluentAssertions.Extensions; using Microsoft.Extensions.Configuration; 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 be6dd615fb..c810260314 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 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 93d3d367de..713fcc4bfe 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Configuration/test/Kubernetes.ServiceBindings.Test/Steeltoe.Configuration.Kubernetes.ServiceBindings.Test.csproj b/src/Configuration/test/Kubernetes.ServiceBindings.Test/Steeltoe.Configuration.Kubernetes.ServiceBindings.Test.csproj index ff3cd2f418..9f4b83e2e4 100644 --- a/src/Configuration/test/Kubernetes.ServiceBindings.Test/Steeltoe.Configuration.Kubernetes.ServiceBindings.Test.csproj +++ b/src/Configuration/test/Kubernetes.ServiceBindings.Test/Steeltoe.Configuration.Kubernetes.ServiceBindings.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 9226d06016..ad0acc2086 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 102dbdb165..6f74833990 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 0961801249..d8dac9285f 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Connectors/src/EntityFrameworkCore/MySql/DynamicTypeAccess/MySqlEntityFrameworkCorePackageResolver.cs b/src/Connectors/src/EntityFrameworkCore/MySql/DynamicTypeAccess/MySqlEntityFrameworkCorePackageResolver.cs index 9900454e02..79230adb70 100644 --- a/src/Connectors/src/EntityFrameworkCore/MySql/DynamicTypeAccess/MySqlEntityFrameworkCorePackageResolver.cs +++ b/src/Connectors/src/EntityFrameworkCore/MySql/DynamicTypeAccess/MySqlEntityFrameworkCorePackageResolver.cs @@ -21,6 +21,15 @@ internal sealed class MySqlEntityFrameworkCorePackageResolver : PackageResolver "MySqlConnector" ]; + private static readonly List MicrotingAssemblyNamesWithPreviewWorkaround = + [ + "Microting.EntityFrameworkCore.MySql", + "MySqlConnector", + // Temporary workaround: The assembly name changed in the stable 10.x version, but the 11.0.0-preview.1 version doesn't contain that change yet. + // https://github.com/microting/Pomelo.EntityFrameworkCore.MySql/issues/272#issuecomment-6801878626 + "Pomelo.EntityFrameworkCore.MySql" + ]; + private static readonly List PomeloAssemblyNames = [ "Pomelo.EntityFrameworkCore.MySql", @@ -46,6 +55,9 @@ .. OracleAssemblyNames internal static readonly MySqlEntityFrameworkCorePackageResolver MicrotingOnly = new(MicrotingAssemblyNames, [MicrotingPackageName]); + internal static readonly MySqlEntityFrameworkCorePackageResolver MicrotingOnlyWithPreviewWorkaround = + new(MicrotingAssemblyNamesWithPreviewWorkaround, [MicrotingPackageName]); + internal static readonly MySqlEntityFrameworkCorePackageResolver PomeloOnly = new(PomeloAssemblyNames, [PomeloPackageName]); internal static readonly MySqlEntityFrameworkCorePackageResolver OracleOnly = new(OracleAssemblyNames, [OraclePackageName]); diff --git a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs index 3ff41977d6..ee5c2ded9f 100644 --- a/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs +++ b/src/Connectors/test/Connectors.Test/CosmosDb/CosmosDbHealthContributorTest.cs @@ -4,6 +4,7 @@ using FluentAssertions.Extensions; using Microsoft.Azure.Cosmos; +using Microsoft.Azure.Cosmos.Fluent; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; using NSubstitute; @@ -127,9 +128,11 @@ public async Task Integration_Is_Connected_Returns_Up_Status() const string serviceName = "Example"; const string connectionString = - "AccountEndpoint=https://localhost:8081;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="; + "AccountEndpoint=https://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==;DisableServerCertificateValidation=True"; - var cosmosClient = new CosmosClient(connectionString); + var builder = new CosmosClientBuilder(connectionString); + builder.WithConnectionModeGateway(); + CosmosClient cosmosClient = builder.Build(); await using ServiceProvider serviceProvider = CreateServiceProvider(serviceName, connectionString, cosmosClient); diff --git a/src/Connectors/test/Connectors.Test/ParentConfiguration/TemporaryCopyLifecycleTest.cs b/src/Connectors/test/Connectors.Test/ParentConfiguration/TemporaryCopyLifecycleTest.cs index a3f8fba060..02fe41398d 100644 --- a/src/Connectors/test/Connectors.Test/ParentConfiguration/TemporaryCopyLifecycleTest.cs +++ b/src/Connectors/test/Connectors.Test/ParentConfiguration/TemporaryCopyLifecycleTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging.Abstractions; using Microsoft.Extensions.Primitives; diff --git a/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTest.cs b/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTest.cs index c068d20907..1a6420b8ca 100644 --- a/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTest.cs +++ b/src/Connectors/test/Connectors.Test/PostgreSql/PostgreSqlConnectorTest.cs @@ -176,7 +176,10 @@ public sealed class PostgreSqlConnectorTest } """; +#pragma warning disable IDE0028 // Simplify collection initialization + // Justification: workaround for bug https://youtrack.jetbrains.com/issue/RSRP-505438/Collection-expression-with-with-expression-requires-language-version-preview private static readonly HashSet TempFileKeys = new(StringComparer.OrdinalIgnoreCase) +#pragma warning restore IDE0028 // Simplify collection initialization { "SSL Certificate", "SSL Key", diff --git a/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj b/src/Connectors/test/Connectors.Test/Steeltoe.Connectors.Test.csproj index 3c28649b90..02abc7fc62 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 @@  - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 @@ -13,7 +13,7 @@ - + diff --git a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Microting/MySqlDbContextOptionsBuilderExtensionsTest.other.cs b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Microting/MySqlDbContextOptionsBuilderExtensionsTest.other.cs index 88c6a5bd89..7f1fe62f73 100644 --- a/src/Connectors/test/EntityFrameworkCore.Test/MySql/Microting/MySqlDbContextOptionsBuilderExtensionsTest.other.cs +++ b/src/Connectors/test/EntityFrameworkCore.Test/MySql/Microting/MySqlDbContextOptionsBuilderExtensionsTest.other.cs @@ -16,6 +16,13 @@ namespace Steeltoe.Connectors.EntityFrameworkCore.Test.MySql.Microting; public sealed class MySqlDbContextOptionsBuilderExtensionsTest { + private static readonly MySqlEntityFrameworkCorePackageResolver MicrotingOnlyPackageResolver = +#if NET11_0_OR_GREATER + MySqlEntityFrameworkCorePackageResolver.MicrotingOnlyWithPreviewWorkaround; +#else + MySqlEntityFrameworkCorePackageResolver.MicrotingOnly; +#endif + [Fact] public async Task Registers_connection_string_for_default_service_binding() { @@ -30,7 +37,7 @@ public async Task Registers_connection_string_for_default_service_binding() builder.Services.Configure(options => options.ConnectionString += ";Use Compression=false"); builder.Services.AddDbContext((serviceProvider, options) => SteeltoeExtensions.UseMySql(options, serviceProvider, - MySqlEntityFrameworkCorePackageResolver.MicrotingOnly, serverVersion: MySqlServerVersion.LatestSupportedServerVersion)); + MicrotingOnlyPackageResolver, serverVersion: MySqlServerVersion.LatestSupportedServerVersion)); await using WebApplication app = builder.Build(); @@ -56,7 +63,7 @@ public async Task Registers_connection_string_for_named_service_binding() builder.Services.Configure("myMySqlService", options => options.ConnectionString += ";Use Compression=false"); builder.Services.AddDbContext((serviceProvider, options) => SteeltoeExtensions.UseMySql(options, serviceProvider, - MySqlEntityFrameworkCorePackageResolver.MicrotingOnly, "myMySqlService", MySqlServerVersion.LatestSupportedServerVersion)); + MicrotingOnlyPackageResolver, "myMySqlService", MySqlServerVersion.LatestSupportedServerVersion)); await using WebApplication app = builder.Build(); @@ -75,7 +82,7 @@ public async Task Throws_for_missing_connection_string_with_version_detection() builder.AddMySql(MySqlPackageResolver.MySqlConnectorOnly, null, null, null); builder.Services.AddDbContext((serviceProvider, options) => SteeltoeExtensions.UseMySql(options, serviceProvider, - MySqlEntityFrameworkCorePackageResolver.MicrotingOnly)); + MicrotingOnlyPackageResolver)); await using WebApplication app = builder.Build(); await using AsyncServiceScope scope = app.Services.CreateAsyncScope(); 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 27f23bfef4..24fd54dba6 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,8 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 + + $(NoWarn);NU1608 diff --git a/src/Discovery/src/Eureka/AppInfo/ApplicationInfoCollection.cs b/src/Discovery/src/Eureka/AppInfo/ApplicationInfoCollection.cs index e42f48370e..26680cd52f 100644 --- a/src/Discovery/src/Eureka/AppInfo/ApplicationInfoCollection.cs +++ b/src/Discovery/src/Eureka/AppInfo/ApplicationInfoCollection.cs @@ -203,7 +203,7 @@ internal string ComputeHashCode() var hashcodeBuilder = new StringBuilder(); - foreach (KeyValuePair pair in statusMap.OrderBy(pair => pair.Key)) + foreach (KeyValuePair pair in statusMap.OrderBy(pair => pair.Key, StringComparer.Ordinal)) { hashcodeBuilder.Append($"{pair.Key}_{pair.Value}_"); } 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 7d56666bcb..2781724f3d 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 9d04c2d612..8fc6e253b0 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 28d96ac0da..00df6e0bc7 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 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 e9458c6127..a12103b76a 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Logging/test/DynamicConsole.Test/DynamicConsoleLoggerProviderTest.cs b/src/Logging/test/DynamicConsole.Test/DynamicConsoleLoggerProviderTest.cs index 31d7a02766..cd135a9a93 100644 --- a/src/Logging/test/DynamicConsole.Test/DynamicConsoleLoggerProviderTest.cs +++ b/src/Logging/test/DynamicConsole.Test/DynamicConsoleLoggerProviderTest.cs @@ -474,7 +474,6 @@ public async Task CanUseJsonFormatterWithScopes() { ["Logging:Console:FormatterName"] = "json", ["Logging:Console:FormatterOptions:IncludeScopes"] = "true", - ["Logging:Console:FormatterOptions:TimestampFormat"] = string.Empty, ["Logging:Console:FormatterOptions:JsonWriterOptions:Indented"] = "true" }; diff --git a/src/Logging/test/DynamicConsole.Test/Steeltoe.Logging.DynamicConsole.Test.csproj b/src/Logging/test/DynamicConsole.Test/Steeltoe.Logging.DynamicConsole.Test.csproj index ec171ac8c0..8330c13dc3 100644 --- a/src/Logging/test/DynamicConsole.Test/Steeltoe.Logging.DynamicConsole.Test.csproj +++ b/src/Logging/test/DynamicConsole.Test/Steeltoe.Logging.DynamicConsole.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 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 0620235176..998c2e3485 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Management/src/Endpoint/Actuators/Hypermedia/HypermediaService.cs b/src/Management/src/Endpoint/Actuators/Hypermedia/HypermediaService.cs index 3c8c6cfc9f..bbbe038ad1 100644 --- a/src/Management/src/Endpoint/Actuators/Hypermedia/HypermediaService.cs +++ b/src/Management/src/Endpoint/Actuators/Hypermedia/HypermediaService.cs @@ -88,7 +88,7 @@ private Links GetLinks(Uri baseUrl, string? basePath, bool skipExposureCheck, Ma Link? selfLink = null; foreach (EndpointOptions endpointOptions in _endpointOptionsMonitorProviders.Select(provider => provider.Get()) - .Where(options => options.Id != null && options.IsEnabled(managementOptions)).OrderBy(options => options.Id)) + .Where(options => options.Id != null && options.IsEnabled(managementOptions)).OrderBy(options => options.Id, StringComparer.Ordinal)) { if (skipExposureCheck || endpointOptions.IsExposed(managementOptions)) { diff --git a/src/Management/src/Endpoint/Actuators/Loggers/LoggersEndpointHandler.cs b/src/Management/src/Endpoint/Actuators/Loggers/LoggersEndpointHandler.cs index 5abeef3d99..5b6f7c20d4 100644 --- a/src/Management/src/Endpoint/Actuators/Loggers/LoggersEndpointHandler.cs +++ b/src/Management/src/Endpoint/Actuators/Loggers/LoggersEndpointHandler.cs @@ -79,7 +79,7 @@ private LoggersResponse GetLogLevels() ICollection loggerStates = _dynamicLoggerProvider.GetLogLevels(); var loggerLevelsPerCategory = new Dictionary(); - foreach (DynamicLoggerState loggerState in loggerStates.OrderBy(entry => entry.CategoryName)) + foreach (DynamicLoggerState loggerState in loggerStates.OrderBy(entry => entry.CategoryName, StringComparer.Ordinal)) { LogAddingLoggerState(loggerState); diff --git a/src/Management/test/Endpoint.Test/Actuators/CloudFoundry/PermissionsProviderTest.cs b/src/Management/test/Endpoint.Test/Actuators/CloudFoundry/PermissionsProviderTest.cs index 7200963a99..5707da38ea 100644 --- a/src/Management/test/Endpoint.Test/Actuators/CloudFoundry/PermissionsProviderTest.cs +++ b/src/Management/test/Endpoint.Test/Actuators/CloudFoundry/PermissionsProviderTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging.Abstractions; diff --git a/src/Management/test/Endpoint.Test/Actuators/Health/HealthActuatorTest.cs b/src/Management/test/Endpoint.Test/Actuators/Health/HealthActuatorTest.cs index 091a28bb4b..ba141f6d4f 100644 --- a/src/Management/test/Endpoint.Test/Actuators/Health/HealthActuatorTest.cs +++ b/src/Management/test/Endpoint.Test/Actuators/Health/HealthActuatorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using System.Security.Claims; using System.Text.Json.Nodes; using Microsoft.AspNetCore.Builder; diff --git a/src/Management/test/Endpoint.Test/Actuators/Refresh/RefreshActuatorTest.cs b/src/Management/test/Endpoint.Test/Actuators/Refresh/RefreshActuatorTest.cs index fb5988c734..4574f8914f 100644 --- a/src/Management/test/Endpoint.Test/Actuators/Refresh/RefreshActuatorTest.cs +++ b/src/Management/test/Endpoint.Test/Actuators/Refresh/RefreshActuatorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using System.Text.Json.Nodes; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; diff --git a/src/Management/test/Endpoint.Test/Actuators/RouteMappings/RouteMappingsActuatorTest.cs b/src/Management/test/Endpoint.Test/Actuators/RouteMappings/RouteMappingsActuatorTest.cs index 6d115e746e..b97b037918 100644 --- a/src/Management/test/Endpoint.Test/Actuators/RouteMappings/RouteMappingsActuatorTest.cs +++ b/src/Management/test/Endpoint.Test/Actuators/RouteMappings/RouteMappingsActuatorTest.cs @@ -3,7 +3,6 @@ // See the LICENSE file in the project root for more information. using System.Net; -using System.Net.Http.Json; using System.Text.Json.Nodes; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; diff --git a/src/Management/test/Endpoint.Test/SpringBootAdminClient/HostBuilderTest.cs b/src/Management/test/Endpoint.Test/SpringBootAdminClient/HostBuilderTest.cs index 3bc2090651..dce64c6476 100644 --- a/src/Management/test/Endpoint.Test/SpringBootAdminClient/HostBuilderTest.cs +++ b/src/Management/test/Endpoint.Test/SpringBootAdminClient/HostBuilderTest.cs @@ -4,7 +4,6 @@ using System.Globalization; using System.Net; -using System.Net.Http.Json; using System.Runtime.InteropServices; using System.Text; using FluentAssertions.Extensions; 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 85b9af34bb..dcfe19d900 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Management/test/GitProperties.Build.Test/GitRepositoryBuilder.cs b/src/Management/test/GitProperties.Build.Test/GitRepositoryBuilder.cs index 16b01e875b..576ae749c9 100644 --- a/src/Management/test/GitProperties.Build.Test/GitRepositoryBuilder.cs +++ b/src/Management/test/GitProperties.Build.Test/GitRepositoryBuilder.cs @@ -14,7 +14,10 @@ internal static class GitRepositoryBuilder gpgsign = false # Avoid an interactive prompt on a machine that has commit signing configured globally. """; +#pragma warning disable IDE0028 // Simplify collection initialization + // Justification: workaround for bug https://youtrack.jetbrains.com/issue/RSRP-505438/Collection-expression-with-with-expression-requires-language-version-preview private static readonly HashSet DirectoryNamesExcludedInPush = new(StringComparer.OrdinalIgnoreCase) +#pragma warning restore IDE0028 // Simplify collection initialization { ".git", "bin", diff --git a/src/Management/test/GitProperties.Build.Test/ProcessRunner.cs b/src/Management/test/GitProperties.Build.Test/ProcessRunner.cs index c14bbf79c0..24661cdf44 100644 --- a/src/Management/test/GitProperties.Build.Test/ProcessRunner.cs +++ b/src/Management/test/GitProperties.Build.Test/ProcessRunner.cs @@ -161,7 +161,8 @@ private static async Task CaptureFailureContextAsync(string workingDirectory, st builder.AppendLine("Environment variables:"); - foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables().Cast().OrderBy(entry => entry.Key.ToString())) + foreach (DictionaryEntry entry in Environment.GetEnvironmentVariables().Cast() + .OrderBy(entry => entry.Key.ToString(), StringComparer.Ordinal)) { string name = entry.Key.ToString()!; diff --git a/src/Management/test/GitProperties.Build.Test/Steeltoe.Management.GitProperties.Build.Test.csproj b/src/Management/test/GitProperties.Build.Test/Steeltoe.Management.GitProperties.Build.Test.csproj index 74b0e57f71..0b1240c9f0 100644 --- a/src/Management/test/GitProperties.Build.Test/Steeltoe.Management.GitProperties.Build.Test.csproj +++ b/src/Management/test/GitProperties.Build.Test/Steeltoe.Management.GitProperties.Build.Test.csproj @@ -4,7 +4,7 @@ No test's outcome depends on which TFM this assembly itself is compiled as, so multi-targeting would just triple the suite's runtime for zero extra coverage. --> - net10.0 + net11.0 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 484afb7186..1e47d2e497 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Management/test/RazorPagesTestWebApp/Steeltoe.Management.Endpoint.RazorPagesTestWebApp.csproj b/src/Management/test/RazorPagesTestWebApp/Steeltoe.Management.Endpoint.RazorPagesTestWebApp.csproj index 69cfd6dd8d..cbe9e7be9f 100644 --- a/src/Management/test/RazorPagesTestWebApp/Steeltoe.Management.Endpoint.RazorPagesTestWebApp.csproj +++ b/src/Management/test/RazorPagesTestWebApp/Steeltoe.Management.Endpoint.RazorPagesTestWebApp.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 false diff --git a/src/Management/test/Tasks.Test/Steeltoe.Management.Tasks.Test.csproj b/src/Management/test/Tasks.Test/Steeltoe.Management.Tasks.Test.csproj index c8c75a12ee..46531b9d0d 100644 --- a/src/Management/test/Tasks.Test/Steeltoe.Management.Tasks.Test.csproj +++ b/src/Management/test/Tasks.Test/Steeltoe.Management.Tasks.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 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 c28991c23d..f82a299706 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Security/test/Authentication.JwtBearer.Test/Steeltoe.Security.Authentication.JwtBearer.Test.csproj b/src/Security/test/Authentication.JwtBearer.Test/Steeltoe.Security.Authentication.JwtBearer.Test.csproj index abdce38f96..ab25eb483c 100644 --- a/src/Security/test/Authentication.JwtBearer.Test/Steeltoe.Security.Authentication.JwtBearer.Test.csproj +++ b/src/Security/test/Authentication.JwtBearer.Test/Steeltoe.Security.Authentication.JwtBearer.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Security/test/Authentication.OpenIdConnect.Test/Steeltoe.Security.Authentication.OpenIdConnect.Test.csproj b/src/Security/test/Authentication.OpenIdConnect.Test/Steeltoe.Security.Authentication.OpenIdConnect.Test.csproj index 7a11ec9e00..adb366c32e 100644 --- a/src/Security/test/Authentication.OpenIdConnect.Test/Steeltoe.Security.Authentication.OpenIdConnect.Test.csproj +++ b/src/Security/test/Authentication.OpenIdConnect.Test/Steeltoe.Security.Authentication.OpenIdConnect.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Security/test/Authorization.Certificate.Test/Steeltoe.Security.Authorization.Certificate.Test.csproj b/src/Security/test/Authorization.Certificate.Test/Steeltoe.Security.Authorization.Certificate.Test.csproj index 9235a977d6..3f21c5251a 100644 --- a/src/Security/test/Authorization.Certificate.Test/Steeltoe.Security.Authorization.Certificate.Test.csproj +++ b/src/Security/test/Authorization.Certificate.Test/Steeltoe.Security.Authorization.Certificate.Test.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.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 5de5a0bade..279bcd61b0 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 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 diff --git a/src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj b/src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj index eeb1f5cf99..98182ee16c 100644 --- a/src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj +++ b/src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj @@ -1,6 +1,6 @@ - net10.0;net9.0;net8.0 + net11.0;net10.0;net9.0;net8.0 true true true diff --git a/versions.props b/versions.props index e142182f57..5dfeb9aebe 100644 --- a/versions.props +++ b/versions.props @@ -17,6 +17,7 @@ 2.6.* 26.7.* 13.0.* + 10.0.* 6.2.* 5.6.* 7.2.* @@ -45,6 +46,10 @@ 10.0.* + + 11.0.*-* + + 8.0.* @@ -89,7 +94,7 @@ 9.0.* @@ -100,10 +105,21 @@ 10.0.* + + + + + 11.0.* + +