Updated projects, drop support for old TFMs. (#326)

fiseni · web-flow · commit ff2d72f82f70 · 2023-05-26T12:25:24.000-04:00
* Updated projects, drop support for old TFMs.

* Minor fix.
diff --git 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>
+    <TargetFramework>net6.0</TargetFramework>
     <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
   {

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,13 @@ public async Task<bool> AnyAsync(CancellationToken cancellationToken = default)`
`129`	`129`	`return await dbContext.Set<TEntity>().AnyAsync(cancellationToken);`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ /// <inheritdoc/>`
	`133`	`+ public IAsyncEnumerable<TEntity> AsAsyncEnumerable(ISpecification<TEntity> specification)`
	`134`	`+ {`
	`135`	`+ using var dbContext = this.dbContextFactory.CreateDbContext();`
	`136`	`+ return ApplySpecification(specification, dbContext).AsAsyncEnumerable();`
	`137`	`+ }`
	`138`	`+`
`132`	`139`	`/// <inheritdoc/>`
`133`	`140`	`public async Task<TEntity> AddAsync(TEntity entity, CancellationToken cancellationToken = default)`
`134`	`141`	`{`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ public virtual async Task<bool> AnyAsync(CancellationToken cancellationToken = d`
`176`	`176`	`/// <inheritdoc/>`
`177`	`177`	`public virtual IAsyncEnumerable<T> AsAsyncEnumerable(ISpecification<T> specification)`
`178`	`178`	`{`
`179`		`- return ApplySpecification(specification, true).AsAsyncEnumerable();`
	`179`	`+ return ApplySpecification(specification).AsAsyncEnumerable();`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ public CachedRepository(IMemoryCache cache,`
`29`	`29`	`.SetAbsoluteExpiration(relative: TimeSpan.FromSeconds(10));`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ /// <inheritdoc/>`
	`33`	`+ public virtual IAsyncEnumerable<T> AsAsyncEnumerable(ISpecification<T> specification)`
	`34`	`+ {`
	`35`	`+ return _sourceRepository.AsAsyncEnumerable(specification);`
	`36`	`+ }`
	`37`	`+`
`32`	`38`	`/// <inheritdoc/>`
`33`	`39`	`public Task<bool> AnyAsync(Specification.ISpecification<T> specification, CancellationToken cancellationToken = default)`
`34`	`40`	`{`