diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 48038fc6f..579e7049f 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [net5.0, net6.0, net7.0] + framework: [net6.0, net7.0] os: [ubuntu-latest] test: [Streams, PersistentSubscriptions, Operations, UserManagement, ProjectionManagement] configuration: [release] @@ -33,7 +33,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0.x 6.0.x 7.0.x - name: Compile diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 28dc70ccf..906cae421 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [ net5.0, net6.0, net7.0 ] + framework: [ net6.0, net7.0 ] os: [ ubuntu-latest, windows-latest ] runs-on: ${{ matrix.os }} name: scan-vulnerabilities/${{ matrix.os }}/${{ matrix.framework }} @@ -25,7 +25,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0.x 6.0.x 7.0.x - name: Scan for Vulnerabilities @@ -43,7 +42,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [ net5.0, net6.0, net7.0 ] + framework: [ net6.0, net7.0 ] services: esdb: image: ghcr.io/eventstore/eventstore:lts @@ -62,7 +61,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0.x 6.0.x 7.0.x - name: Compile @@ -79,7 +77,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [net5.0, net6.0, net7.0] + framework: [net6.0, net7.0] os: [ubuntu-latest, windows-latest] configuration: [release] runs-on: ${{ matrix.os }} @@ -94,7 +92,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0.x 6.0.x 7.0.x - name: Compile @@ -132,7 +129,6 @@ jobs: uses: actions/setup-dotnet@v3 with: dotnet-version: | - 5.0.x 6.0.x 7.0.x - name: Dotnet Pack diff --git a/Directory.Build.props b/Directory.Build.props index 20ce0fd68..a6c871f48 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net5.0;net6.0;net7.0 + net6.0;net7.0 x64 true enable diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index feefe7675..4b318ded2 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -3,6 +3,6 @@ enable enable Exe - net5.0;net6.0;net7.0 + net6.0;net7.0 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 65a1f9eac..7f9250c31 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,23 +2,24 @@ true + xUnit1031 - + - + - + - - + + all runtime; build; native; contentfiles; analyzers diff --git a/test/EventStore.Client.Streams.Tests/read_all_events_forward_with_linkto_passed_max_count.cs b/test/EventStore.Client.Streams.Tests/read_all_events_forward_with_linkto_passed_max_count.cs index df8d73c33..1656bb82d 100644 --- a/test/EventStore.Client.Streams.Tests/read_all_events_forward_with_linkto_passed_max_count.cs +++ b/test/EventStore.Client.Streams.Tests/read_all_events_forward_with_linkto_passed_max_count.cs @@ -16,7 +16,7 @@ public read_all_events_forward_with_linkto_passed_max_count(Fixture fixture) { [Fact] public void one_event_is_read() { - Assert.Single(_fixture.Events); + Assert.Single(_fixture.Events ?? Array.Empty()); } public class Fixture : EventStoreClientFixture { diff --git a/test/EventStore.Client.Streams.Tests/read_events_linked_to_deleted_stream.cs b/test/EventStore.Client.Streams.Tests/read_events_linked_to_deleted_stream.cs index e6ead154f..32efc5950 100644 --- a/test/EventStore.Client.Streams.Tests/read_events_linked_to_deleted_stream.cs +++ b/test/EventStore.Client.Streams.Tests/read_events_linked_to_deleted_stream.cs @@ -14,7 +14,7 @@ protected read_events_linked_to_deleted_stream(Fixture fixture) { [Fact] public void one_event_is_read() { - Assert.Single(_fixture.Events); + Assert.Single(_fixture.Events ?? Array.Empty()); } [Fact] diff --git a/test/EventStore.Client.Tests/EventStoreClientOperationOptionsTests.cs b/test/EventStore.Client.Tests/EventStoreClientOperationOptionsTests.cs index 07ea61750..ed603898d 100644 --- a/test/EventStore.Client.Tests/EventStoreClientOperationOptionsTests.cs +++ b/test/EventStore.Client.Tests/EventStoreClientOperationOptionsTests.cs @@ -10,7 +10,7 @@ public void setting_options_on_clone_should_not_modify_original() { clonedOptions.BatchAppendSize = int.MaxValue; Assert.Equal(options.BatchAppendSize, EventStoreClientOperationOptions.Default.BatchAppendSize); - Assert.Equal(clonedOptions.BatchAppendSize, int.MaxValue); + Assert.Equal(int.MaxValue, clonedOptions.BatchAppendSize); } } } diff --git a/test/EventStore.Client.Tests/GossipChannelSelectorTests.cs b/test/EventStore.Client.Tests/GossipChannelSelectorTests.cs index 04e8a1c72..aa2bab85b 100644 --- a/test/EventStore.Client.Tests/GossipChannelSelectorTests.cs +++ b/test/EventStore.Client.Tests/GossipChannelSelectorTests.cs @@ -51,7 +51,7 @@ public async Task ThrowsWhenDiscoveryFails() { var sut = new GossipChannelSelector(settings, channelCache, new BadGossipClient()); var ex = await Assert.ThrowsAsync(async () => - await sut.SelectChannelAsync(cancellationToken: default).ConfigureAwait(false)); + await sut.SelectChannelAsync(cancellationToken: default)); Assert.Equal(3, ex.MaxDiscoverAttempts); }