Develop into master

.github/workflows/ci.yml

@@ -24,13 +24,12 @@ jobs:
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: |
-            3.1.417
-            5.0.101
-            6.0.300
-            7.0.302
+            6.0.421
+            7.0.408
+            8.0.204
 
       - name: Build
         run: dotnet build -c $BUILD_CONFIG
 
       - name: Test
-        run: dotnet test -c $BUILD_CONFIG --no-build
+        run: dotnet test -c $BUILD_CONFIG --no-build

.github/workflows/nuget.yml

@@ -19,10 +19,9 @@ jobs:
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: |
-            3.1.417
-            5.0.101
-            6.0.300
-            7.0.302
+            6.0.421
+            7.0.408
+            8.0.204
 
       - name: Build
         run: dotnet build -c $BUILD_CONFIG

Directory.Build.props

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

Directory.Packages.props

@@ -1,15 +1,12 @@
 <Project>
-  <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <NetCoreVersion>3.1.32</NetCoreVersion>
-  </PropertyGroup>
-  <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <NetCoreVersion>5.0.17</NetCoreVersion>
-  </PropertyGroup>
   <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <NetCoreVersion>6.0.16</NetCoreVersion>
+    <NetCoreVersion>6.0.29</NetCoreVersion>
   </PropertyGroup>
   <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net7.0' ">
-    <NetCoreVersion>7.0.5</NetCoreVersion>
+    <NetCoreVersion>7.0.18</NetCoreVersion>
+  </PropertyGroup>
+  <PropertyGroup Label=".Net version" Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <NetCoreVersion>8.0.4</NetCoreVersion>
   </PropertyGroup>
   <ItemGroup Label="General Dependencies">
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -20,13 +17,13 @@
   </ItemGroup>
   <ItemGroup Label="Testing Dependencies">
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion)" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
+    <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" />
   </ItemGroup>
   <ItemGroup Label="Github Dependencies">
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
   </ItemGroup>
 </Project>

global.json

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

src/Acheve.TestHost/Extensions/TestServerExtensions.cs

@@ -1,8 +1,10 @@
 using Acheve.TestHost.Routing;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Net.Http.Headers;
 using System;
 using System.IO;
 using System.Linq.Expressions;
+using System.Net.Mime;
 using System.Text;
 
 namespace Microsoft.AspNetCore.TestHost;
