Merge pull request #13 from hash-code-io/feat/net8

Jejuni · web-flow · commit 1cd25878cfea · 2024-02-02T14:49:45.000+01:00
Feat/net8
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 	<!-- These properties will be shared for all projects -->
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -2,7 +2,7 @@
   <ItemGroup>
     <!--build related-->
     <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.Github" Version="1.1.1" PrivateAssets="All"/>
+    <PackageReference Include="Microsoft.SourceLink.Github" Version="8.0.0" PrivateAssets="All"/>
   </ItemGroup>
 
 	<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
diff --git a/src/RapidIntegrationTesting.Utility/Extensions/IntegrationTestExtensions.cs b/src/RapidIntegrationTesting.Utility/Extensions/IntegrationTestExtensions.cs
@@ -16,7 +16,7 @@ public static class IntegrationTestExtensions
     /// <exception cref="ArgumentNullException"></exception>
     public static string GetRelativePathToController(this string controllerName, string apiVersion = "1.0")
     {
-        if (controllerName == null) throw new ArgumentNullException(nameof(controllerName));
+        ArgumentNullException.ThrowIfNull(controllerName);
         return $"api/v{apiVersion}/{controllerName.Replace("Controller", "", StringComparison.OrdinalIgnoreCase)}";
     }
 
@@ -29,7 +29,7 @@ public static string GetRelativePathToController(this string controllerName, str
     [SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "Pointless if it was URI")]
     public static Uri AsRelativeUri(this string url)
     {
-        if (url == null) throw new ArgumentNullException(nameof(url));
+        ArgumentNullException.ThrowIfNull(url);
         return new Uri(url, UriKind.Relative);
     }
 
