ForEvolve · Carl-Hugo · Dec 8, 2021 · Dec 9, 2021 · Dec 9, 2021 · Jan 4, 2023
diff --git a/.github/workflows-disabled/master.yml → .github/workflows/master.yml b/.github/workflows-disabled/master.yml → .github/workflows/master.yml
@@ -11,44 +11,36 @@ on:
             - master
 
 env:
-    DOTNET_VERSION: '5.0.100-preview.3.20216.6'
+    DOTNET_VERSION: '6.0.100'
     BUILD_CONFIGURATION: Release
-    PUBLIC_RELEASE: true
     FEEDZ_SOURCE: https://f.feedz.io/forevolve/toolbox/nuget/index.json
 
 jobs:
-    build-and-test:
+    build-test-and-deploy:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
+              with:
+                  fetch-depth: 0
 
             - name: Setup .NET Core ${{ env.DOTNET_VERSION }}
               uses: actions/setup-dotnet@v1
               with:
                   dotnet-version: ${{ env.DOTNET_VERSION }}
 
             - name: Build
-              run: dotnet build --configuration ${{ env.BUILD_CONFIGURATION }}
-
-            - name: Unit Test
-              run: dotnet test --configuration ${{ env.BUILD_CONFIGURATION }} --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" /p:CollectCoverage=true
+              run: find . -name "*.csproj" -exec dotnet build '{}' --configuration ${{ env.BUILD_CONFIGURATION }} -v q \;
 
-    deploy:
-        runs-on: ubuntu-latest
-        needs: build-and-test
-        steps:
-            - uses: actions/checkout@v1
+            - name: Unit Tests
+              run: find ./test -name "*.Tests.csproj" -exec dotnet test '{}' --no-build --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \;
 
-            - name: Setup .NET Core ${{ env.DOTNET_VERSION }}
-              uses: actions/setup-dotnet@v1
-              with:
-                  dotnet-version: ${{ env.DOTNET_VERSION }}
+            - name: Functional Tests
+              run: find ./test -name "*.FunctionalTests.csproj" -exec dotnet test '{}' --no-build --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \;
 
-            - uses: aarnott/nbgv@v0.3
+            - uses: dotnet/nbgv@master
               with:
                   setAllVars: true
-                  PublicRelease: ${{ env.PUBLIC_RELEASE }}
 
             - name: Pack
               run: dotnet pack --configuration ${{ env.BUILD_CONFIGURATION }}

diff --git a/.gitignore b/.gitignore
@@ -263,3 +263,8 @@ local-test-output/
 
 # VS Code
 .vscode/
+/__azurite_db_blob__.json
+/__azurite_db_blob_extent__.json
+/__azurite_db_queue__.json
+/__azurite_db_queue_extent__.json
+/__azurite_db_table__.json
diff --git a/Dependencies.Build.props b/Dependencies.Build.props
@@ -1,48 +1,33 @@
 <Project>
   <PropertyGroup>
     <!-- ForEvolve packages -->
-    <ForEvolvePackagesVersion Condition="'$(FOREVOLVE_PACKAGES_VERSION)'==''">[2.0.0,3.0)</ForEvolvePackagesVersion>
     <ForEvolvePhantomJsDependenciesPackagesVersion Condition="'$(FOREVOLVE_PHANTOMJS_DEPENDENCIES_PACKAGES_VERSION)'==''">1.0.0</ForEvolvePhantomJsDependenciesPackagesVersion>
 
     <!-- Versioning helpers -->
-    <!-- <ForEvolveTargetFrameworks Condition="'$(FOREVOLVE_TARGET_FRAMEWORKS)'==''">netstandard2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</ForEvolveTargetFrameworks> -->
     <ForEvolveTargetFrameworks Condition="'$(FOREVOLVE_TARGET_FRAMEWORKS)'==''">netstandard2.1</ForEvolveTargetFrameworks>