@@ -48,11 +50,18 @@ public static RequestBuilder CreateHttpApiRequest<TController, TActionResponse>(
         where TController : class
         => UriDiscover.CreateHttpApiRequest<TController>(server, actionSelector, tokenValues, contentOptions);
 
-    public static IFormFile GivenFile(this TestServer _, string parameterName = "file", string filename = "test.txt", string content = "test")
+    public static IFormFile GivenFile(this TestServer _, string parameterName = "file", string filename = "test.txt", string content = "test", string contentType = MediaTypeNames.Text.Plain)
     {
         var stream = new MemoryStream(Encoding.UTF8.GetBytes(content));
 
-        IFormFile file = new FormFile(stream, 0, stream.Length, parameterName, filename);
+        IFormFile file = new FormFile(stream, 0, stream.Length, parameterName, filename)
+        {
+            Headers = new HeaderDictionary()
+            {
+                [HeaderNames.ContentType] = contentType
+            },
+            ContentType = contentType
+        };
 
         return file;
     }

src/Acheve.TestHost/Extensions/TypeExtensions.cs

@@ -18,7 +18,11 @@ internal static bool IsPrimitiveType(this Type typeToInspect)
 
     internal static bool IsDateTime(this Type typeToInspect)
     {
-        return typeToInspect == typeof(DateTime) || typeToInspect == typeof(DateTimeOffset);
+        return typeToInspect == typeof(DateTime) ||
+            typeToInspect == typeof(DateTimeOffset) ||
+            typeToInspect == typeof(DateOnly) ||
+            typeToInspect == typeof(TimeSpan) ||
+            typeToInspect == typeof(TimeOnly);
     }
 
     internal static bool IsEnumerable(this Type typeToInspect)

src/Acheve.TestHost/RequestContent/IncludeContentAsFormUrlEncoded.cs

@@ -2,9 +2,9 @@
 using System;
 using System.Collections;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Threading;
 
 namespace Microsoft.AspNetCore.TestHost;
@@ -45,13 +45,13 @@ private void AddToMultipartFormDataContent(MultipartFormDataContent multipartCon
             case CancellationToken:
                 break;
             case IFormFile file:
-                using (var ms = new MemoryStream())
-                {
-                    file.CopyTo(ms);
-                    var fileContent = new ByteArrayContent(ms.ToArray());
+                var fileContent = new StreamContent(file.OpenReadStream());
+                if (!string.IsNullOrEmpty(file.ContentType))
+                    fileContent.Headers.ContentType = new MediaTypeHeaderValue(file.ContentType);
+                if (!string.IsNullOrEmpty(file.ContentDisposition))
+                    fileContent.Headers.ContentDisposition = new ContentDispositionHeaderValue(file.ContentDisposition);
 
-                    multipartContent.Add(fileContent, file.Name, file.FileName);
-                }
+                multipartContent.Add(fileContent, file.Name, file.FileName);
                 break;
             case object when data.GetType().IsPrimitiveType():
                 multipartContent.Add(new StringContent(PrimitiveValueToString(data)), propertyName);

src/Acheve.TestHost/Routing/TestServerAction.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,29 +24,7 @@ public TestServerAction(MethodInfo methodInfo)
         public void AddArgument(int order, Expression expression, bool activeBodyApiController)
         {
             var argument = MethodInfo.GetParameters()[order];
-            var isFromBody = argument.GetCustomAttributes<FromBodyAttribute>().Any();
-            var isFromForm = argument.GetCustomAttributes<FromFormAttribute>().Any();
-            var isFromHeader = argument.GetCustomAttributes<FromHeaderAttribute>().Any();
-            var isFromRoute = argument.GetCustomAttributes<FromRouteAttribute>().Any();
-
-            bool isPrimitive = argument.ParameterType.IsPrimitiveType();
-            bool hasNoAttributes = !isFromBody && !isFromForm && !isFromHeader && !isFromRoute;
-
-            if (activeBodyApiController && hasNoAttributes && !isPrimitive)
-            {
-                isFromBody = true;
-            }
-
-            if (argument.ParameterType == typeof(System.Threading.CancellationToken))
-            {
-                isFromBody = isFromForm = isFromHeader = false;
-            }
-
-            if (argument.ParameterType == typeof(IFormFile))
-            {
-                isFromForm = true;
-                isFromBody = isFromHeader = false;
-            }
+            var (fromType, canBeObjectWithMultipleFroms, isNeverBind) = GetIsFrom(argument, activeBodyApiController, value => value.ParameterType, value => value.GetCustomAttributes());
 
             if (!ArgumentValues.ContainsKey(order))
             {
@@ -55,7 +34,7 @@ public void AddArgument(int order, Expression expression, bool activeBodyApiCont
 
                     if (expressionValue != null)
                     {
-                        ArgumentValues.Add(order, new TestServerArgument(expressionValue.ToString(), isFromBody, isFromForm, isFromHeader, argument.Name));
+                        ArgumentValues.Add(order, new TestServerArgument(expressionValue.ToString(), fromType, isNeverBind, argument.ParameterType, argument.Name));
                     }
                 }
                 else
@@ -64,7 +43,7 @@ public void AddArgument(int order, Expression expression, bool activeBodyApiCont
                     {
                         case ConstantExpression constant:
                             {
-                                ArgumentValues.Add(order, new TestServerArgument(constant.Value?.ToString(), isFromBody, isFromForm, isFromHeader, argument.Name));
+                                ArgumentValues.Add(order, new TestServerArgument(constant.Value?.ToString(), fromType, isNeverBind, argument.ParameterType, argument.Name));
                             }
                             break;
 
@@ -73,15 +52,14 @@ public void AddArgument(int order, Expression expression, bool activeBodyApiCont
                                 var instance = Expression.Lambda(member)
                                     .Compile()
                                     .DynamicInvoke();
-
-                                ArgumentValues.Add(order, new TestServerArgument(instance, isFromBody, isFromForm, isFromHeader, argument.Name));
+                                AddArgumentValues(order, instance, argument.Name, fromType, isNeverBind, argument.ParameterType, canBeObjectWithMultipleFroms);
                             }
                             break;
 
                         case MethodCallExpression method:
                             {
                                 var instance = Expression.Lambda(method).Compile().DynamicInvoke();
-                                ArgumentValues.Add(order, new TestServerArgument(instance, isFromBody, isFromForm, isFromHeader, argument.Name));
+                                AddArgumentValues(order, instance, argument.Name, fromType, isNeverBind, argument.ParameterType, canBeObjectWithMultipleFroms);
                             }
                             break;
 
@@ -91,6 +69,99 @@ public void AddArgument(int order, Expression expression, bool activeBodyApiCont
             }
         }
 
-        private bool IsNullable(Type type) => Nullable.GetUnderlyingType(type) != null;
+        private static bool IsNullable(Type type) => Nullable.GetUnderlyingType(type) != null;
+
+        private void AddArgumentValues(int order, object value, string argumentName,
+            TestServerArgumentFromType fromType, bool isNeverBind, Type type, bool canBeObjectWithMultipleFroms)
+        {
+            if (canBeObjectWithMultipleFroms)
+            {
+                var properties = value.GetType().GetProperties();
+                var isObjectWithMultipleFroms = properties
+                    .SelectMany(p => p.GetCustomAttributes())
+                    .Select(a => a.GetType())
+                    .Any(a => a == typeof(FromBodyAttribute) || a == typeof(FromRouteAttribute) || a == typeof(FromHeaderAttribute) || a == typeof(FromQueryAttribute));
+                if (isObjectWithMultipleFroms)
+                {
+                    foreach (var property in properties)
+                    {
+                        (fromType, canBeObjectWithMultipleFroms, var isNeverBindProp) = GetIsFrom(property, false, value => value.PropertyType, value => value.GetCustomAttributes());
+                        argumentName = property.Name;
+                        var propertyValue = property.GetValue(value);
+
+                        ArgumentValues.Add(order, new TestServerArgument(propertyValue, fromType, isNeverBind || isNeverBindProp, property.PropertyType, argumentName));
+                        order++;
+                    }
+
+                    return;
+                }
+            }
+
+            ArgumentValues.Add(order, new TestServerArgument(value, fromType, isNeverBind, type, argumentName));
+        }
+
+        private (TestServerArgumentFromType fromType, bool canBeObjectWithMultipleFroms, bool neverBind) GetIsFrom<T>(T value, bool activeBodyApiController, Func<T, Type> getTypeFunc, Func<T, IEnumerable<Attribute>> getAttributesFunc)
+        {
+            var fromType = TestServerArgumentFromType.None;
+            var type = getTypeFunc(value);
+            var attributes = getAttributesFunc(value);
+
+            var isFromBody = attributes.Any(a => a is FromBodyAttribute);
+            var isFromForm = attributes.Any(a => a is FromFormAttribute);
+            var isFromHeader = attributes.Any(a => a is FromHeaderAttribute);
+            var isFromRoute = attributes.Any(a => a is FromRouteAttribute);
+            var isFromQuery = attributes.Any(a => a is FromQueryAttribute);
+            var isBindNever = attributes.Any(a => a is BindNeverAttribute);
+
+            if (isFromBody)
+            {
+                fromType |= TestServerArgumentFromType.Body;
+            }
+            if (isFromForm)
+            {
+                fromType |= TestServerArgumentFromType.Form;
+            }
+            if (isFromHeader)
+            {
+                fromType |= TestServerArgumentFromType.Header;
+            }
+            if (isFromRoute)
+            {
+                fromType |= TestServerArgumentFromType.Route;
+            }
+            if (isFromQuery)
+            {
+                fromType |= TestServerArgumentFromType.Query;
+            }
+
+            bool isPrimitive = type.IsPrimitiveType();
+            bool hasNoAttributes = fromType == TestServerArgumentFromType.None;
+            bool canBeObjectWithMultipleFroms = false;
+            if (hasNoAttributes && !isPrimitive)
+            {
+#if NET8_0_OR_GREATER
+                canBeObjectWithMultipleFroms = MethodInfo.GetParameters().Length == 1;
+#else
+                canBeObjectWithMultipleFroms = false;
+#endif
+
+                if (activeBodyApiController)
+                {
+                    fromType = TestServerArgumentFromType.Body;
+                }
+            }
+
+            if (type == typeof(System.Threading.CancellationToken))
+            {
+                fromType = TestServerArgumentFromType.None;
+            }
+
+            if (type == typeof(IFormFile))
+            {
+                fromType = TestServerArgumentFromType.Form;
+            }
+
+            return (fromType, canBeObjectWithMultipleFroms, isBindNever);
+        }
     }
 }