develop into master (#62)

* Include Request with FromHeaderAttribute #32 * * added logic of apicontroller where the [frombody] attribute does not need to be added and fixed bug when i send a object with properties a null in the body * * Update support for method patch * Fix null reference exception when pass null properties in request model * Simplify way of parameter extract * Create a new model in Sample.Api to use it as a parameter Two new endpoints with parameters (custom or primitive object) Tests calling endpoints with a null parameter (custom or primitive object) We check if the instance is null before AddTokken in PrimitiveParameterActionTokenizer and ComplexParameterActionTokenizer We add null argument in TestServerAction instead of a null reference exception * Bump Microsoft.AspNetCore.Authentication.JwtBearer Bumps [Microsoft.AspNetCore.Authentication.JwtBearer](https://github.com/aspnet/AspNetCore) from 3.0.0 to 3.1.18. - [Release notes](https://github.com/aspnet/AspNetCore/releases) - [Commits](dotnet/aspnetcore@v3.0.0...v3.1.18) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Authentication.JwtBearer dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * Update TestServerExtensionsTests.cs fix test name * Revert updated Microsoft.AspNetCore.Authentication.JwtBearer * ?. removed in last merge * * added tests * Include dependencies.props in "Solution Items" folder Update nugets and sdk version * 42 use GitHub actions instead of appveyor (#45) * Add github workflows * remove appveyor files Co-authored-by: Sergio <[email protected]> * Move "Package information" from "build/dependencies.props" to "Directory.Build.props" Add Source Link to Github Minimun version 3.1.300 to avoid issue "dotnet/sourcelink#572" * Feature/router paramas with underscores (#51) * allow router params with _ and - * Test for allow router params with _ Co-authored-by: Alexis Martin Peña <[email protected]> * Fix TestServerAction for methods parameters (#43) * Fix TestServerAction for methods parameters * Merge With VFA91 Fork * Add Guid[] In QueryParams * Avoid add parameter when Guid[] is empty * Adding Test * using GuidArrayExtension * Remove unused method * fix for .net5 * Fixing comments * Enable any array from query params * Avoid Array with not primitives types * fix for .net 3.1 * comments fix * Change namespace & Clear function for primitives * remove dynamic * rename variables Co-authored-by: Alexis Martin Peña <[email protected]> Co-authored-by: Sergio <[email protected]> * Set targets and versions to Net Core 3.1, Net 5 and Net 6 Application version 3.2.0 (#54) Set targets and versions to Net Core 3.1, Net 5 and Net 6 Add Directory.Build.targets with version of nugets Modify workflows to support Net 5 and Net 6 Clean ".csproj"s * Feature/update to net6 (#55) Change PackageLicenseUrl to PackageLicenseUrl Remove SetCompatibilityVersion from the code Update README * Feature/nullable query params (#53) * Add Test For try fix a Bug * Allo Query Parameter Nullable * allow .net 3.1 build * add folder again * fix indent * fix indent * indent * indent * fix merge * Change class name and access * Pr Comments * better comment method * comment * improve performance Co-authored-by: Alexis Martin Peña <[email protected]> * Tests using WebApplicationFactory (#58) Documentation about GetStarted, WebApplicationFactory and ICollectionFixture (xunit) Refactor ValuesTests and ValuesWithHttpClientTests to test also WebApplicationFactory Co-authored-by: Sergio <[email protected]> * Allow router params in post methods (#60) Co-authored-by: Alexis Martin Peña <[email protected]> * regex_pattern include several colon (#61) Co-authored-by: Sergio <[email protected]> Co-authored-by: Vicente Fernández Antolín <[email protected]> Co-authored-by: David Jiménez <[email protected]> Co-authored-by: Carlos Jiménez Delgado <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: David Jiménez Hernández <[email protected]> Co-authored-by: serweck <[email protected]> Co-authored-by: Alexis Martin Peña <[email protected]>
Xabaril · Apr 19, 2022 · 7216f60 · 7216f60
1 parent 9c62244
commit 7216f60
Show file tree

Hide file tree

Showing 36 changed files with 771 additions and 349 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,11 +18,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Setup .NET SDK 6.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.200
+      - name: Setup .NET SDK 5.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.101
       - name: Setup .NET Core SDK 3.1
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: 3.1.417
       - name: Build .NET 3.1
-        run: dotnet build -c $BUILD_CONFIG
+        run: dotnet build -c $BUILD_CONFIG --framework netcoreapp3.1
+      - name: Build .NET 5.0
+        run: dotnet build -c $BUILD_CONFIG --framework net5.0
+      - name: Build .NET 6.0
+        run: dotnet build -c $BUILD_CONFIG --framework net6.0
       - name: Test
         run: dotnet test -c $BUILD_CONFIG --no-build
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -13,6 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Setup .NET SDK 6.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.200
+      - name: Setup .NET SDK 5.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 5.0.101
       - name: Setup .NET Core SDK 3.1
         uses: actions/setup-dotnet@v1
         with:

diff --git a/Acheve.TestHost.sln b/Acheve.TestHost.sln
@@ -22,6 +22,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{97C5D07D-D623-497A-9DA5-2B3376A4F0DC}"
 	ProjectSection(SolutionItems) = preProject
 		build\dependencies.props = build\dependencies.props
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
 		global.json = global.json
 	EndProjectSection
 EndProject

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,15 +2,16 @@
   <Import Project="build/dependencies.props" />
 
   <PropertyGroup Label="Package information">
-    <Version>3.1.0</Version>
-    <PackageLicenseUrl>https://github.com/Xabaril/Acheve.TestHost/blob/master/LICENSE</PackageLicenseUrl>
+    <Version>3.2.0</Version>
+
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>http://github.com/xabaril/Acheve.TestHost</PackageProjectUrl>
     <RepositoryUrl>http://github.com/xabaril/Acheve.TestHost</RepositoryUrl>
     <Authors>Xabaril Contributors</Authors>
     <Company>Xabaril</Company>
     <Description>Achve.TestHost is a nuget package to improve TestServer experiences.
     For more information see http://github.com/Xabaril/Acheve.TestHost</Description>
-    <Tags>TestHost;TestServer</Tags>
+    <PackageTags>TestHost;TestServer</PackageTags>
 
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,40 @@
+<Project>
+	<ItemGroup Label="General Dependencies">
+		<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+		<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion3)" />
+		<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NetCoreVersion3)" />
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion3)" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+		<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion5)" />
+		<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NetCoreVersion5)" />
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion5)" />
+	</ItemGroup>
+
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+		<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion6)" />
+		<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(NetCoreVersion6)" />
+
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(NetCoreVersion6)" />
+	</ItemGroup>
+
+	<ItemGroup Label="Testing Dependencies">
+		<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+		<PackageReference Update="FluentAssertions" Version="6.5.1" />
+		<PackageReference Update="xunit" Version="2.4.1" />
+		<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Update="coverlet.collector" Version="3.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
+</Project>
diff --git a/LICENSE b/LICENSE