-    <ForEvolveTestTargetFramework Condition="'$(FOREVOLVE_TARGET_FRAMEWORKS)'==''">net5.0</ForEvolveTestTargetFramework>
+    <ForEvolveTestTargetFramework Condition="'$(FOREVOLVE_TARGET_FRAMEWORKS)'==''">net6.0</ForEvolveTestTargetFramework>
   </PropertyGroup>
 
   <!-- ForEvolve.AspNetCore -->
   <PropertyGroup>
-    <ForEvolveAspNetCoreTargetFrameworks Condition="'$(FOREVOLVE_ASPNETCORE_TARGET_FRAMEWORKS)'==''">netcoreapp3.1;net5.0</ForEvolveAspNetCoreTargetFrameworks>
+    <ForEvolveAspNetCoreTargetFrameworks Condition="'$(FOREVOLVE_ASPNETCORE_TARGET_FRAMEWORKS)'==''">net5.0;net6.0</ForEvolveAspNetCoreTargetFrameworks>
   </PropertyGroup>
 
   <!-- ForEvolve.EntityFrameworkCore -->
   <PropertyGroup>
-    <ForEvolveEFCoreTargetFrameworks Condition="'$(FOREVOLVE_EFCORE_TARGET_FRAMEWORKS)'==''">netcoreapp3.1;net5.0</ForEvolveEFCoreTargetFrameworks>
-    <ForEvolveEFCore5Version Condition="'$(FOREVOLVE_EFCORE5_VERSION)'==''">5.0.0-preview.8.20407.4</ForEvolveEFCore5Version>
-    <ForEvolveEFCore3Version Condition="'$(FOREVOLVE_EFCORE3_VERSION)'==''">3.1</ForEvolveEFCore3Version>
+    <ForEvolveEFCoreTargetFrameworks Condition="'$(FOREVOLVE_EFCORE_TARGET_FRAMEWORKS)'==''">net5.0;net6.0</ForEvolveEFCoreTargetFrameworks>
+    <ForEvolveEFCore6Version Condition="'$(FOREVOLVE_EFCORE6_VERSION)'==''">6.0</ForEvolveEFCore6Version>
+    <ForEvolveEFCore5Version Condition="'$(FOREVOLVE_EFCORE5_VERSION)'==''">5.0</ForEvolveEFCore5Version>
   </PropertyGroup>
 
   <!--ForEvolve.Pdf-->
   <PropertyGroup>
-    <ForEvolvePDFTargetFrameworks Condition="'$(FOREVOLVE_PDF_TARGET_FRAMEWORKS)'==''">netcoreapp3.1;net5.0</ForEvolvePDFTargetFrameworks>
+    <ForEvolvePDFTargetFrameworks Condition="'$(FOREVOLVE_PDF_TARGET_FRAMEWORKS)'==''">net5.0;net6.0</ForEvolvePDFTargetFrameworks>
   </PropertyGroup>
 
   <!-- Source packages -->
   <PropertyGroup>
-    <ForEvolveNetCoreVersion Condition="'$(FOREVOLVE_ASPNETCORE_VERSION)'==''">5.0.0</ForEvolveNetCoreVersion>
-    <ForEvolveIdentityVersion Condition="'$(FOREVOLVE_IDENTITY_VERSION)'==''">5.0.0</ForEvolveIdentityVersion>
     <DefineConstants>SYSTEM_TEXT_JSON</DefineConstants>
   </PropertyGroup>
 
-  <!-- Tests packages -->
-  <PropertyGroup>
-    <ForEvolveTestingVersion Condition="'$(FOREVOLVE_TESTING_VERSION)'==''">1.0.6</ForEvolveTestingVersion>
-    <ForEvolveXunitVersion Condition="'$(FOREVOLVE_XUNIT_VERSION)'==''">2.4.1</ForEvolveXunitVersion>
-    <ForEvolveMoqVersion Condition="'$(FOREVOLVE_MOQ_VERSION)'==''">4.14.1</ForEvolveMoqVersion>
-    <ForEvolveTestSdkVersion Condition="'$(FOREVOLVE_TEST_SDK_VERSION)'==''">16.6.1</ForEvolveTestSdkVersion>
-    <ForEvolveAspNetCoreTestHostVersion Condition="'$(FOREVOLVE_ASPNETCORE_TESTHOST_VERSION)'==''">5.0.0-preview.8.20414.8</ForEvolveAspNetCoreTestHostVersion>
-  </PropertyGroup>
-
-
-
 </Project>
