From 1f13c4fa4044b259de0ae126a820784e7a2f0d05 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 8 Dec 2021 18:49:44 -0500 Subject: [PATCH 01/16] Target .NET6 --- Dependencies.Build.props | 13 +++++++------ src/Directory.Build.props | 4 ++-- .../ForEvolve.EntityFrameworkCore.csproj | 3 ++- src/ForEvolve.Markdown/ForEvolve.Markdown.csproj | 6 +++--- test/Directory.Build.props | 2 +- .../ForEvolve.EntityFrameworkCore.Tests.csproj | 6 +++++- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/Dependencies.Build.props b/Dependencies.Build.props index a5fe990..d7a6a72 100644 --- a/Dependencies.Build.props +++ b/Dependencies.Build.props @@ -7,24 +7,25 @@ netstandard2.1 - net5.0 + net6.0 - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 - netcoreapp3.1;net5.0 - 5.0.0-preview.8.20407.4 + netcoreapp3.1;net5.0;net6.0 + 6.0 + 5.0 3.1 - netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 @@ -40,7 +41,7 @@ 2.4.1 4.14.1 16.6.1 - 5.0.0-preview.8.20414.8 + 6.0 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ef8abce..54bc393 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -31,7 +31,7 @@ true --> - - + + \ No newline at end of file diff --git a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj index 409a722..35b8662 100644 --- a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj +++ b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj @@ -8,11 +8,12 @@ + - + 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..443f25d 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -5,7 +5,7 @@ - + diff --git a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj index 4bca35d..ff36302 100644 --- a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj +++ b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj @@ -1,5 +1,5 @@  - + ForEvolve.EntityFrameworkCore $(ForEvolveTestTargetFramework) @@ -13,6 +13,10 @@ + + + + From 7746d815f424d676a50aeabd35e3c6719affc34f Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 8 Dec 2021 19:10:52 -0500 Subject: [PATCH 02/16] Update dependencies --- .gitignore | 5 +++++ Dependencies.Build.props | 4 ++-- src/ForEvolve.Azure/ForEvolve.Azure.csproj | 6 +++--- .../Storage/Table/DevelopmentTableStorageSettings.cs | 8 +++++++- .../Storage/Table/FilterableTableStorageReaderTest.cs | 2 +- .../Storage/Table/TableStorageReaderTest.cs | 4 ++-- .../Storage/Table/TableStorageRepositoryTest.cs | 2 +- 7 files changed, 21 insertions(+), 10 deletions(-) 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 d7a6a72..70d4bed 100644 --- a/Dependencies.Build.props +++ b/Dependencies.Build.props @@ -39,8 +39,8 @@ 1.0.6 2.4.1 - 4.14.1 - 16.6.1 + 4.16.1 + 17.0.0 6.0 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/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); } From 17ece5b0dbeed70c7346cce92eb6a52515e122c3 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 8 Dec 2021 19:24:59 -0500 Subject: [PATCH 03/16] Update Pipelines SDK to .NET 6 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index cb8bfd0..4506db2 100644 --- a/azure-pipelines.yml +++ b/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 From 30146180105fd30ec755cfdd5d223723692bec41 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 17:19:10 -0500 Subject: [PATCH 04/16] Drop support for netcoreapp3.1 --- Dependencies.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dependencies.Build.props b/Dependencies.Build.props index 70d4bed..66e3eab 100644 --- a/Dependencies.Build.props +++ b/Dependencies.Build.props @@ -12,12 +12,12 @@ - netcoreapp3.1;net5.0;net6.0 + net5.0;net6.0 - netcoreapp3.1;net5.0;net6.0 + net5.0;net6.0 6.0 5.0 3.1 @@ -25,7 +25,7 @@ - netcoreapp3.1;net5.0;net6.0 + net5.0;net6.0 From 29806d987b3a3811974e5f3da7a077ee1d23b587 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 17:36:20 -0500 Subject: [PATCH 05/16] Drop .NET Core 3.1 and cleanup version variables --- Dependencies.Build.props | 16 ---------------- .../ForEvolve.EntityFrameworkCore.csproj | 1 - test/Directory.Build.props | 13 ++++++------- .../ForEvolve.EntityFrameworkCore.Tests.csproj | 4 ---- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/Dependencies.Build.props b/Dependencies.Build.props index 66e3eab..7d3e5d3 100644 --- a/Dependencies.Build.props +++ b/Dependencies.Build.props @@ -1,11 +1,9 @@ - [2.0.0,3.0) 1.0.0 - netstandard2.1 net6.0 @@ -20,7 +18,6 @@ net5.0;net6.0 6.0 5.0 - 3.1 @@ -30,20 +27,7 @@ - 5.0.0 - 5.0.0 SYSTEM_TEXT_JSON - - - 1.0.6 - 2.4.1 - 4.16.1 - 17.0.0 - 6.0 - - - - \ No newline at end of file diff --git a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj index 35b8662..a5fef88 100644 --- a/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj +++ b/src/ForEvolve.EntityFrameworkCore/ForEvolve.EntityFrameworkCore.csproj @@ -10,7 +10,6 @@ - diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 443f25d..0367083 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -6,15 +6,14 @@ - - - - - - + + + + + - + \ No newline at end of file diff --git a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj index ff36302..aa0b21e 100644 --- a/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj +++ b/test/ForEvolve.EntityFrameworkCore.Tests/ForEvolve.EntityFrameworkCore.Tests.csproj @@ -5,10 +5,6 @@ $(ForEvolveTestTargetFramework) - - - - From ffd25a15fd4a3b2a92dd838f36b422dd6fbcdf2e Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 17:37:01 -0500 Subject: [PATCH 06/16] Bump version to 3.0 and add initial patch notes --- README.md | 25 +++++++++++++++---------- version.json | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) 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/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": { From ac5569990b1d4b7ba0b7a6854e3a193c4b8d92bb Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 17:44:43 -0500 Subject: [PATCH 07/16] Move the automation to GitHub --- .../master.yml | 24 ++++++------------- ...nes.yml => __disabled__azure-pipelines.yml | 0 2 files changed, 7 insertions(+), 17 deletions(-) rename .github/{workflows-disabled => workflows}/master.yml (72%) rename azure-pipelines.yml => __disabled__azure-pipelines.yml (100%) diff --git a/.github/workflows-disabled/master.yml b/.github/workflows/master.yml similarity index 72% rename from .github/workflows-disabled/master.yml rename to .github/workflows/master.yml index 06bad86..107ad4a 100644 --- a/.github/workflows-disabled/master.yml +++ b/.github/workflows/master.yml @@ -11,17 +11,19 @@ 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 @@ -32,23 +34,11 @@ jobs: 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 - - deploy: - runs-on: ubuntu-latest - needs: build-and-test - steps: - - uses: actions/checkout@v1 - - - name: Setup .NET Core ${{ env.DOTNET_VERSION }} - uses: actions/setup-dotnet@v1 - with: - dotnet-version: ${{ env.DOTNET_VERSION }} + run: dotnet test --configuration ${{ env.BUILD_CONFIGURATION }} --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" - - 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/azure-pipelines.yml b/__disabled__azure-pipelines.yml similarity index 100% rename from azure-pipelines.yml rename to __disabled__azure-pipelines.yml From 45cd3a27488ef1d8bea0d79a3033498c3202c59f Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:00:10 -0500 Subject: [PATCH 08/16] Update tests --- .github/workflows/master.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 107ad4a..de6882b 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -13,7 +13,6 @@ on: env: DOTNET_VERSION: '6.0.100' BUILD_CONFIGURATION: Release - PUBLIC_RELEASE: true FEEDZ_SOURCE: https://f.feedz.io/forevolve/toolbox/nuget/index.json jobs: @@ -33,8 +32,11 @@ jobs: - name: Build run: dotnet build --configuration ${{ env.BUILD_CONFIGURATION }} - - name: Unit Test - run: dotnet test --configuration ${{ env.BUILD_CONFIGURATION }} --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" + - name: Unit Tests + run: find ./test -name "*.Tests.csproj" -exec dotnet test '{}' --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; + + - name: Functional Tests + run: find ./test -name "*.FunctionalTests.csproj" -exec dotnet test '{}' --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; - uses: dotnet/nbgv@master with: From a9e65439fc15830aafd38aaa7c30d613c1b0f1aa Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:04:10 -0500 Subject: [PATCH 09/16] Build individual projects --- .github/workflows/master.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index de6882b..54df80c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -30,13 +30,13 @@ jobs: dotnet-version: ${{ env.DOTNET_VERSION }} - name: Build - run: dotnet build --configuration ${{ env.BUILD_CONFIGURATION }} + run: find . -name "*.csproj" -exec dotnet build '{}' --configuration ${{ env.BUILD_CONFIGURATION }} -v q \; - name: Unit Tests - run: find ./test -name "*.Tests.csproj" -exec dotnet test '{}' --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; + run: find ./test -name "*.Tests.csproj" -exec dotnet test '{}' --no-build --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; - name: Functional Tests - run: find ./test -name "*.FunctionalTests.csproj" -exec dotnet test '{}' --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; + run: find ./test -name "*.FunctionalTests.csproj" -exec dotnet test '{}' --no-build --filter "Dependency!=AzureStorageTable&Dependency!=SqlServer" -v q \; - uses: dotnet/nbgv@master with: From 4eb1c25a044521889eca4ded2ff1d633d18570b1 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:14:20 -0500 Subject: [PATCH 10/16] Try fixing a build loop/error --- src/ForEvolve.Pdf/ForEvolve.Pdf.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj b/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj index d454df2..4581ddd 100644 --- a/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj +++ b/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj @@ -1,9 +1,10 @@ - + $(ForEvolvePDFTargetFrameworks) Allows consumers to easily convert HTML strings to PDF using the `IHtmlToPdfConverter` interface. This package contains an implementation that use `PhantomJs`; you will also need the `ForEvolve.PhantomJs.Dependencies` package to load the PhantomJs binaries. forevolve,pdf,html to pdf,Phantom,PhantomJs,aspnetcore,asp.net,core,aspnet,asp + False From 9288345d4f3557020b9555f6857d1408a6a9781b Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:19:49 -0500 Subject: [PATCH 11/16] Add a --self-contained flag to the PostBuild task Hopefully, this fixes GitHub build loop. --- src/ForEvolve.Pdf/ForEvolve.Pdf.csproj | 3 +-- test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj b/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj index 4581ddd..d454df2 100644 --- a/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj +++ b/src/ForEvolve.Pdf/ForEvolve.Pdf.csproj @@ -1,10 +1,9 @@ - + $(ForEvolvePDFTargetFrameworks) Allows consumers to easily convert HTML strings to PDF using the `IHtmlToPdfConverter` interface. This package contains an implementation that use `PhantomJs`; you will also need the `ForEvolve.PhantomJs.Dependencies` package to load the PhantomJs binaries. forevolve,pdf,html to pdf,Phantom,PhantomJs,aspnetcore,asp.net,core,aspnet,asp - False diff --git a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj index e801685..8b4c6da 100644 --- a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj +++ b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj @@ -28,7 +28,7 @@ - + From c3dc06a7c377cb26939fe01acb037e00c4d50303 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:32:29 -0500 Subject: [PATCH 12/16] Fix linux build loop --- test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj index 8b4c6da..2d773e0 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 @@ - - + + + + + From 42c886a70e43ff83ce652960c7d5703364a36871 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:39:19 -0500 Subject: [PATCH 13/16] Fix the license warning --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 54bc393..561b53d 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 From b174601abb671f2d6d253301005c18221de13aed Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 18:39:36 -0500 Subject: [PATCH 14/16] Add back configuration --- test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj index 2d773e0..870c753 100644 --- a/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj +++ b/test/ForEvolve.Pdf.Tests/ForEvolve.Pdf.Tests.csproj @@ -31,7 +31,7 @@ - + From 1cfa7133d82905fd279d45f4e1929ee647998e66 Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 19:53:45 -0500 Subject: [PATCH 15/16] Ensure the build do not pack the tests --- .../Directory.Build.props | 4 ++++ .../Directory.Build.props | 4 ++++ .../Directory.Build.props | 3 +++ 3 files changed, 11 insertions(+) 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 From 3117e5f9a9eda6becd3395126953a18d4ef46e3b Mon Sep 17 00:00:00 2001 From: Carl-Hugo Marcotte Date: Wed, 4 Jan 2023 20:11:32 -0500 Subject: [PATCH 16/16] Fix license error --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 561b53d..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 - MIT + MIT True Carl-Hugo Marcotte