Estudo - Ponto Web - Atualização para .Net 10

src/Secullum.Validation/CollectionValidation.cs

@@ -9,7 +9,7 @@ namespace Secullum.Validation
     public class CollectionValidation<T> : IValidation<T, CollectionValidation<T>> where T : class
     {
         private ICollection<Validation<T>> validationCollection;
-                
+
         public CollectionValidation(ICollection<T> targetCollection) : this(targetCollection, null)
         {
         }
@@ -23,7 +23,7 @@ public CollectionValidation(ICollection<T> targetCollection, DbContext dbContext
                 validationCollection.Add(new Validation<T>(item, dbContext));
             }
         }
-        
+
         public CollectionValidation<T> HasDisplayText(Expression<Func<T, string>> expression, string displayText)
         {
             foreach (var validation in validationCollection)
@@ -140,7 +140,7 @@ public CollectionValidation<T> IsRequired(Expression<Func<T, int?>> expression)
             {
                 validation.IsRequired(expression);
             }
- 
+
             return this;
         }
 
@@ -193,7 +193,7 @@ public CollectionValidation<T> HasMaxLength(Expression<Func<T, string>> expressi
 
             return this;
         }
-        
+
         public CollectionValidation<T> IsEmail(Expression<Func<T, string>> expression)
         {
             foreach (var validation in validationCollection)

src/Secullum.Validation/Localization.cs

@@ -35,7 +35,7 @@ static Localization()
             englishDictionary.Add(StringTypes.HasMaxLengthMessage, "The field {0} must have at most {1} characters.");
             portugueseDictionary.Add(StringTypes.HasMaxLengthMessage, "O campo {0} deve possuir no máximo {1} caracteres.");
             spanishDictionary.Add(StringTypes.HasMaxLengthMessage, "El campo {0} debe poseer máximo {1} caracteres.");
-            
+
             englishDictionary.Add(StringTypes.IsEmailMessage, "{0} invalid.");
             portugueseDictionary.Add(StringTypes.IsEmailMessage, "{0} inválido.");
             spanishDictionary.Add(StringTypes.IsEmailMessage, "{0} no válido.");

src/Secullum.Validation/Secullum.Validation.csproj

@@ -2,14 +2,14 @@
   <PropertyGroup>
     <Description>Secullum.Validation</Description>
     <AssemblyTitle>Secullum.Validation</AssemblyTitle>
-    <VersionPrefix>1.1.0</VersionPrefix>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <VersionPrefix>1.1.12764.1</VersionPrefix>
+    <TargetFramework>net10.0</TargetFramework>
     <AssemblyName>Secullum.Validation</AssemblyName>
     <PackageId>Secullum.Validation</PackageId>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/Secullum/Secullum.Validation</RepositoryUrl>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.32" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.1" />
   </ItemGroup>
 </Project>

src/Secullum.Validation/Validation.cs

@@ -83,7 +83,7 @@ private Validation<T> HasDisplayText(LambdaExpression expression, string display
 
             return this;
         }
-        
+
         public Validation<T> IsRequired(Expression<Func<T, string>> expression)
         {
             ThrowIfNotMemberAccessExpression(expression.Body);
@@ -192,12 +192,12 @@ public Validation<T> HasMaxLength(Expression<Func<T, string>> expression, int ma
             }
 
             var value = expression.Compile()(target);
-            
+
             if (value != null && value.Length > maxLength)
             {
                 AddError((MemberExpression)expression.Body, GetString(HasMaxLengthMessage), maxLength);
             }
-            
+
             return this;
         }
 
@@ -207,7 +207,7 @@ public Validation<T> IsEmail(Expression<Func<T, string>> expression)
 
             var value = expression.Compile()(target);
             var regex = new Regex(@"^[a-zA-Z0-9_\.-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-\.]+$");
-            
+
             if (!string.IsNullOrEmpty(value) && !regex.IsMatch(value))
             {
                 AddError((MemberExpression)expression.Body, GetString(IsEmailMessage));
@@ -267,7 +267,7 @@ private Validation<T> IsUnique(LambdaExpression expression, object propValue)
 
             var idProp = typeof(T).GetTypeInfo().GetDeclaredProperty("Id");
             var idValue = idProp.GetValue(target);
-            
+
             // x.Name == "fernando"
             var equalExpression = Expression.Equal(
                 expression.Body,
@@ -292,7 +292,7 @@ private Validation<T> IsUnique(LambdaExpression expression, object propValue)
             {
                 AddError((MemberExpression)expression.Body, GetString(IsUniqueMessage));
             }
-            
+
             return this;
         }
 
@@ -306,7 +306,7 @@ public Validation<T> IsCpf(Expression<Func<T, string>> expression)
             {
                 AddError((MemberExpression)expression.Body, GetString(IsCpfMessage));
             }
-            
+
             return this;
         }
 
@@ -485,10 +485,10 @@ private void AddError(MemberExpression expression, string message, params object
             var formatArgsList = new List<object>();
 
             displayTextDictionary.TryGetValue(expression.Member, out propertyDisplayText);
-            
+
             formatArgsList.Add(propertyDisplayText ?? propertyName);
             formatArgsList.AddRange(formatArgs);
-            
+
             errorList.Add(new ValidationError(propertyName, string.Format(message, formatArgsList.ToArray())));
         }
 

test/Secullum.Validation.Tests/CollectionTests.cs

@@ -24,7 +24,7 @@ public void IsRequired_GivenValidField_DontReturnErrors()
 
             foreach (var lista in errors)
             {
-                Assert.Equal(0, lista.Count);
+                Assert.Empty(lista);
             }
         }
 