diff --git a/README.md b/README.md
@@ -20,17 +20,17 @@ For the pre-release packages, use the ForEvolve/Toolbox [feedz.io](https://f.fee
 
 **List of packages**
 
-| Name                                                 | NuGet.org                                                                                                                                          | feedz.io                                                                                                                                                                                                                                                                                             |
-| ---------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `dotnet add package ForEvolve.AspNetCore`            | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.AspNetCore)](https://www.nuget.org/packages/ForEvolve.AspNetCore/)                       | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.AspNetCore%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.AspNetCore/latest/download)                                  |
-| `dotnet add package ForEvolve.Azure`                 | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Azure)](https://www.nuget.org/packages/ForEvolve.Azure/)                                 | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Azure%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Azure/latest/download)                                                 |
-| `dotnet add package ForEvolve.Contracts`             | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Contracts)](https://www.nuget.org/packages/ForEvolve.Contracts/)                         | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Contracts%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Contracts/latest/download)                                     |
-| `dotnet add package ForEvolve.Core`                  | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Core)](https://www.nuget.org/packages/ForEvolve.Core/)                                   | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Core%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Core/latest/download)                                                    |
-| `dotnet add package ForEvolve.EntityFrameworkCore`   | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.EntityFrameworkCore)](https://www.nuget.org/packages/ForEvolve.EntityFrameworkCore/)     | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.EntityFrameworkCore%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.EntityFrameworkCore/latest/download)       |
-| `dotnet add package ForEvolve.Markdown`              | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Markdown)](https://www.nuget.org/packages/ForEvolve.Markdown/)                           | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Markdown%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Markdown/latest/download)                                        |
+| Name                                                 | NuGet.org                                                                                                                                          | feedz.io                                                                                                                                                                                                                                                       |
+| ---------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `dotnet add package ForEvolve.AspNetCore`            | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.AspNetCore)](https://www.nuget.org/packages/ForEvolve.AspNetCore/)                       | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.AspNetCore%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.AspNetCore/latest/download)                       |
+| `dotnet add package ForEvolve.Azure`                 | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Azure)](https://www.nuget.org/packages/ForEvolve.Azure/)                                 | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Azure%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Azure/latest/download)                                 |
+| `dotnet add package ForEvolve.Contracts`             | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Contracts)](https://www.nuget.org/packages/ForEvolve.Contracts/)                         | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Contracts%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Contracts/latest/download)                         |
+| `dotnet add package ForEvolve.Core`                  | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Core)](https://www.nuget.org/packages/ForEvolve.Core/)                                   | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Core%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Core/latest/download)                                   |
+| `dotnet add package ForEvolve.EntityFrameworkCore`   | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.EntityFrameworkCore)](https://www.nuget.org/packages/ForEvolve.EntityFrameworkCore/)     | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.EntityFrameworkCore%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.EntityFrameworkCore/latest/download)     |
+| `dotnet add package ForEvolve.Markdown`              | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Markdown)](https://www.nuget.org/packages/ForEvolve.Markdown/)                           | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Markdown%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Markdown/latest/download)                           |
 | `dotnet add package ForEvolve.Markdown.Abstractions` | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Markdown.Abstractions)](https://www.nuget.org/packages/ForEvolve.Markdown.Abstractions/) | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Markdown.Abstractions%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Markdown.Abstractions/latest/download) |
-| `dotnet add package ForEvolve.Pdf`                   | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Pdf)](https://www.nuget.org/packages/ForEvolve.Pdf/)                                     | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Pdf%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Pdf/latest/download)                                                       |
-| `dotnet add package ForEvolve.Pdf.Abstractions`      | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Pdf.Abstractions)](https://www.nuget.org/packages/ForEvolve.Pdf.Abstractions/)           | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Pdf.Abstractions%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Pdf.Abstractions/latest/download)                |
+| `dotnet add package ForEvolve.Pdf`                   | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Pdf)](https://www.nuget.org/packages/ForEvolve.Pdf/)                                     | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Pdf%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Pdf/latest/download)                                     |
+| `dotnet add package ForEvolve.Pdf.Abstractions`      | [![NuGet.org](https://img.shields.io/nuget/vpre/ForEvolve.Pdf.Abstractions)](https://www.nuget.org/packages/ForEvolve.Pdf.Abstractions/)           | [![feedz.io](https://img.shields.io/badge/endpoint.svg?url=https%3A%2F%2Ff.feedz.io%2Fforevolve%2Ftoolbox%2Fshield%2FForEvolve.Pdf.Abstractions%2Flatest)](https://f.feedz.io/forevolve/toolbox/packages/ForEvolve.Pdf.Abstractions/latest/download)           |
 
 ## The projects
 
@@ -105,6 +105,11 @@ Also, please read the [Contributor Covenant Code of Conduct](https://github.com/
 
 # Release notes
 
+## Version 3.0
+
+-   Add support for .NET 6
+-   Drop support for .NET Core 3.1
+
 ## Version 2.1
 
 -   Add the `app.Seed<MyDbContext>();` extension method to help seed the database without writing boilerplate code.

diff --git a/azure-pipelines.yml → __disabled__azure-pipelines.yml b/azure-pipelines.yml → __disabled__azure-pipelines.yml
@@ -8,7 +8,7 @@ pool:
 
 variables:
     BuildConfiguration: Release
-    NetCoreSdkVersion: '5.0.100-preview.8.20417.9'
+    NetCoreSdkVersion: '6.0.100'
 
 steps:
     - task: UseDotNet@2

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -7,7 +7,7 @@
     <Authors>Carl-Hugo Marcotte</Authors>
     <Company>ForEvolve</Company>
     <PackageProjectUrl>https://github.com/ForEvolve/ForEvolve-Framework</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/ForEvolve/ForEvolve-Framework/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Copyright>Carl-Hugo Marcotte</Copyright>
 
@@ -31,7 +31,7 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> -->
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.2.31" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.4.244" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
   </ItemGroup>
 </Project>
diff --git a/src/ForEvolve.Azure/ForEvolve.Azure.csproj b/src/ForEvolve.Azure/ForEvolve.Azure.csproj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="3.1.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.12" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="2.3.2" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.7" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.IdentityModel.Clients.ActiveDirectory" Version="3.19.4" />
-    <PackageReference Include="WindowsAzure.Storage" Version="9.1.1" />
+    <PackageReference Include="WindowsAzure.Storage" Version="9.3.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ForEvolve.Core\ForEvolve.Core.csproj" />

diff --git a/src/ForEvolve.Azure/Storage/Table/DevelopmentTableStorageSettings.cs b/src/ForEvolve.Azure/Storage/Table/DevelopmentTableStorageSettings.cs
@@ -1,7 +1,13 @@
-namespace ForEvolve.Azure.Storage.Table
+using System;
+namespace ForEvolve.Azure.Storage.Table
 {
     public class DevelopmentTableStorageSettings : DevelopmentStorageSettings, ITableStorageSettings
     {
+        public DevelopmentTableStorageSettings() { }
+        public DevelopmentTableStorageSettings(string tableName)
+        {
+            TableName = tableName ?? throw new ArgumentNullException(nameof(tableName));
+        }
         public string TableName { get; set; }
     }
 }
diff --git a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj
@@ -8,11 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(ForEvolveEFCore6Version)" Condition="'$(TargetFramework)'=='net6.0'" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(ForEvolveEFCore5Version)" Condition="'$(TargetFramework)'=='net5.0'" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(ForEvolveEFCore3Version)" Condition="'$(TargetFramework)'=='netcoreapp3.1'" />
     <PackageReference Include="Scrutor" Version="3.2.1" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\ForEvolve.Core\ForEvolve.Core.csproj" />
   </ItemGroup>