From a9c560fdca06fc6e3cd65a65851b0735be5ab419 Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Tue, 25 Jul 2023 21:09:53 +0200 Subject: [PATCH 1/4] Publish version 8.0 --- .../Ardalis.Specification.EntityFramework6.csproj | 14 ++------------ ...rdalis.Specification.EntityFrameworkCore.csproj | 13 +------------ .../Ardalis.Specification.csproj | 14 ++------------ 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj index 08fcc72b..c7972f1d 100644 --- a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj +++ b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj @@ -18,19 +18,9 @@ https://github.com/ardalis/specification spec;specification;repository;ddd;ef;ef6;entity framework icon.png - 7.0.0 + 8.0.0 - * Patch 2 by @davidhenley in https://github.com/ardalis/Specification/pull/283 - * Fix `Just the Docs` link in docs home page by @snowfrogdev in https://github.com/ardalis/Specification/pull/293 - * Update url path by @ta1H3n in https://github.com/ardalis/Specification/pull/303 - * Implement SelectMany support by @amdavie in https://github.com/ardalis/Specification/pull/320 - * Add two methods for consuming repositories in scenarios where repositories could be longer lived (e.g. Blazor component Injections) by @jasonsummers in https://github.com/ardalis/Specification/pull/289 - * Added support for AsAsyncEnumerable by @nkz-soft in https://github.com/ardalis/Specification/pull/316 - * Lamadelrae/doc faq ef versions by @Lamadelrae in https://github.com/ardalis/Specification/pull/324 - * Updated projects, drop support for old TFMs. by @fiseni in https://github.com/ardalis/Specification/pull/326 - * Update the search feature to generate parameterized query. by @fiseni in https://github.com/ardalis/Specification/pull/327 - * Add support for extending default evaluator list by @fiseni in https://github.com/ardalis/Specification/pull/328 - * Ardalis/cleanup by @ardalis in https://github.com/ardalis/Specification/pull/332 + * Added NET6.0 TFM true true diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj index 3105a170..e01fe168 100644 --- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj +++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj @@ -18,19 +18,8 @@ https://github.com/ardalis/specification spec;specification;repository;ddd;ef;ef core;entity framework;entity framework core icon.png - 7.0.0 + 8.0.0 - * Patch 2 by @davidhenley in https://github.com/ardalis/Specification/pull/283 - * Fix `Just the Docs` link in docs home page by @snowfrogdev in https://github.com/ardalis/Specification/pull/293 - * Update url path by @ta1H3n in https://github.com/ardalis/Specification/pull/303 - * Implement SelectMany support by @amdavie in https://github.com/ardalis/Specification/pull/320 - * Add two methods for consuming repositories in scenarios where repositories could be longer lived (e.g. Blazor component Injections) by @jasonsummers in https://github.com/ardalis/Specification/pull/289 - * Added support for AsAsyncEnumerable by @nkz-soft in https://github.com/ardalis/Specification/pull/316 - * Lamadelrae/doc faq ef versions by @Lamadelrae in https://github.com/ardalis/Specification/pull/324 - * Updated projects, drop support for old TFMs. by @fiseni in https://github.com/ardalis/Specification/pull/326 - * Update the search feature to generate parameterized query. by @fiseni in https://github.com/ardalis/Specification/pull/327 - * Add support for extending default evaluator list by @fiseni in https://github.com/ardalis/Specification/pull/328 - * Ardalis/cleanup by @ardalis in https://github.com/ardalis/Specification/pull/332 true true diff --git a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj index aa7f3106..3fe7a147 100644 --- a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj +++ b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj @@ -17,19 +17,9 @@ https://github.com/ardalis/specification spec;specification;repository;ddd icon.png - 7.0.0 + 8.0.0 - * Patch 2 by @davidhenley in https://github.com/ardalis/Specification/pull/283 - * Fix `Just the Docs` link in docs home page by @snowfrogdev in https://github.com/ardalis/Specification/pull/293 - * Update url path by @ta1H3n in https://github.com/ardalis/Specification/pull/303 - * Implement SelectMany support by @amdavie in https://github.com/ardalis/Specification/pull/320 - * Add two methods for consuming repositories in scenarios where repositories could be longer lived (e.g. Blazor component Injections) by @jasonsummers in https://github.com/ardalis/Specification/pull/289 - * Added support for AsAsyncEnumerable by @nkz-soft in https://github.com/ardalis/Specification/pull/316 - * Lamadelrae/doc faq ef versions by @Lamadelrae in https://github.com/ardalis/Specification/pull/324 - * Updated projects, drop support for old TFMs. by @fiseni in https://github.com/ardalis/Specification/pull/326 - * Update the search feature to generate parameterized query. by @fiseni in https://github.com/ardalis/Specification/pull/327 - * Add support for extending default evaluator list by @fiseni in https://github.com/ardalis/Specification/pull/328 - * Ardalis/cleanup by @ardalis in https://github.com/ardalis/Specification/pull/332 + * Added AsTracking true true From 0d3575b33e6e9ad3ff36edaf0988ab96508e5bad Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Tue, 21 Nov 2023 20:02:38 +0100 Subject: [PATCH 2/4] Updated all TFMs to .NET 8 --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- .../Ardalis.Specification.EntityFramework6.csproj | 6 +++--- ...s.Specification.EntityFramework6.IntegrationTests.csproj | 6 +++--- .../Ardalis.Specification.EntityFrameworkCore.csproj | 5 +++-- ...pecification.EntityFrameworkCore.IntegrationTests.csproj | 6 +++--- .../src/Ardalis.Specification/Ardalis.Specification.csproj | 6 +++--- .../Ardalis.Specification.UnitTests.csproj | 4 ++-- sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj | 2 +- sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj | 2 +- sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj | 2 +- sample/Ardalis.Sample.Domain/Ardalis.Sample.Domain.csproj | 2 +- 12 files changed, 23 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a07e269..3d878e6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install SQL Local DB run: ./setup-sqllocaldb.ps1 shell: pwsh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fe60920..555105d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Setup dotnet uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install SQL Local DB run: ./setup-sqllocaldb.ps1 shell: pwsh diff --git a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj index c7972f1d..90e440ab 100644 --- a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj +++ b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj @@ -1,8 +1,8 @@  - net472;net6.0 - 11.0 + net472;net8.0 + 12.0 Library false @@ -20,7 +20,7 @@ icon.png 8.0.0 - * Added NET6.0 TFM + * Added TFM for net8.0 true true diff --git a/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj b/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj index 948291fd..1e0c0356 100644 --- a/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj +++ b/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj @@ -1,8 +1,8 @@  - net472;net7.0 - 11.0 + net472;net8.0 + 12.0 Library false @@ -35,7 +35,7 @@ - 1701;1702;1591;1573;1712;0612 + 1701;1702;1591;1573;1712;0612;0618 diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj index e01fe168..17cde659 100644 --- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj +++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj @@ -1,8 +1,8 @@  - net6.0 - 11.0 + net8.0 + 12.0 enable enable @@ -20,6 +20,7 @@ icon.png 8.0.0 + * Updated the TFM to net8.0 true true diff --git a/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj b/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj index 6af4f51b..f75c8769 100644 --- a/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj +++ b/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj @@ -1,8 +1,8 @@  - net7.0 - 11.0 + net8.0 + 12.0 disable enable false @@ -32,7 +32,7 @@ - 1701;1702;1591;1573;0612 + 1701;1702;1591;1573;0612;0618 diff --git a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj index 3fe7a147..ded6cd7b 100644 --- a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj +++ b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj @@ -1,8 +1,8 @@  - net6.0;netstandard2.0 - 11.0 + net8.0;netstandard2.0 + 12.0 enable Ardalis.Specification @@ -19,7 +19,7 @@ icon.png 8.0.0 - * Added AsTracking + * Updated the TFM to net8.0 true true diff --git a/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj b/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj index a75ca83a..62926ff7 100644 --- a/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj +++ b/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj @@ -1,8 +1,8 @@  - net7.0;net472 - 11.0 + net8.0;net472 + 12.0 enable false diff --git a/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj b/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj index 993af2c4..f742a125 100644 --- a/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj +++ b/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj b/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj index 993af2c4..f742a125 100644 --- a/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj +++ b/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj b/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj index 993af2c4..f742a125 100644 --- a/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj +++ b/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable diff --git a/sample/Ardalis.Sample.Domain/Ardalis.Sample.Domain.csproj b/sample/Ardalis.Sample.Domain/Ardalis.Sample.Domain.csproj index 8cacdb6f..85da07cf 100644 --- a/sample/Ardalis.Sample.Domain/Ardalis.Sample.Domain.csproj +++ b/sample/Ardalis.Sample.Domain/Ardalis.Sample.Domain.csproj @@ -1,7 +1,7 @@ - net7.0 + net8.0 enable enable From 826a2b323e1c683476bc9b059ed04720b7a0aa58 Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Tue, 21 Nov 2023 20:12:03 +0100 Subject: [PATCH 3/4] Updated all Nuget dependencies. --- ...tion.EntityFramework6.IntegrationTests.csproj | 14 +++++++------- ...alis.Specification.EntityFrameworkCore.csproj | 6 +++--- ...n.EntityFrameworkCore.IntegrationTests.csproj | 16 ++++++++-------- .../Ardalis.Specification.csproj | 2 +- .../Ardalis.Specification.UnitTests.csproj | 8 ++++---- .../Ardalis.Sample.App1.csproj | 4 ++-- .../Ardalis.Sample.App2.csproj | 4 ++-- .../Ardalis.Sample.App3.csproj | 4 ++-- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj b/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj index 1e0c0356..9720699c 100644 --- a/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj +++ b/Specification.EntityFramework6/tests/Ardalis.Specification.EntityFramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj @@ -8,16 +8,16 @@ - - - - + + + + - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj index 17cde659..0911b977 100644 --- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj +++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj b/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj index f75c8769..21564e83 100644 --- a/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj +++ b/Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj index ded6cd7b..0f7e774d 100644 --- a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj +++ b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj @@ -28,7 +28,7 @@ - + diff --git a/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj b/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj index 62926ff7..98f013c5 100644 --- a/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj +++ b/Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj @@ -8,10 +8,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj b/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj index f742a125..2a4c1e0e 100644 --- a/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj +++ b/sample/Ardalis.Sample.App1/Ardalis.Sample.App1.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj b/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj index f742a125..2a4c1e0e 100644 --- a/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj +++ b/sample/Ardalis.Sample.App2/Ardalis.Sample.App2.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj b/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj index f742a125..2a4c1e0e 100644 --- a/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj +++ b/sample/Ardalis.Sample.App3/Ardalis.Sample.App3.csproj @@ -9,8 +9,8 @@ - - + + From c64d5f5130401fbb5cefd69f11f9acfddf9f4f2f Mon Sep 17 00:00:00 2001 From: Fati Iseni Date: Tue, 21 Nov 2023 20:39:48 +0100 Subject: [PATCH 4/4] Updated TFMs. --- ...alis.Specification.EntityFramework6.csproj | 6 +++--- ...s.Specification.EntityFrameworkCore.csproj | 21 +++++++++++++++---- .../Ardalis.Specification.csproj | 4 ++-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj index 90e440ab..f7de0a2f 100644 --- a/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj +++ b/Specification.EntityFramework6/src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj @@ -1,8 +1,8 @@  - net472;net8.0 - 12.0 + net472;net6.0 + 11.0 Library false @@ -20,7 +20,7 @@ icon.png 8.0.0 - * Added TFM for net8.0 + * Added TFM for net6.0 true true diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj index 0911b977..48e5bc45 100644 --- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj +++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj @@ -1,7 +1,7 @@  - net8.0 + net6.0;net7.0;net8.0 12.0 enable enable @@ -20,7 +20,7 @@ icon.png 8.0.0 - * Updated the TFM to net8.0 + * Added TFMs net6.0, net7.0 and net8.0 true true @@ -30,8 +30,21 @@ - - + + + + + + + + + + + + + + + diff --git a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj index 0f7e774d..ee5f5d3c 100644 --- a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj +++ b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj @@ -1,7 +1,7 @@  - net8.0;netstandard2.0 + net6.0;net7.0;net8.0;netstandard2.0 12.0 enable @@ -19,7 +19,7 @@ icon.png 8.0.0 - * Updated the TFM to net8.0 + * Added TFMs net6.0, net7.0 and net8.0 true true