diff --git a/.github/workflows-disabled/master.yml b/.github/workflows/master.yml similarity index 59% rename from .github/workflows-disabled/master.yml rename to .github/workflows/master.yml index 06bad86..54df80c 100644 --- a/.github/workflows-disabled/master.yml +++ b/.github/workflows/master.yml @@ -11,17 +11,18 @@ 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 @@ -29,26 +30,17 @@ jobs: 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 index 62e1b92..02df1b0 100644 --- 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 index a5fe990..7d3e5d3 100644 --- a/Dependencies.Build.props +++ b/Dependencies.Build.props @@ -1,48 +1,33 @@ - [2.0.0,3.0) 1.0.0 - netstandard2.1 - net5.0 + net6.0 - netcoreapp3.1;net5.0 + net5.0;net6.0 - netcoreapp3.1;net5.0 - 5.0.0-preview.8.20407.4 - 3.1 + net5.0;net6.0 + 6.0 + 5.0 - netcoreapp3.1;net5.0 + net5.0;net6.0 - 5.0.0 - 5.0.0 SYSTEM_TEXT_JSON - - - 1.0.6 - 2.4.1 - 4.14.1 - 16.6.1 - 5.0.0-preview.8.20414.8 - - - - \ No newline at end of file diff --git a/README.md b/README.md index c180ad8..332ae9a 100644 --- 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();` extension method to help seed the database without writing boilerplate code. diff --git a/azure-pipelines.yml b/__disabled__azure-pipelines.yml similarity index 96% rename from azure-pipelines.yml rename to __disabled__azure-pipelines.yml index cb8bfd0..4506db2 100644 --- a/azure-pipelines.yml +++ b/__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 index ef8abce..831a6fc 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -7,7 +7,7 @@ Carl-Hugo Marcotte ForEvolve https://github.com/ForEvolve/ForEvolve-Framework - https://github.com/ForEvolve/ForEvolve-Framework/blob/master/LICENSE + MIT True Carl-Hugo Marcotte @@ -31,7 +31,7 @@ true --> - - + + \ No newline at end of file diff --git a/src/ForEvolve.Azure/ForEvolve.Azure.csproj b/src/ForEvolve.Azure/ForEvolve.Azure.csproj index 33b7758..2fc4cf4 100644 --- a/src/ForEvolve.Azure/ForEvolve.Azure.csproj +++ b/src/ForEvolve.Azure/ForEvolve.Azure.csproj @@ -6,11 +6,11 @@ - + - + - + diff --git a/src/ForEvolve.Azure/Storage/Table/DevelopmentTableStorageSettings.cs b/src/ForEvolve.Azure/Storage/Table/DevelopmentTableStorageSettings.cs index 7408a78..0f5244b 100644 --- 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 index 409a722..a5fef88 100644 --- a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj +++ b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj @@ -8,11 +8,11 @@ + - - + diff --git a/src/ForEvolve.Markdown/ForEvolve.Markdown.csproj b/src/ForEvolve.Markdown/ForEvolve.Markdown.csproj index 9a0593e..30fce62 100644 --- a/src/ForEvolve.Markdown/ForEvolve.Markdown.csproj +++ b/src/ForEvolve.Markdown/ForEvolve.Markdown.csproj @@ -5,12 +5,12 @@ Allows consumers to easily convert strings to Markdown using the `IMarkdownConverter` interface. Contains a markdown wrapper around `lunet-io/markdig`. forevolve,markdown,markdig,aspnetcore,asp.net,core,aspnet,asp - + - + - + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 63fb6ee..0367083 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,16 +5,15 @@ - - - - - - - + + + + + + - + \ No newline at end of file diff --git a/test/ForEvolve.Azure.Tests/Storage/Table/FilterableTableStorageReaderTest.cs b/test/ForEvolve.Azure.Tests/Storage/Table/FilterableTableStorageReaderTest.cs index 065b0cc..86ab997 100644 --- a/test/ForEvolve.Azure.Tests/Storage/Table/FilterableTableStorageReaderTest.cs +++ b/test/ForEvolve.Azure.Tests/Storage/Table/FilterableTableStorageReaderTest.cs @@ -21,7 +21,7 @@ public class FilterableTableStorageReaderTest public FilterableTableStorageReaderTest() { - _settings = new CosmosDbLocalEmulatorSettings("FilterableTableStorageReaderTest"); + _settings = new DevelopmentTableStorageSettings("FilterableTableStorageReaderTest"); sut = new FilterableTableStorageReader(_settings); _myTestModelRepository = new TableStorageRepository(_settings); } diff --git a/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageReaderTest.cs b/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageReaderTest.cs index f4dac1d..4239e24 100644 --- a/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageReaderTest.cs +++ b/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageReaderTest.cs @@ -16,11 +16,11 @@ namespace ForEvolve.Azure.Storage.Table public class TableStorageReaderTest : BaseHttpTest { private ITableStorageReader SubjectUnderTest => Server.Host.Services.GetService(); - private readonly ITableStorageSettings tableStorageSettings2 = new CosmosDbLocalEmulatorSettings("TableStorageReaderTest2"); + private readonly ITableStorageSettings tableStorageSettings2 = new DevelopmentTableStorageSettings("TableStorageReaderTest2"); protected override void ConfigureServices(IServiceCollection services) { base.ConfigureServices(services); - services.AddSingleton(new CosmosDbLocalEmulatorSettings("TableStorageReaderTest")); + services.AddSingleton(new DevelopmentTableStorageSettings("TableStorageReaderTest")); services.AddForEvolveTableStorage(); } diff --git a/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageRepositoryTest.cs b/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageRepositoryTest.cs index fa0a3a2..5505801 100644 --- a/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageRepositoryTest.cs +++ b/test/ForEvolve.Azure.Tests/Storage/Table/TableStorageRepositoryTest.cs @@ -17,7 +17,7 @@ public class TableStorageRepositoryTest public TableStorageRepositoryTest(string tableName = DefaultTableName) { - Settings = new CosmosDbLocalEmulatorSettings(tableName); + Settings = new DevelopmentTableStorageSettings(tableName); RepositoryUnderTest = new TableStorageRepository(Settings); } diff --git a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj index 4bca35d..aa0b21e 100644 --- a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj +++ b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj @@ -1,18 +1,18 @@  - + ForEvolve.EntityFrameworkCore $(ForEvolveTestTargetFramework) - - - - + + + + diff --git a/test/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests/Directory.Build.props b/test/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests/Directory.Build.props index 547a116..6f437c9 100644 --- a/test/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests/Directory.Build.props +++ b/test/ForEvolve.Pdf.PhantomJs.AppConsole.FunctionalTests/Directory.Build.props @@ -1,6 +1,10 @@ + + false + + false diff --git a/test/ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests/Directory.Build.props b/test/ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests/Directory.Build.props index 547a116..6f437c9 100644 --- a/test/ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests/Directory.Build.props +++ b/test/ForEvolve.Pdf.PhantomJs.AppShared.FunctionalTests/Directory.Build.props @@ -1,6 +1,10 @@ + + false + + false diff --git a/test/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests/Directory.Build.props b/test/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests/Directory.Build.props index 547a116..d50c3c6 100644 --- a/test/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests/Directory.Build.props +++ b/test/ForEvolve.Pdf.PhantomJs.AppWeb.FunctionalTests/Directory.Build.props @@ -1,5 +1,8 @@ + + false + false diff --git a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj index e801685..870c753 100644 --- a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj +++ b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj @@ -5,7 +5,7 @@ ForEvolve.Pdf OnBuildSuccess - + @@ -27,8 +27,11 @@ - - + + + + + diff --git a/version.json b/version.json index d9578a1..000e733 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "2.3", + "version": "3.0", "publicReleaseRefSpec": ["^refs/heads/master$"], "cloudBuild": { "buildNumber": {