Add .Net 6.0 support and fix issue with PropertyName for the whole entity (#4)

* Added .net6.0 support

* Fix issue with PropertyName in UseHttpCode

Co-authored-by: Yana Vdovina <[email protected]>

Author: YanaVdovina

.github/workflows/build.yml

@@ -19,6 +19,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish.yml

@@ -23,6 +23,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.x
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Pack
       run: |
         cd src

src/FluentValidation.HttpExtensions.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <LangVersion>9</LangVersion>
         <AssemblyName>Pankraty.FluentValidation.HttpExtensions</AssemblyName>
         <Title>Pankraty.FluentValidation.HttpExtensions</Title>

src/IRuleBuilderExtensions.cs

@@ -34,16 +34,23 @@ public static IRuleBuilderOptions<T, TProperty> AsLocked<T, TProperty>(
             ruleBuilder.UseHttpCode(HttpStatusCode.Locked);
 
         private static string BuildPropertyName(HttpStatusCode httpStatusCode) =>
-            $"{ErrorStatusConst.Prefix}{(int) httpStatusCode}";
+            $"{ErrorStatusConst.Prefix}{(int)httpStatusCode}";
 
         private static IRuleBuilderOptions<T, TProperty> UseHttpCode<T, TProperty>(
             this IRuleBuilderOptions<T, TProperty> ruleBuilder, HttpStatusCode httpStatusCode)
         {
             string propertyName = "";
-            return ruleBuilder
-                .Configure(x => propertyName = x.GetDisplayName(null))
-                .WithName(propertyName)
-                .OverridePropertyName(BuildPropertyName(httpStatusCode));
+
+            var options = ruleBuilder.Configure(x => propertyName = x.GetDisplayName(null));
+
+            if (!string.IsNullOrEmpty(propertyName))
+            {
+                options.WithName(propertyName);
+            }
+
+            options.OverridePropertyName(BuildPropertyName(httpStatusCode));
+
+            return options;
         }
     }
 }

tests/FluentValidation.HttpExtensions.Unit/FluentValidation.HttpExtensions.Unit.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <LangVersion>9</LangVersion>
     </PropertyGroup>
 

tests/FluentValidation.HttpExtensions.Unit/NotFoundControllerShould.cs

@@ -36,29 +36,32 @@ public async Task Use_Multiple_Messages()
                 {
                     "Could not find Name James Bond",
                     "Could not find Address London, Great Britain",
+                    "Could not find entity"
                 });
         }
 
         [Fact]
         public async Task Use_Single_Message_When_Another_Rule_Passed()
         {
-            _testEntity.Name = "Existing";
-            _testEntity.Address = "London, Great Britain";
+            _testEntity.Name = "James Bond";
+            _testEntity.PostalCode = "Existing";
+            _testEntity.Address = "Existing";
 
             var response = await Post();
             var problems = await response.DeserializeAs<ValidationProblemDetails>();
 
             response.StatusCode.Should().Be(HttpStatusCode.NotFound);
             problems.Errors.Should()
                 .OnlyContain(x => x.Key == "" &&
-                                  x.Value.Single() == "Could not find Address London, Great Britain");
+                                  x.Value.Single() == "Could not find Name James Bond");
         }
 
         [Fact]
         public async Task Return_200_When_All_Rules_Passed()
         {
             _testEntity.Name = "Existing";
             _testEntity.Address = "Existing";
+            _testEntity.PostalCode = "Existing";
 
             var response = await Post();
 

tests/TestApplication/TestApplication.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <LangVersion>9</LangVersion>
     </PropertyGroup>
 

tests/TestInfrastructure/NotFoundValidator.cs

@@ -16,6 +16,11 @@ public NotFoundValidator()
                 .Must(x => x == "Existing")
                 .AsNotFound()
                 .WithMessage("Could not find {PropertyName} {PropertyValue}");
+
+            RuleFor(x => x)
+                .Must(x => x.Address == "Existing" && x.PostalCode == "Existing")
+                .AsNotFound()
+                .WithMessage("Could not find entity");
         }
     }
 }

tests/TestInfrastructure/TestEntity.cs

@@ -16,5 +16,6 @@ public class NotFoundEntity
     {
         public string Name { get; set; }
         public string Address { get; set; }
+        public string PostalCode { get; set; }
     }
 }

tests/TestInfrastructure/TestInfrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <LangVersion>9</LangVersion>
         <RootNamespace>FluentValidation.HttpExtensions.TestInfrastructure</RootNamespace>
     </PropertyGroup>