@@ -37,14 +37,14 @@ public void IsRequired_GivenEmptyField_ReturnError(string name)
             var people = new List<Person>();
 
             people.Add(new Person { Name = name });
-            
+
             var errors = new CollectionValidation<Person>(people)
                 .IsRequired(x => x.Name)
                 .ToList();
 
             foreach (var lista in errors)
             {
-                Assert.Equal(1, lista.Count);
+                Assert.Single(lista);
                 Assert.Equal("Name", lista[0].Property);
             }
         }
@@ -66,7 +66,7 @@ public void HasMaxLength_GivenValidField_DontReturnErrors(string name, int maxLe
 
             foreach (var lista in errors)
             {
-                Assert.Equal(0, lista.Count);
+                Assert.Empty(lista);
             }
         }
 
@@ -76,12 +76,12 @@ public void HasMaxLength_GivenInvalidField_ReturnError()
             var people = new List<Person>();
 
             people.Add(new Person { Name = "Fernando" });
-            
+
             var errors = new CollectionValidation<Person>(people)
                 .HasMaxLength(x => x.Name, 5)
                 .ToList();
 
-            Assert.Equal(1, errors.Count);
+            Assert.Single(errors);
             Assert.Equal("Name", errors[0][0].Property);
         }
 
@@ -96,7 +96,7 @@ public void HasCustomValidation_GivenFalseCondition_ReturnErrors()
                 .HasCustomValidation(x => false, "Email", "Preencha o campo Email corretamente")
                 .ToList();
 
-            Assert.Equal(1, errors[0].Count);
+            Assert.Single(errors[0]);
             Assert.Equal("Preencha o campo Email corretamente", errors[0][0].Message);
         }
 
@@ -115,7 +115,7 @@ public void IsSmallDateTime_GivenValidField_DontReturnErrors(int year, int month
                 .IsSmallDateTime(x => x.Birth)
                 .ToList();
 
-            Assert.Equal(0, errors[0].Count);
+            Assert.Empty(errors[0]);
         }
 
     }

test/Secullum.Validation.Tests/HasCustomValidationTests.cs

