From 6b6bc7804455478b21a84a4090e9f3593626d2bb Mon Sep 17 00:00:00 2001
From: Fati Iseni <fati.iseni@pozitrongroup.com>
Date: Sun, 14 May 2023 21:26:11 +0200
Subject: [PATCH 1/2] Updated projects, drop support for old TFMs.

---
 ...is.Specification.EntityFrameworkCore.csproj | 18 +++---------------
 .../ContextFactoryRepositoryBaseOfT.cs         |  7 +++++++
 .../RepositoryBaseOfT.cs                       |  2 +-
 .../Ardalis.Specification.csproj               |  3 +--
 .../IReadRepositoryBase.cs                     |  2 +-
 .../Ardalis.SampleApp.Core.csproj              |  2 +-
 .../Data/CachedCustomerRepository.cs           |  6 ++++++
 7 files changed, 20 insertions(+), 20 deletions(-)

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 b310acc6..db11e20a 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <PackageId>Ardalis.Specification.EntityFrameworkCore</PackageId>
     <Title>Ardalis.Specification.EntityFrameworkCore</Title>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -34,20 +34,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-	    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
-	    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
-    </ItemGroup>
-	
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.13" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.13" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.18" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.6" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/ContextFactoryRepositoryBaseOfT.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/ContextFactoryRepositoryBaseOfT.cs
index 0c10ec74..961505a3 100644
--- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/ContextFactoryRepositoryBaseOfT.cs
+++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/ContextFactoryRepositoryBaseOfT.cs
@@ -129,6 +129,13 @@ public async Task<bool> AnyAsync(CancellationToken cancellationToken = default)
       return await dbContext.Set<TEntity>().AnyAsync(cancellationToken);
     }
 
+    /// <inheritdoc/>
+    public IAsyncEnumerable<TEntity> AsAsyncEnumerable(ISpecification<TEntity> specification)
+    {
+      using var dbContext = this.dbContextFactory.CreateDbContext();
+      return ApplySpecification(specification, dbContext).AsAsyncEnumerable();
+    }
+
     /// <inheritdoc/>
     public async Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default)
     {
diff --git a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs
index d9ce6b80..564b6dab 100644
--- a/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs
+++ b/Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs
@@ -176,7 +176,7 @@ public virtual async Task<bool> AnyAsync(CancellationToken cancellationToken = d
     /// <inheritdoc/>
     public virtual IAsyncEnumerable<T> AsAsyncEnumerable(ISpecification<T> specification)
     {
-      return ApplySpecification(specification, true).AsAsyncEnumerable();
+      return ApplySpecification(specification).AsAsyncEnumerable();
     }
 
     /// <summary>
diff --git a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj
index 281a5f76..cafbc5f1 100644
--- a/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj
+++ b/Specification/src/Ardalis.Specification/Ardalis.Specification.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
     <PackageId>Ardalis.Specification</PackageId>
     <Title>Ardalis.Specification</Title>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -33,7 +33,6 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
   
diff --git a/Specification/src/Ardalis.Specification/IReadRepositoryBase.cs b/Specification/src/Ardalis.Specification/IReadRepositoryBase.cs
index 14f639cd..12de01a1 100644
--- a/Specification/src/Ardalis.Specification/IReadRepositoryBase.cs
+++ b/Specification/src/Ardalis.Specification/IReadRepositoryBase.cs
@@ -168,7 +168,7 @@ public interface IReadRepositoryBase<T> where T : class
     Task<bool> AnyAsync(CancellationToken cancellationToken = default);
 
 
-#if !NETSTANDARD2_0
+#if NET6_0_OR_GREATER
     /// <summary>
     /// Finds all entities of <typeparamref name="T" />, that matches the encapsulated query logic of the
     /// <paramref name="specification"/>, from the database.
diff --git a/sample/Ardalis.SampleApp.Core/Ardalis.SampleApp.Core.csproj b/sample/Ardalis.SampleApp.Core/Ardalis.SampleApp.Core.csproj
index 15ea71d6..9edec766 100644
--- a/sample/Ardalis.SampleApp.Core/Ardalis.SampleApp.Core.csproj
+++ b/sample/Ardalis.SampleApp.Core/Ardalis.SampleApp.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sample/Ardalis.SampleApp.Infrastructure/Data/CachedCustomerRepository.cs b/sample/Ardalis.SampleApp.Infrastructure/Data/CachedCustomerRepository.cs
index 9b9012cd..3835d5a5 100644
--- a/sample/Ardalis.SampleApp.Infrastructure/Data/CachedCustomerRepository.cs
+++ b/sample/Ardalis.SampleApp.Infrastructure/Data/CachedCustomerRepository.cs
@@ -29,6 +29,12 @@ public CachedRepository(IMemoryCache cache,
         .SetAbsoluteExpiration(relative: TimeSpan.FromSeconds(10));
   }
 
+  /// <inheritdoc/>
+  public virtual IAsyncEnumerable<T> AsAsyncEnumerable(ISpecification<T> specification)
+  {
+    return _sourceRepository.AsAsyncEnumerable(specification);
+  }
+
   /// <inheritdoc/>
   public Task<bool> AnyAsync(Specification.ISpecification<T> specification, CancellationToken cancellationToken = default)
   {

From 11fcdde396a11d04cb3fef2174924c8c60ad4abf Mon Sep 17 00:00:00 2001
From: Fati Iseni <fati.iseni@pozitrongroup.com>
Date: Sun, 14 May 2023 22:22:44 +0200
Subject: [PATCH 2/2] Minor fix.

---
 .../Ardalis.Specification.EntityFrameworkCore.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 db11e20a..f7a3fa88 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <PackageId>Ardalis.Specification.EntityFrameworkCore</PackageId>
     <Title>Ardalis.Specification.EntityFrameworkCore</Title>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>