removed dotnet 5

fixed some nullable issues removed configure await from 2 tests
EventStore · Nov 6, 2023 · 5ac5b1a · 5ac5b1a
1 parent 2fa606c
commit 5ac5b1a
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 20 deletions.
diff --git 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
@@ -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
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<Platform>x64</Platform>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<Nullable>enable</Nullable>

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -3,6 +3,6 @@
 		<Nullable>enable</Nullable>
 		<NullableContextOptions>enable</NullableContextOptions>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 	</PropertyGroup>
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -2,23 +2,24 @@
 	<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 	<PropertyGroup>
 		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+        <NoWarn>xUnit1031</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="AutoFixture.Idioms" Version="4.18.0" />
 		<PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
 		<PackageReference Include="Ductus.FluentDocker" Version="2.10.59" />
-		<PackageReference Include="GitHubActionsTestLogger" Version="2.0.1"/>
+		<PackageReference Include="GitHubActionsTestLogger" Version="2.3.3"/>
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2"/>
 		<PackageReference Include="Polly" Version="8.1.0" />
 		<PackageReference Include="Serilog" Version="3.0.1"/>
 		<PackageReference Include="Serilog.AspNetCore" Version="7.0.0"/>
 		<PackageReference Include="Serilog.Sinks.Observable" Version="2.0.2"/>
-		<PackageReference Include="Serilog.Sinks.Seq" Version="5.1.1"/>
+		<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.3"/>
 		<PackageReference Include="System.Net.Http" Version="4.3.4"/>
-		<PackageReference Include="System.Reactive" Version="5.0.0"/>
+		<PackageReference Include="System.Reactive" Version="6.0.0"/>
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1"/>
-		<PackageReference Include="xunit" Version="2.4.1"/>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+		<PackageReference Include="xunit" Version="2.6.1"/>
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
 		</PackageReference>

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
@@ -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<ResolvedEvent>());
 		}
 
 		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
@@ -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<ResolvedEvent>());
 		}
 
 		[Fact]

diff --git 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
@@ -51,7 +51,7 @@ public async Task ThrowsWhenDiscoveryFails() {
 			var sut = new GossipChannelSelector(settings, channelCache, new BadGossipClient());
 
 			var ex = await Assert.ThrowsAsync<DiscoveryException>(async () =>
-				await sut.SelectChannelAsync(cancellationToken: default).ConfigureAwait(false));
+				await sut.SelectChannelAsync(cancellationToken: default));
 
 			Assert.Equal(3, ex.MaxDiscoverAttempts);
 		}
-Original file line number
+Diff line change
@@ Expand Up @@
     		[Fact]
     		public void one_event_is_read() {
-    			Assert.Single(_fixture.Events);
+    			Assert.Single(_fixture.Events ?? Array.Empty<ResolvedEvent>());
     		}
     		[Fact]
@@ Expand Down @@