@@ -31,7 +31,7 @@ public void HasCustomValidation_GivenSimpleFalseCondition_ReturnErrors()
 
             Assert.Equal("Preencha o campo Email corretamente", errors[0].Message);
         }
-        
+
         [Fact]
         public void HasCustomValidation_GivenTrueCondition_DontReturnErrors()
         {
@@ -41,7 +41,7 @@ public void HasCustomValidation_GivenTrueCondition_DontReturnErrors()
                 .HasCustomValidation(x => true, "Email", "Preencha o campo Email corretamente")
                 .ToList();
 
-            Assert.Equal(0, errors.Count);
+            Assert.Empty(errors);
         }
 
         [Fact]
@@ -53,7 +53,7 @@ public void HasCustomValidation_GivenFalseCondition_ReturnErrors()
                 .HasCustomValidation(x => !((x.Email == "unknown@domain.net" || x.Id == 1) && x.Age > 0), "Email", "Preencha o campo Email corretamente")
                 .ToList();
 
-            Assert.Equal(1, errors.Count);
+            Assert.Single(errors);
             Assert.Equal("Preencha o campo Email corretamente", errors[0].Message);
         }
     }

test/Secullum.Validation.Tests/HasDisplayTextTests.cs

@@ -58,7 +58,7 @@ public void HasDisplayText_GivenDisplayTextNullableIntValue_UsesIt()
         {
             SetCurrentThreadCulture(new CultureInfo("pt-BR"));
 
-            var person = new Person() { Zipcode = 42 } ;
+            var person = new Person() { Zipcode = 42 };
 
             var errors = new Validation<Person>(person)
                 .HasDisplayText(x => x.Zipcode, "Zipcode")
@@ -74,7 +74,7 @@ public void HasDisplayText_GivenDisplayTextFloatValue_UsesIt()
         {
             SetCurrentThreadCulture(new CultureInfo("pt-BR"));
 
-            var person = new Person() ;
+            var person = new Person();
 
             var errors = new Validation<Person>(person)
                 .HasDisplayText(x => x.Height, "Height")
@@ -84,13 +84,13 @@ public void HasDisplayText_GivenDisplayTextFloatValue_UsesIt()
             Assert.Equal("Height", errors[0].Property);
             Assert.Equal($"O campo Height deve ser preenchido com valores entre 100,01 e 250,02.", errors[0].Message);
         }
-        
+
         [Fact]
         public void HasDisplayText_GivenDisplayTextNullableFloatValue_UsesIt()
         {
             SetCurrentThreadCulture(new CultureInfo("pt-BR"));
 
-            var person = new Person() {Weight = 5};
+            var person = new Person() { Weight = 5 };
 
             var errors = new Validation<Person>(person)
                 .HasDisplayText(x => x.Weight, "Weight")

test/Secullum.Validation.Tests/HasMaxLengthTests.cs

@@ -18,7 +18,7 @@ public void HasMaxLength_GivenValidField_DontReturnErrors(string name, int maxLe
                 .HasMaxLength(x => x.Name, maxLength)
                 .ToList();
 
-            Assert.Equal(0, errors.Count);
+            Assert.Empty(errors);
         }
 
         [Fact]
@@ -30,10 +30,10 @@ public void HasMaxLength_GivenInvalidField_ReturnError()
                 .HasMaxLength(x => x.Name, 5)
                 .ToList();
 
-            Assert.Equal(1, errors.Count);
+            Assert.Single(errors);
             Assert.Equal("Name", errors[0].Property);
         }
-        
+
         [Fact]
         public void HasMaxLength_GivenInvalidExpression_ThrowsException()
         {
@@ -46,7 +46,7 @@ public void HasMaxLength_GivenInvalidExpression_ThrowsException()
                     .ToList();
             });
         }
-        
+
         [Theory]
         [InlineData(0)]
         [InlineData(-1)]