Bump version 0.5.2 (#117)

* Remove generic new constraint

* bump to version 0.5.2

Author: Matthiee

CommandLineParser/CommandLineParser.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>MatthiWare.CommandLine</RootNamespace>
     <PackageId>MatthiWare.CommandLineParser</PackageId>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Authors>Matthias Beerens</Authors>
     <Company>MatthiWare</Company>
     <Product>Command Line Parser</Product>
@@ -14,11 +14,12 @@
     <RepositoryUrl>https://github.com/MatthiWare/CommandLineParser.Core</RepositoryUrl>
     <PackageTags>Commandline parser commandline-parser cli</PackageTags>
     <LangVersion>7.3</LangVersion>
-    <AssemblyVersion>0.5.1.0</AssemblyVersion>
-    <FileVersion>0.5.1.0</FileVersion>
+    <AssemblyVersion>0.5.2.0</AssemblyVersion>
+    <FileVersion>0.5.2.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageReleaseNotes>- Fix incorrect error message</PackageReleaseNotes>
     <Copyright>Copyright Matthias Beerens 2018</Copyright>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Extensions/FluentValidationsExtensions/Core/FluentValidationConfiguration.cs

@@ -50,7 +50,7 @@ public FluentValidationConfiguration AddValidator(Type key, Type validator)
         /// <typeparam name="V">Validator type</typeparam>
         /// <returns>Self</returns>
         public FluentValidationConfiguration AddValidator<K, V>()
-            where V : AbstractValidator<K>, new()
+            where V : AbstractValidator<K>
         {
             GetValidatorCollection(typeof(K)).AddValidator<V>();
 
@@ -65,7 +65,7 @@ public FluentValidationConfiguration AddValidator<K, V>()
         /// <param name="instance">Instance</param>
         /// <returns>Self</returns>
         public FluentValidationConfiguration AddValidatorInstance<K, V>(V instance)
-            where V : AbstractValidator<K>, new()
+            where V : AbstractValidator<K>
         {
             if (instance is null)
             {

Extensions/FluentValidationsExtensions/FluentValidationsExtensions.csproj

@@ -4,21 +4,23 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>MatthiWare.CommandLine.Extensions.FluentValidations</RootNamespace>
     <AssemblyName>CommandLineParser.FluentValidations</AssemblyName>
-    <Version>0.5.1</Version>
+    <Version>0.5.2</Version>
     <Authors>Matthias Beerens</Authors>
     <Company>MatthiWare</Company>
-    <Product>FluentValidations Extension For CommandLineParser.Core</Product>
-    <Description>FluentValidations extension for CommandLineParser.Core</Description>
+    <Product>FluentValidations Extension For MatthiWare.CommandLineParser</Product>
+    <Description>FluentValidations extension for MatthiWare.CommandLineParser</Description>
     <PackageProjectUrl>https://github.com/MatthiWare/CommandLineParser.Core</PackageProjectUrl>
     <PackageLicenseUrl></PackageLicenseUrl>
     <RepositoryUrl>https://github.com/MatthiWare/CommandLineParser.Core</RepositoryUrl>
     <PackageTags>Commandline parser commandline-parser cli fluent-validations extension</PackageTags>
     <LangVersion>7.3</LangVersion>
-    <AssemblyVersion>0.5.1.0</AssemblyVersion>
-    <FileVersion>0.5.1.0</FileVersion>
+    <AssemblyVersion>0.5.2.0</AssemblyVersion>
+    <FileVersion>0.5.2.0</FileVersion>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageReleaseNotes>- Update dependencies</PackageReleaseNotes>
+    <PackageReleaseNotes>- Remove generic new constraint</PackageReleaseNotes>
     <Copyright>Copyright Matthias Beerens 2019</Copyright>
+    <PackageId>MatthiWare.CommandLineParser.Extensions.FluentValidations</PackageId>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

Extensions/Tests/FluentValidationsExtensions.Tests/FluentValidationsTests.cs

@@ -5,6 +5,8 @@
 using MatthiWare.CommandLine.Extensions.FluentValidations;
 using MatthiWare.CommandLine.Extensions.FluentValidations.Core;
 using MatthiWare.CommandLine.Tests;
+using Microsoft.Extensions.DependencyInjection;
+using Moq;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -82,6 +84,27 @@ public void SubCommandShouldFailIfValidationFailsForModel(bool useGeneric, bool
             Assert.True(result.AssertNoErrors(false));
         }
 
+        [Fact]
+        public void GenericAddValidatorWithDependencyShouldWork()
+        {
+            var dependencyMock = new Mock<IValidationDependency>();
+            dependencyMock.Setup(_ => _.IsValid(It.IsAny<string>())).Returns(true).Verifiable();
+
+            Services.AddSingleton(dependencyMock.Object);
+
+            var parser = new CommandLineParser<EmailModel>(Services);
+
+            parser.UseFluentValidations(config =>
+            {
+                config.AddValidator<EmailModel, ValidatorWithDependency>();
+            });
+
+            var result = parser.Parse(new string[] { "-e", "[email protected]", "-i", "0" });
+
+            result.AssertNoErrors();
+            dependencyMock.Verify();
+        }
+
         private void OnConfigureFluentValidations(FluentValidationConfiguration config, bool useGeneric, bool useInstantiated)
         {
             if (useGeneric)

Extensions/Tests/FluentValidationsExtensions.Tests/Validators/ValidatorWithDependency.cs

@@ -0,0 +1,18 @@
+using FluentValidation;
+using FluentValidationsExtensions.Tests.Models;
+
+namespace FluentValidationsExtensions.Tests.Validators
+{
+    public class ValidatorWithDependency : AbstractValidator<EmailModel>
+    {
+        public ValidatorWithDependency(IValidationDependency dependency)
+        {
+            RuleFor(_ => _.Email).Must(dependency.IsValid);
+        }
+    }
+
+    public interface IValidationDependency
+    {
+        bool IsValid(string input);
+    }
+}