Merge pull request #16 from AppCoreNet/dev

Release v0.4.0

Author: prochnowc

Directory.Build.props

@@ -3,17 +3,18 @@
     <Authors>AppCore .NET Contributors</Authors>
     <Company>The AppCore .NET project</Company>
     <Product>AppCore .NET model validation</Product>
-    <Copyright>Copyright (c) 2018-2020 the AppCore .NET project</Copyright>
+    <Copyright>Copyright (c) 2018-2022 the AppCore .NET project</Copyright>
     <Version>1.0.0</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/AppCoreNet/Validation</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
+    <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
-    <NoWarn>$(NoWarn);NU5105</NoWarn>
     <!--
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <RestoreLockedMode Condition="'$(CI)' == 'true'">true</RestoreLockedMode>
     -->
+    <DefineConstants>$(DefineConstants);ENABLE_NULLABLE</DefineConstants>
   </PropertyGroup>
 
   <Import Project="./build/shared/dotnet/common.props" />

README.md

@@ -42,7 +42,7 @@ Adds support for using DataAnnotations.
 To use DataAnnotations configure the provider when registering the facility:
 ```
 services.AddAppCore()
-        .AddModelValidation(v => v.UseDataAnnotations());
+        .AddModelValidation(v => v.AddDataAnnotations());
 ```
 
 ### FluentValidation
@@ -51,7 +51,7 @@ Adds support for using FluentValidation.
 To use FluentValidation, configure the provider and add validators when registering the facility:
 ```
 services.AddAppCore()
-        .AddModelValidation(v => v.UseFluentValidation(fv => fv.WithValidator<MyValidator>()));
+        .AddModelValidation(v => v.AddFluentValidation(fv => fv.AddValidator<MyValidator>())));
 ```
 
 ## Contributing

build/dependency-versions.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <AppCore_Shared_Version>0.3.0</AppCore_Shared_Version>
-    <AppCore_DI_Version>0.3.0</AppCore_DI_Version>
+    <AppCore_Shared_Version>0.4.3</AppCore_Shared_Version>
+    <AppCore_Extensions_Version>0.4.0</AppCore_Extensions_Version>
   </PropertyGroup>
 </Project>

build/shared/azure-pipelines/build-steps.yml

@@ -1,10 +1,11 @@
 parameters:
   configuration: 'Debug'
+  testFilter: ''
 
 steps:
-- pwsh: ./build.ps1 --configuration='${{ parameters.configuration }}'
+- pwsh: ./build.ps1 --configuration "${{ parameters.configuration }}"
   displayName: Build
-- pwsh: ./build.ps1 --target=Test --skip-target='Build' --configuration='${{ parameters.configuration }}' --artifactsDir='$(Build.ArtifactStagingDirectory)'
+- pwsh: ./build.ps1 --target "Test" --skip-target "Build" --configuration "${{ parameters.configuration }}" --test-filter "${{ parameters.testFilter }}" --artifactsDir "$(Build.ArtifactStagingDirectory)"
   displayName: Run Tests
 - task: PublishTestResults@2
   displayName: Publish Test Results

build/shared/azure-pipelines/install-steps.yml

@@ -1,16 +1,17 @@
 steps:
-- task: UseDotNet@2
-  displayName: 'Install .NET Core SDK 2.1'
-  inputs:
-    version: '2.1.x'
+
 - task: UseDotNet@2
   displayName: 'Install .NET Core SDK 3.1'
   inputs:
     version: '3.1.x'
 - task: UseDotNet@2
-  displayName: 'Install .NET Core SDK 5'
+  displayName: 'Install .NET SDK 5'
+  inputs:
+    version: '5.x'    
+- task: UseDotNet@2
+  displayName: 'Install .NET SDK 6'
   inputs:
-    version: '5.0.x'  
+    version: '6.x'  
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet 5.4'
   inputs:

build/shared/azure-pipelines/jobs.yml

@@ -1,5 +1,6 @@
 parameters:
   configuration: 'Debug'
+  testFilter: ''
 
 jobs:
 - job: Linux
@@ -9,10 +10,11 @@ jobs:
   - template: ./install-steps.yml  
   - template: ./build-steps.yml
     parameters:
-      configuration: $(configuration)
+      configuration: '${{ parameters.configuration }}'
+      testFilter: '${{ parameters.testFilter }}'
   - template: ./publish-steps.yml
     parameters:
-      configuration: $(configuration)  
+      configuration: '${{ parameters.configuration }}'
 
 - job: MacOS
   pool:
@@ -21,7 +23,8 @@ jobs:
   - template: ./install-steps.yml  
   - template: ./build-steps.yml
     parameters:
-      configuration: $(configuration)
+      configuration: '${{ parameters.configuration }}'
+      testFilter: '${{ parameters.testFilter }}'
 
 - job: Windows
   pool:
@@ -30,4 +33,5 @@ jobs:
   - template: ./install-steps.yml  
   - template: ./build-steps.yml
     parameters:
-      configuration: $(configuration)
+      configuration: '${{ parameters.configuration }}'
+      testFilter: '${{ parameters.testFilter }}'

build/shared/azure-pipelines/publish-steps.yml

@@ -2,7 +2,7 @@ parameters:
   configuration: 'Debug'
 
 steps:
-- pwsh: ./build.ps1 --target=Publish --configuration='${{ parameters.configuration }}' --artifactsDir='$(Build.ArtifactStagingDirectory)'
+- pwsh: ./build.ps1 --target "Publish" --configuration "${{ parameters.configuration }}" --artifactsDir "$(Build.ArtifactStagingDirectory)"
   displayName: Publish
 - task: NuGetCommand@2
   condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))

build/shared/cake/dotnetcore.cake

@@ -20,11 +20,16 @@ public class BuildParametersDotNetCore
 
     public string TestSolution { get; set; }
     public string TestProjectsPattern { get; set; } = "**/test/**/*.csproj";
+    public string TestFilter { get; set; }
 
     public bool CollectCoverage { get; set; } = true;
     public bool CollectTestAssemblyCoverage { get; set; } = false;
 }
 
+BuildParametersInit.Add((p,c) => {
+    p.DotNetCore.TestFilter = c.Argument("test-filter", "");
+});
+
 public bool DotNetCoreNewSolution(string solutionFile, FilePathCollection projectFiles)
 {
     bool needsUpdate = true;
@@ -169,6 +174,7 @@ Task("DotNetCore.Test")
                 return args;
             },
         Configuration = p.Configuration,
+        Filter = p.DotNetCore.TestFilter,
         ResultsDirectory = testResultsDir,
         Loggers = new string[] { "trx" },
         NoRestore = true,

build/shared/cake/parameters.cake

@@ -1,3 +1,5 @@
+static List<Action<BuildParameters, ICakeContext>> BuildParametersInit = new List<Action<BuildParameters, ICakeContext>>();
+
 public partial class BuildParameters
 {
     private readonly ICakeContext _context;
@@ -25,6 +27,9 @@ public partial class BuildParameters
             Version = BuildVersion.Create(context)
         };
 
+        foreach(Action<BuildParameters, ICakeContext> initFunc in BuildParametersInit)
+            initFunc(p, context);
+
         init?.Invoke(p);
         return p;
     }

global.json

@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "6.0.101",
+    "rollForward": "latestFeature"
+  } 
+}