Develop into master

.github/workflows/ci.yml

@@ -26,7 +26,8 @@ jobs:
           dotnet-version: |
             6.0.421
             7.0.408
-            8.0.204
+            8.0.415
+            9.0.306
 
       - name: Build
         run: dotnet build -c $BUILD_CONFIG

.github/workflows/nuget.yml

@@ -21,7 +21,8 @@ jobs:
           dotnet-version: |
             6.0.421
             7.0.408
-            8.0.204
+            8.0.415
+            9.0.306
 
       - name: Build
         run: dotnet build -c $BUILD_CONFIG

Directory.Build.props

@@ -1,12 +1,12 @@
 <Project>
     <PropertyGroup Label="SDK Versions">
-        <NetCoreTargetVersion>net6.0;net7.0;net8.0</NetCoreTargetVersion>
+        <NetCoreTargetVersion>net6.0;net7.0;net8.0;net9.0</NetCoreTargetVersion>
         <LangVersion>latest</LangVersion>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     </PropertyGroup>
 
     <PropertyGroup Label="Package information">
-        <Version>4.0.0</Version>
+        <Version>4.1.0</Version>
 
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <PackageProjectUrl>http://github.com/xabaril/Acheve.TestHost</PackageProjectUrl>

Directory.Packages.props

@@ -1,27 +1,37 @@
 <Project>
   <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <NetCoreVersion>6.0.29</NetCoreVersion>
+    <NetCoreVersion>6.0.36</NetCoreVersion>
+    <MicrosoftNETTestSdkVersion>17.9.0</MicrosoftNETTestSdkVersion>
+    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <NetCoreVersion>7.0.18</NetCoreVersion>
+    <NetCoreVersion>7.0.20</NetCoreVersion>
+    <MicrosoftNETTestSdkVersion>17.9.0</MicrosoftNETTestSdkVersion>
+    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
   </PropertyGroup>
   <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net8.0' ">
-    <NetCoreVersion>8.0.4</NetCoreVersion>
+    <NetCoreVersion>8.0.21</NetCoreVersion>
+    <MicrosoftNETTestSdkVersion>18.0.0</MicrosoftNETTestSdkVersion>
+    <XUnitRunnerVisualStudioVersion>3.1.5</XUnitRunnerVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net9.0' ">
+    <NetCoreVersion>9.0.10</NetCoreVersion>
+    <MicrosoftNETTestSdkVersion>18.0.0</MicrosoftNETTestSdkVersion>
+    <XUnitRunnerVisualStudioVersion>3.1.5</XUnitRunnerVisualStudioVersion>
   </PropertyGroup>
   <ItemGroup Label="General Dependencies">
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion)" />
   </ItemGroup>
   <ItemGroup Label="Sample Dependencies">
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NetCoreVersion)" />
   </ItemGroup>
   <ItemGroup Label="Testing Dependencies">
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="xunit" Version="2.8.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+    <PackageVersion Include="FluentAssertions" Version="[7.2.0]" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
   </ItemGroup>
   <ItemGroup Label="Github Dependencies">
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />

global.json

@@ -1,7 +1,7 @@
 {
   "projects": ["src", "test", "samples"],
   "sdk": {
-    "version": "8.0.000",
+    "version": "9.0.0",
     "rollForward": "latestMajor"
   }
 }

samples/Sample.Api/ApiConfiguration.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.DependencyInjection;
-//using Newtonsoft.Json;
 using System.Security.Claims;
 
 namespace Sample.Api

src/Acheve.TestHost/Extensions/TypeExtensions.cs

@@ -13,7 +13,8 @@ internal static bool IsPrimitiveType(this Type typeToInspect)
             || type == typeof(string)
             || type == typeof(decimal)
             || type == typeof(Guid)
-            || type.IsDateTime();
+            || type.IsDateTime()
+            || type.IsEnum;
     }
 
     internal static bool IsDateTime(this Type typeToInspect)

src/Acheve.TestHost/Routing/UriDiscover.cs

@@ -215,9 +215,11 @@
             throw new InvalidOperationException($"The action selector is not a valid lambda expression");
         }
 
-        var methodCall = (MethodCallExpression)actionSelector.Body;
+        var methodCall = actionSelector.Body as MethodCallExpression;
+        if (methodCall is null)
+            methodCall = (actionSelector.Body as UnaryExpression).Operand as MethodCallExpression;
 
         var action = new TestServerAction(methodCall.Method);
         bool haveAttributeApiController = typeof(TController).GetTypeInfo().GetCustomAttribute(typeof(ApiControllerAttribute)) != null;
         bool isGetOrDelete = action.MethodInfo.GetCustomAttributes().FirstOrDefault(attr => attr.GetType() == typeof(HttpGetAttribute)
                                                                                      || attr.GetType() == typeof(HttpDeleteAttribute)) != null;

tests/UnitTests/Acheve.TestHost/Routing/Builders/ValuesV5Controller.cs

@@ -125,4 +125,12 @@ public ActionResult<ParamWithDifferentFroms> PostWithDifferentFroms(ParamWithDif
     [HttpPut($"{nameof(PutWithDifferentFroms)}/{{{nameof(ParamWithDifferentFroms.ParamFromRoute)}}}")]
     public ActionResult<ParamWithDifferentFroms> PutWithDifferentFroms(ParamWithDifferentFroms request)
         => Ok(request);
+
+    [HttpGet($"{nameof(GetWithEnumInRoute)}/{{request}}")]
+    public string GetWithEnumInRoute([FromRoute] SampleEnumeration request)
+        => request.ToString();
+
+    [HttpGet($"{nameof(GetWithEnumInQuery)}")]
+    public string GetWithEnumInQuery([FromQuery] SampleEnumeration request)
+        => request.ToString();
 }

tests/UnitTests/Acheve.TestHost/Routing/Models/SampleEnumeration.cs

@@ -0,0 +1,8 @@
+namespace UnitTests.Acheve.TestHost.Routing.Models;
+
+public enum SampleEnumeration
+{
+    Value1,
+    Value2,
+    Value3
+}

tests/UnitTests/Acheve.TestHost/Routing/TestServerExtensionsTests.cs

@@ -1954,6 +1954,40 @@ public async Task Create_put_request_with_object_with_different_froms()
         content.ParamFromBody.Should().Be(model.ParamFromBody);
     }
 
+    [Fact]
+    public async Task Create_get_request_with_enum_from_query()
+    {
+        var server = new TestServerBuilder()
+            .UseDefaultStartup()
+            .Build();
+
+        var enumValue = SampleEnumeration.Value3;
+
+        var request = server.CreateHttpApiRequest<ValuesV5Controller>(controller => controller.GetWithEnumInQuery(enumValue));
+        var responseMessage = await request.GetAsync();
+
+        await responseMessage.IsSuccessStatusCodeOrThrow();
+        var response = await responseMessage.Content.ReadAsStringAsync();
+        response.Should().Be(enumValue.ToString());
+    }
+
+    [Fact]
+    public async Task Create_get_request_with_enum_from_route()
+    {
+        var server = new TestServerBuilder()
+            .UseDefaultStartup()
+            .Build();
+
+        var enumValue = SampleEnumeration.Value3;
+
+        var request = server.CreateHttpApiRequest<ValuesV5Controller>(controller => controller.GetWithEnumInRoute(enumValue));
+        var responseMessage = await request.GetAsync();
+
+        await responseMessage.IsSuccessStatusCodeOrThrow();
+        var response = await responseMessage.Content.ReadAsStringAsync();
+        response.Should().Be(enumValue.ToString());
+    }
+
     private class PrivateNonControllerClass
     {
         public int SomeAction()