@@ -43,8 +43,8 @@ public static Uri AsRelativeUri(this string url)
     [SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "Pointless if it was URI")]
     public static Uri AsRelativeUri(this string url, Dictionary<string, string> queryParams)
     {
-        if (url == null) throw new ArgumentNullException(nameof(url));
-        if (queryParams == null) throw new ArgumentNullException(nameof(queryParams));
+        ArgumentNullException.ThrowIfNull(url);
+        ArgumentNullException.ThrowIfNull(queryParams);
         string paramString = queryParams.Count == 0
             ? string.Empty
             : "?" + string.Join('&', queryParams.Select(x => $"{x.Key}={x.Value}"));
@@ -63,8 +63,8 @@ public static Uri AsRelativeUri(this string url, Dictionary<string, string> quer
     [SuppressMessage("Design", "CA1054:URI-like parameters should not be strings", Justification = "Pointless if it was URI")]
     public static Uri AsRelativeUri(this string url, params (string key, string value)[] queryParams)
     {
-        if (url == null) throw new ArgumentNullException(nameof(url));
-        if (queryParams == null) throw new ArgumentNullException(nameof(queryParams));
+        ArgumentNullException.ThrowIfNull(url);
+        ArgumentNullException.ThrowIfNull(queryParams);
         string paramString = queryParams.Length == 0
             ? string.Empty
             : "?" + string.Join('&', queryParams.Select(x => $"{x.key}={x.value}"));
diff --git a/src/RapidIntegrationTesting.Utility/RapidIntegrationTesting.Utility.csproj b/src/RapidIntegrationTesting.Utility/RapidIntegrationTesting.Utility.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
 	</ItemGroup>
 
 
diff --git a/src/RapidIntegrationTesting.Utility/Seeder/TestSeeder.cs b/src/RapidIntegrationTesting.Utility/Seeder/TestSeeder.cs
@@ -65,7 +65,7 @@ public TestSeeder<TDbContext> Unseed<TEntity>(IdRetriever idRetriever)
     /// <param name="idRetriever">A function to retrieve the entity's id</param>
     protected void Create<T>(T entity, EntityIdRetriever<T> idRetriever) where T : class
     {
-        if (idRetriever == null) throw new ArgumentNullException(nameof(idRetriever));
+        ArgumentNullException.ThrowIfNull(idRetriever);
         object[] id = idRetriever(entity);
         DbContext.Set<T>().Add(entity);
         _unseeder.Add(new UnseedInfo(typeof(T), () => id));
@@ -119,8 +119,7 @@ protected void Create<T>(T entity, EntityIdRetriever<T> idRetriever) where T : c
     protected T FindRequiredCreated<T>(Func<T, bool> predicate) where T : class
     {
         T? entity = FindCreated(predicate);
-        if (entity is null) throw new InvalidOperationException("Entity could not be found");
-        return entity;
+        return entity ?? throw new InvalidOperationException("Entity could not be found");
     }
 
     /// <summary>
@@ -133,7 +132,6 @@ protected T FindRequiredCreated<T>(Func<T, bool> predicate) where T : class
     protected T FindRequiredCreated<T>(params object[] keyValues) where T : class
     {
         T? entity = FindCreated<T>(keyValues);
-        if (entity is null) throw new InvalidOperationException("Entity could not be found");
-        return entity;
+        return entity ?? throw new InvalidOperationException("Entity could not be found");
     }
 }
diff --git a/src/RapidIntegrationTesting.xUnit/RapidIntegrationTesting.xUnit.csproj b/src/RapidIntegrationTesting.xUnit/RapidIntegrationTesting.xUnit.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="xunit.extensibility.execution" Version="2.6.1" />
+		<PackageReference Include="xunit.extensibility.execution" Version="2.6.6" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/RapidIntegrationTesting/Auth/TestAuthHandler.cs b/src/RapidIntegrationTesting/Auth/TestAuthHandler.cs
@@ -15,8 +15,8 @@ internal sealed class TestAuthHandler : AuthenticationHandler<AuthenticationSche
     private readonly List<Claim> _defaultUserClaims = new() { new Claim(AuthConstants.JwtNameClaim, WebAppFactoryAuthOptions.DefaultTestUserName) };
     private readonly WebAppFactoryAuthOptions _options;
 
-    public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock, WebAppFactoryAuthOptions authOptions)
-        : base(options, logger, encoder, clock) =>
+    public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, WebAppFactoryAuthOptions authOptions)
+        : base(options, logger, encoder) =>
         _options = authOptions ?? throw new ArgumentNullException(nameof(authOptions));
 
     protected override Task<AuthenticateResult> HandleAuthenticateAsync()
diff --git a/src/RapidIntegrationTesting/RapidIntegrationTesting.csproj b/src/RapidIntegrationTesting/RapidIntegrationTesting.csproj
@@ -5,9 +5,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.14" />
-		<PackageReference Include="Testcontainers" Version="3.6.0" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.14" />
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
+		<PackageReference Include="Testcontainers" Version="3.7.0" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.1" />
 	</ItemGroup>
 
 	<PropertyGroup>
diff --git a/src/RapidIntegrationTesting/RapidIntegrationTesting.xml b/src/RapidIntegrationTesting/RapidIntegrationTesting.xml
diff --git a/src/RapidIntegrationTesting/SignalR/SignalRCallbackDescriptorExtensions.cs b/src/RapidIntegrationTesting/SignalR/SignalRCallbackDescriptorExtensions.cs
@@ -15,7 +15,7 @@ public static class SignalRCallbackDescriptorExtensions
     /// <exception cref="ArgumentNullException"></exception>
     public static void RegisterDescriptors(this HubConnection hubConnection, params ISignalRCallbackDescriptor[] descriptors)
     {
-        if (descriptors == null) throw new ArgumentNullException(nameof(descriptors));
+        ArgumentNullException.ThrowIfNull(descriptors);
         foreach (ISignalRCallbackDescriptor signalrCallbackDescriptor in descriptors)
             signalrCallbackDescriptor.Setup(hubConnection);
     }
@@ -30,7 +30,7 @@ public static void RegisterDescriptors(this HubConnection hubConnection, params
     /// <exception cref="ArgumentNullException"></exception>
     public static HubConnection Build(this IHubConnectionBuilder builder, params ISignalRCallbackDescriptor[] descriptors)
     {
-        if (builder == null) throw new ArgumentNullException(nameof(builder));
+        ArgumentNullException.ThrowIfNull(builder);
         HubConnection hubConnection = builder.Build();
         hubConnection.RegisterDescriptors(descriptors);
         return hubConnection;
diff --git a/src/RapidIntegrationTesting/SignalR/SignalRCallbackDescriptorFactory.cs b/src/RapidIntegrationTesting/SignalR/SignalRCallbackDescriptorFactory.cs
@@ -18,7 +18,7 @@ public static class SignalRCallbackDescriptorFactory
     /// <exception cref="ArgumentNullException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface>(Expression<Func<TInterface, Task>> expression, Action handler)
     {
-        if (expression == null) throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(0);
         return new SignalRCallbackDescriptorNoValue(name, handler);
@@ -34,8 +34,7 @@ public static ISignalRCallbackDescriptor Create<TInterface>(Expression<Func<TInt
     /// <exception cref="ArgumentNullException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface>(Expression<Func<TInterface, Task>> expression, Func<Task> handler)
     {
-        if (expression == null)
-            throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(0);
         return new SignalRAsyncCallbackDescriptorNoValue(name, handler);
@@ -52,7 +51,7 @@ public static ISignalRCallbackDescriptor Create<TInterface>(Expression<Func<TInt
     /// <exception cref="ArgumentNullException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface, TArgument>(Expression<Func<TInterface, TArgument, Task>> expression, Action<TArgument> handler)
     {
-        if (expression == null) throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(1, typeof(TArgument));
         return new SignalRCallbackDescriptor<TArgument>(name, handler);
@@ -69,8 +68,7 @@ public static ISignalRCallbackDescriptor Create<TInterface, TArgument>(Expressio
     /// <exception cref="ArgumentNullException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface, TArgument>(Expression<Func<TInterface, TArgument, Task>> expression, Func<TArgument, Task> handler)
     {
-        if (expression == null)
-            throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(1, typeof(TArgument));
         return new SignalRAsyncCallbackDescriptor<TArgument>(name, handler);
diff --git a/src/RapidIntegrationTesting/SignalR/SignalRTestingCallbackDescriptorFactory.cs b/src/RapidIntegrationTesting/SignalR/SignalRTestingCallbackDescriptorFactory.cs
@@ -24,7 +24,7 @@ public static class SignalRTestingCallbackDescriptorFactory
     /// <exception cref="TimeoutException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface, TArgument>(Expression<Func<TInterface, TArgument, Task>> expression, out Task<TArgument> signalReceived, int timeout = 30_000)
     {
-        if (expression == null) throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(1, typeof(TArgument));
         var tcs = new TaskCompletionSource<TArgument>();
@@ -47,7 +47,7 @@ public static ISignalRCallbackDescriptor Create<TInterface, TArgument>(Expressio
     /// <exception cref="ArgumentNullException"></exception>
     public static ISignalRCallbackDescriptor Create<TInterface>(Expression<Func<TInterface, Task>> expression, out Task signalReceived, int timeout = 30_000)
     {
-        if (expression == null) throw new ArgumentNullException(nameof(expression));
+        ArgumentNullException.ThrowIfNull(expression);
 
         string name = expression.GetNameAndEnsureParameters(0);
         var tcs = new TaskCompletionSource();
diff --git a/src/RapidIntegrationTesting/TestingWebAppFactory.cs b/src/RapidIntegrationTesting/TestingWebAppFactory.cs
@@ -53,7 +53,7 @@ public HubConnection ConfigureSignalRCallbacks(params ISignalRCallbackDescriptor
     /// <exception cref="ArgumentNullException"></exception>
     public HubConnection ConfigureSignalRCallbacks(string relativeHubPath, params ISignalRCallbackDescriptor[] descriptors)
     {
-        if (descriptors == null) throw new ArgumentNullException(nameof(descriptors));
+        ArgumentNullException.ThrowIfNull(descriptors);
 
         var signalRHubUri = new Uri(Server.BaseAddress, relativeHubPath);
         IHubConnectionBuilder builder = new HubConnectionBuilder()
@@ -80,7 +80,7 @@ public HubConnection ConfigureSignalRCallbacks(string relativeHubPath, params IS
     /// <returns></returns>
     public async Task RunAsUser(string userName, Func<HttpClient, Task> testCode)
     {
-        if (testCode == null) throw new ArgumentNullException(nameof(testCode));
+        ArgumentNullException.ThrowIfNull(testCode);
 
         HttpClient client = CreateClient();
         client.DefaultRequestHeaders.Add(AuthConstants.TestUserNameHeaderName, userName);
@@ -99,7 +99,7 @@ private IEnumerable<WebAppConfigurationValue> BuildConfigurations()
     /// <inheritdoc />
     protected override void ConfigureWebHost(IWebHostBuilder builder)
     {
-        if (builder == null) throw new ArgumentNullException(nameof(builder));
+        ArgumentNullException.ThrowIfNull(builder);
         builder.UseEnvironment(_options.EnvironmentName);
 
         foreach ((string key, string value) in BuildConfigurations())
diff --git a/test/RapidIntegrationTesting.Integration.Tests/RapidIntegrationTesting.Integration.Tests.csproj b/test/RapidIntegrationTesting.Integration.Tests/RapidIntegrationTesting.Integration.Tests.csproj
diff --git a/test/Testing.Integration.TestWebApi/Testing.Integration.TestWebApi.csproj b/test/Testing.Integration.TestWebApi/Testing.Integration.TestWebApi.csproj

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public TestSeeder<TDbContext> Unseed<TEntity>(IdRetriever idRetriever)`
`65`	`65`	`/// <param name="idRetriever">A function to retrieve the entity's id</param>`
`66`	`66`	`protected void Create<T>(T entity, EntityIdRetriever<T> idRetriever) where T : class`
`67`	`67`	`{`
`68`		`- if (idRetriever == null) throw new ArgumentNullException(nameof(idRetriever));`
	`68`	`+ ArgumentNullException.ThrowIfNull(idRetriever);`
`69`	`69`	`object[] id = idRetriever(entity);`
`70`	`70`	`DbContext.Set<T>().Add(entity);`
`71`	`71`	`_unseeder.Add(new UnseedInfo(typeof(T), () => id));`
`@@ -119,8 +119,7 @@ protected void Create<T>(T entity, EntityIdRetriever<T> idRetriever) where T : c`
`119`	`119`	`protected T FindRequiredCreated<T>(Func<T, bool> predicate) where T : class`
`120`	`120`	`{`
`121`	`121`	`T? entity = FindCreated(predicate);`
`122`		`- if (entity is null) throw new InvalidOperationException("Entity could not be found");`
`123`		`- return entity;`
	`122`	`+ return entity ?? throw new InvalidOperationException("Entity could not be found");`
`124`	`123`	`}`
`125`	`124`
`126`	`125`	`/// <summary>`
`@@ -133,7 +132,6 @@ protected T FindRequiredCreated<T>(Func<T, bool> predicate) where T : class`
`133`	`132`	`protected T FindRequiredCreated<T>(params object[] keyValues) where T : class`
`134`	`133`	`{`
`135`	`134`	`T? entity = FindCreated<T>(keyValues);`
`136`		`- if (entity is null) throw new InvalidOperationException("Entity could not be found");`
`137`		`- return entity;`
	`135`	`+ return entity ?? throw new InvalidOperationException("Entity could not be found");`
`138`	`136`	`}`
`139`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public static class SignalRCallbackDescriptorExtensions`
`15`	`15`	`/// <exception cref="ArgumentNullException"></exception>`
`16`	`16`	`public static void RegisterDescriptors(this HubConnection hubConnection, params ISignalRCallbackDescriptor[] descriptors)`
`17`	`17`	`{`
`18`		`- if (descriptors == null) throw new ArgumentNullException(nameof(descriptors));`
	`18`	`+ ArgumentNullException.ThrowIfNull(descriptors);`
`19`	`19`	`foreach (ISignalRCallbackDescriptor signalrCallbackDescriptor in descriptors)`
`20`	`20`	`signalrCallbackDescriptor.Setup(hubConnection);`
`21`	`21`	`}`
`@@ -30,7 +30,7 @@ public static void RegisterDescriptors(this HubConnection hubConnection, params`
`30`	`30`	`/// <exception cref="ArgumentNullException"></exception>`
`31`	`31`	`public static HubConnection Build(this IHubConnectionBuilder builder, params ISignalRCallbackDescriptor[] descriptors)`
`32`	`32`	`{`
`33`		`- if (builder == null) throw new ArgumentNullException(nameof(builder));`
	`33`	`+ ArgumentNullException.ThrowIfNull(builder);`
`34`	`34`	`HubConnection hubConnection = builder.Build();`
`35`	`35`	`hubConnection.RegisterDescriptors(descriptors);`
`36`	`36`	`return hubConnection;`