v2 release

DDDToolkit.sln

@@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{57967491
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Core.Tests", "tests\DDDToolkit.Core.Tests\DDDToolkit.Core.Tests.csproj", "{4E33A86B-6589-4501-A43A-F5A9E31AD35F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.API", "src\DDDToolkit.API\DDDToolkit.API.csproj", "{12926EE6-E9DF-4143-B1B6-016F9DE490DA}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Utilities", "src\DDDToolkit.Utilities\DDDToolkit.Utilities.csproj", "{0E06C087-FF39-4382-910C-2EC303FC4DA0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.EntityFramework.Extensions", "src\DDDToolkit.EntityFramework.Extensions\DDDToolkit.EntityFramework.Extensions.csproj", "{6F2563E8-BCF6-4751-9B23-4CE8426CFE42}"
@@ -35,11 +33,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Samples.Library.
 EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "DDDToolkit.Samples.Library.Repository.Database", "samples\library\DDDToolkit.Samples.Library.Repository.Database\DDDToolkit.Samples.Library.Repository.Database.sqlproj", "{1D41D8D2-B6A5-47DD-8E98-9512EC48B429}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Querying", "src\DDDToolkit.Querying\DDDToolkit.Querying.csproj", "{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Validation", "src\DDDToolkit.Validation\DDDToolkit.Validation.csproj", "{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Querying.Tests", "tests\DDDToolkit.Querying.Tests\DDDToolkit.Querying.Tests.csproj", "{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDDToolkit.EventSourcing", "src\DDDToolkit.EventSourcing\DDDToolkit.EventSourcing.csproj", "{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDDToolkit.Validation", "src\DDDToolkit.Validation\DDDToolkit.Validation.csproj", "{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDDToolkit.EventSourcing.Tests", "tests\DDDToolkit.EventSourcing.Tests\DDDToolkit.EventSourcing.Tests.csproj", "{37BE5ED1-05A9-491B-B8DA-F751882E20B0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,10 +61,6 @@ Global
 		{4E33A86B-6589-4501-A43A-F5A9E31AD35F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4E33A86B-6589-4501-A43A-F5A9E31AD35F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4E33A86B-6589-4501-A43A-F5A9E31AD35F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{12926EE6-E9DF-4143-B1B6-016F9DE490DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{12926EE6-E9DF-4143-B1B6-016F9DE490DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{12926EE6-E9DF-4143-B1B6-016F9DE490DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{12926EE6-E9DF-4143-B1B6-016F9DE490DA}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0E06C087-FF39-4382-910C-2EC303FC4DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E06C087-FF39-4382-910C-2EC303FC4DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E06C087-FF39-4382-910C-2EC303FC4DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -97,18 +91,18 @@ Global
 		{1D41D8D2-B6A5-47DD-8E98-9512EC48B429}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D41D8D2-B6A5-47DD-8E98-9512EC48B429}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1D41D8D2-B6A5-47DD-8E98-9512EC48B429}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37BE5ED1-05A9-491B-B8DA-F751882E20B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{37BE5ED1-05A9-491B-B8DA-F751882E20B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37BE5ED1-05A9-491B-B8DA-F751882E20B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{37BE5ED1-05A9-491B-B8DA-F751882E20B0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -118,7 +112,6 @@ Global
 		{C6748BFC-81EA-4C73-9B49-EC3534BDA722} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{849591EE-EEF6-4B29-97AA-34F532C2A642} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{4E33A86B-6589-4501-A43A-F5A9E31AD35F} = {57967491-B4BB-44B9-B270-6533A1E388B0}
-		{12926EE6-E9DF-4143-B1B6-016F9DE490DA} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{0E06C087-FF39-4382-910C-2EC303FC4DA0} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{6F2563E8-BCF6-4751-9B23-4CE8426CFE42} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{BDD881C3-118B-42D6-9D77-DDAB213CA4B0} = {175A537D-B6E1-4194-8895-D1870CF866E2}
@@ -127,9 +120,9 @@ Global
 		{95D67484-5CDD-4CA2-8457-B4A5D42D4D3C} = {BDD881C3-118B-42D6-9D77-DDAB213CA4B0}
 		{6DD4F5BC-B48B-43A6-A048-28F8BD04D7F6} = {BDD881C3-118B-42D6-9D77-DDAB213CA4B0}
 		{1D41D8D2-B6A5-47DD-8E98-9512EC48B429} = {BDD881C3-118B-42D6-9D77-DDAB213CA4B0}
-		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
-		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55} = {57967491-B4BB-44B9-B270-6533A1E388B0}
 		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
+		{EE8BBDB2-9128-4C5C-9648-53371FE3C3BE} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
+		{37BE5ED1-05A9-491B-B8DA-F751882E20B0} = {57967491-B4BB-44B9-B270-6533A1E388B0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E3DCC906-DD65-4478-A617-AC943C719834}

azure-pipelines.yml

@@ -0,0 +1,40 @@
+# ASP.NET Core
+# Build and test ASP.NET Core projects targeting .NET Core.
+# Add steps that run tests, create a NuGet package, deploy, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
+
+trigger:
+  - master
+
+pool:
+  vmImage: "vs2017-win2016"
+steps:
+  - task: DotNetCoreCLI@2
+    displayName: "dotnet restore"
+    inputs:
+      command: restore
+      projects: |
+        src/**/*.csproj
+        tests/**/*.csproj
+
+  - task: DotNetCoreCLI@2
+    displayName: "dotnet build"
+    inputs:
+      projects: "src/**/*.csproj"
+
+  - task: DotNetCoreCLI@2
+    displayName: "dotnet test"
+    inputs:
+      command: test
+      projects: "tests/**/*.csproj"
+
+  - task: DotNetCoreCLI@2
+    displayName: "dotnet pack"
+    inputs:
+      command: pack
+      packagesToPack: "src/**/*.csproj"
+
+  - task: PublishBuildArtifacts@1
+    displayName: "Publish Artifact: packages"
+    inputs:
+      ArtifactName: packages

samples/library/DDDToolkit.Samples.Library.Application/BookService.cs

@@ -1,16 +1,44 @@
 using DDDToolkit.ApplicationLayer;
 using DDDToolkit.Samples.Library.Domain;
-using System;
 using System.Collections.Generic;
-using System.Text;
 using DDDToolkit.ApplicationLayer.Transactions;
+using FluentQueries;
+using System.Threading.Tasks;
+using DDDToolkit.ApplicationLayer.Repositories;
+using System;
 
 namespace DDDToolkit.Samples.Library.Application
 {
-    public class BookService : ApplicationService<Book, int>
+    public class BookService : ApplicationService
     {
+        private readonly IRepository<Book, int> _bookRepository;
+
         public BookService(IUnitOfWork unitOfWork) : base(unitOfWork)
         {
+            _bookRepository = unitOfWork.Repository<Book, int>();
+        }
+
+        public Task<IReadOnlyCollection<Book>> GetBooksByAuthor(string firstName, string lastName)
+        {
+            var authorHasName = new AuthorHasName(firstName, lastName);
+            var query = Query<Book>.Has(b => b.Author).Satisfying(authorHasName);
+            return _bookRepository.Query(query);
+        }
+
+        public Task<Book> GetById(int id)
+        {
+            return _bookRepository.GetById(id);
+        }
+
+        public Task<IReadOnlyCollection<Book>> GetAll()
+        {
+            return _bookRepository.Query();
+        }
+
+        public async Task Add(Book book)
+        {
+            await _bookRepository.Add(book);
+            await _unitOfWork.Save();
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/DDDToolkit.Samples.Library.Domain.csproj

@@ -5,7 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="FluentQueries" Version="1.1.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 
   <ItemGroup>

samples/library/DDDToolkit.Samples.Library.Domain/ISBN.cs

@@ -7,15 +7,14 @@ namespace DDDToolkit.Samples.Library.Domain
 {
     public class ISBN : ValueObject
     {
-        private string _value;
+        private readonly string _value;
         public string Value => _value;
 
         protected ISBN() { }
 
         [JsonConstructor]
         public ISBN(string value)
-        {
-
+        {            
             _value = value;
         }
 

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasFirstName.cs

@@ -1,11 +1,15 @@
-using DDDToolkit.Querying;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain
 {
     public class AuthorHasFirstName : Query<Author>
     {
-        public AuthorHasFirstName() : base(Has(a => a.FirstName).Satisfying(x => !string.IsNullOrWhiteSpace(x)))
+        public AuthorHasFirstName()
         {
+            Define(
+                Has(a => a.FirstName)
+                .Satisfying(x => !string.IsNullOrWhiteSpace(x))
+            );
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasLastName.cs

@@ -1,11 +1,15 @@
-using DDDToolkit.Querying;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain
 {
     internal class AuthorHasLastName : Query<Author>
     {
-        public AuthorHasLastName() : base(Has(a => a.LastName).Satisfying(x => !string.IsNullOrWhiteSpace(x)))
+        public AuthorHasLastName()
         {
+            Define(
+                Has(a => a.LastName)
+                .Satisfying(x => !string.IsNullOrWhiteSpace(x))
+            );
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasName.cs

@@ -1,16 +1,16 @@
-using DDDToolkit.Querying;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain
 {
     public class AuthorHasName : Query<Author>
     {
         public AuthorHasName(string firstName, string lastName)
-            : base(
-                  Has(a => a.FirstName)
+        {
+            Define(Has(a => a.FirstName)
                   .EqualTo(firstName)
-                  .And()
+                  .And
                   .Has(a => a.LastName)
-                  .EqualTo(lastName)
-                  ) { }
+                  .EqualTo(lastName));
+        }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/Validation/BookValidator.cs

@@ -1,7 +1,6 @@
 using DDDToolkit.Validation;
-using DDDToolkit.Querying;
 using DDDToolkit.Samples.Library.Domain.Validation;
-using System;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain
 {
@@ -16,7 +15,7 @@ public BookValidator()
                 .HasRule<AuthorHasFirstName>()
                 .HasRule<AuthorHasLastName>();
             Property(b => b.Title)
-                .HasRule(Query<string>.Is.Satisfying(s => !string.IsNullOrEmpty(s)), "Title is required");
+                .HasRule(Query<string>.Is.NotNullOrEmpty(), "Title is required");
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/Validation/IsbnIsNumeric.cs

@@ -1,17 +1,16 @@
-using DDDToolkit.Querying;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq.Expressions;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain.Validation
 {
     public class IsbnIsNumeric : Query<ISBN>
     {
-        public IsbnIsNumeric() :
-            base(Has(i => i.Value).Satisfying(i => Regex.IsMatch(i, @"^\d+$")))
+        public IsbnIsNumeric()
         {
+            Define(
+                Has(i => i.Value)
+                .Satisfying(i => Regex.IsMatch(i, @"^\d+$"))
+            );
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Domain/Validation/IsbnIsOfValidLength.cs

@@ -1,17 +1,15 @@
-using DDDToolkit.Querying;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Linq.Expressions;
+using FluentQueries;
 
 namespace DDDToolkit.Samples.Library.Domain.Validation
 {
     public class IsbnIsOfValidLength : Query<ISBN>
     {
-        public IsbnIsOfValidLength()
-            : base(Has(i => i.Value.Length)
-                  .EqualToAnyOf(10, 13))                  
+        public IsbnIsOfValidLength()                  
         {
+            Define(
+                Has(i => i.Value.Length)
+                  .EqualToAnyOf(10, 13)
+            );
         }
     }
 }

samples/library/DDDToolkit.Samples.Library.Repository.Sql/DDDToolkit.Samples.Library.Repository.Sql.csproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.2" />
   </ItemGroup>
 
   <ItemGroup>

samples/library/DDDToolkit.Samples.Library.Repository.Sql/LibraryContext.cs

@@ -1,8 +1,5 @@
 using DDDToolkit.Samples.Library.Domain;
 using Microsoft.EntityFrameworkCore;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace DDDToolkit.Samples.Library.Repository.Sql
 {

samples/library/DDDToolkit.Samples.Library.UI.Web/ClientApp/components/CreateBook.tsx

@@ -3,14 +3,6 @@ import { RouteComponentProps } from 'react-router';
 import 'isomorphic-fetch';
 import BookForm from './BookForm';
 
-declare module 'react' {
-    class Fragment extends React.Component { }
-}
-
-interface CreateBookProps {
-
-}
-
 interface CreateBookState {
     title: string,
     firstName: string,
@@ -19,16 +11,13 @@ interface CreateBookState {
     [key: string]: string
 }
 
-class CreateBook extends React.Component<RouteComponentProps<CreateBookProps>, CreateBookState> {
-    constructor() {
-        super();
-        this.state = {
-            title: '',
-            firstName: '',
-            lastName: '',
-            isbn: ''
-        }
-    }
+class CreateBook extends React.Component<RouteComponentProps<{}> | undefined, CreateBookState> {
+    state = {
+        title: '',
+        firstName: '',
+        lastName: '',
+        isbn: ''
+    };
 
     private handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
         e.preventDefault();

samples/library/DDDToolkit.Samples.Library.UI.Web/ClientApp/components/FetchData.tsx

@@ -7,11 +7,10 @@ interface FetchDataExampleState {
     loading: boolean;
 }
 
-export class FetchData extends React.Component<RouteComponentProps<{}>, FetchDataExampleState> {
-    constructor() {
-        super();
-        this.state = { books: [], loading: true };
+export class FetchData extends React.Component<RouteComponentProps<any> | undefined, FetchDataExampleState> {
+    state = { books: [], loading: true };
 
+    componentDidMount() {
         fetch('api/Book')
             .then(response => response.json() as Promise<Book[]>)
             .then(data => {