Skip to content

Add net6.0 TFM for EntityFramework6 package. #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 23, 2023
Merged

Add net6.0 TFM for EntityFramework6 package. #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d1037d
Added netstandard2.1 TFM for EntityFramework6 package.
fiseni Jul 22, 2023
c1eb048
Updated TFM to net6.0
fiseni Jul 23, 2023
8c4bf0d
Updated docker file.
fiseni Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../src/Ardalis.Specification.EntityFramework6/Ardalis.Specification.EntityFramework6.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net6.0</TargetFrameworks>
<LangVersion>11.0</LangVersion>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand Down
8 changes: 8 additions & 0 deletions ...fication.EntityFramework6/src/Ardalis.Specification.EntityFramework6/RepositoryBaseOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,14 @@ public virtual async Task<bool> AnyAsync(CancellationToken cancellationToken = d
return await _dbContext.Set<T>().AnyAsync(cancellationToken);
}

#if NET6_0_OR_GREATER
/// <inheritdoc/>
public virtual IAsyncEnumerable<T> AsAsyncEnumerable(ISpecification<T> specification)
{
throw new NotImplementedException();
}
#endif

/// <summary>
/// Filters the entities of <typeparamref name="T"/>, to those that match the encapsulated query logic of the
/// <paramref name="specification"/>.
Expand Down
16 changes: 3 additions & 13 deletions ...ramework6.IntegrationTests/Ardalis.Specification.EntityFramework6.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFrameworks>net472;net7.0</TargetFrameworks>
<LangVersion>11.0</LangVersion>
<OutputType>Library</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Configuration" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.IdentityModel" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
Expand All @@ -22,17 +14,15 @@
<PackageReference Include="MartinCostello.SqlLocalDb" Version="3.2.0" />
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="ReportGenerator" Version="5.1.23" />
<PackageReference Include="altcover" Version="8.6.68" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.analyzers" Version="1.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

Expand Down
9 changes: 4 additions & 5 deletions .../Ardalis.Specification.EntityFramework6.IntegrationTests/Fixture/SharedDatabaseFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ namespace Ardalis.Specification.EntityFramework6.IntegrationTests.Fixture;

public class SharedDatabaseFixture : IDisposable
{
// (docker)
public const string _connectionStringDocker = "Data Source=databaseEF6;Initial Catalog=SpecificationEF6TestsDB;PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!";

// (localdb)
public const string _connectionStringLocalDb = "Server=(localdb)\\mssqllocaldb;Integrated Security=SSPI;Initial Catalog=SpecificationEF6TestsDB;ConnectRetryCount=0";
public const string _connectionStringDocker =
"Data Source=databaseEF;Initial Catalog=SpecificationEF6TestsDB;PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!;ConnectRetryCount=0;";

public const string _connectionStringLocalDb =
"Data Source=(localdb)\\mssqllocaldb;Integrated Security=SSPI;Initial Catalog=SpecificationEF6TestsDB;ConnectRetryCount=0;";

public SharedDatabaseFixture()
{
Expand Down
1 change: 0 additions & 1 deletion ...rkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="FluentAssertions" Version="6.11.0" />
<PackageReference Include="MartinCostello.SqlLocalDb" Version="3.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="xunit" Version="2.5.0" />
Expand Down
6 changes: 4 additions & 2 deletions ...dalis.Specification.EntityFrameworkCore.IntegrationTests/Fixture/SharedDatabaseFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ namespace Ardalis.Specification.EntityFrameworkCore.IntegrationTests.Fixture;

public class SharedDatabaseFixture : IDisposable
{
public const string _connectionStringDocker = "Data Source=databaseEFCore;Initial Catalog=SpecificationEFCoreTestsDB;PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!;TrustServerCertificate=Yes";
public const string _connectionStringLocalDb = "Server=(localdb)\\mssqllocaldb;Integrated Security=SSPI;Initial Catalog=SpecificationEFTestsDB;ConnectRetryCount=0";
public const string _connectionStringDocker =
"Data Source=databaseEF;Initial Catalog=SpecificationEFTestsDB;PersistSecurityInfo=True;User ID=sa;Password=P@ssW0rd!;ConnectRetryCount=0;TrustServerCertificate=Yes;";

public const string _connectionStringLocalDb =
"Data Source=(localdb)\\mssqllocaldb;Integrated Security=SSPI;Initial Catalog=SpecificationEFTestsDB;ConnectRetryCount=0;TrustServerCertificate=Yes;";

private static readonly object _lock = new();
private static bool _databaseInitialized;
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ services:
context: .
dockerfile: Dockerfile
environment:
WAIT_HOSTS: databaseEFCore:1433
WAIT_HOSTS: databaseEF:1433
volumes:
- ./TestResults:/var/temp
depends_on:
- databaseEFCore
- databaseEF

databaseEFCore:
databaseEF:
image: mcr.microsoft.com/mssql/server:2022-latest
environment:
SA_PASSWORD: "P@ssW0rd!"
Expand Down