Skip to content

Commit c9234af

Browse files
koenbeukkoenbeuk
authored
Merge pull request #121 from koenbeuk/dotnet6
[WIP] EF Core 6 support
2 parents 6976111 + e65e0ec commit c9234af

File tree

38 files changed

+276
-88
lines changed

38 files changed

+276
-88
lines changed

‎.github/workflows/build.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ jobs:
3131
- name: Setup .NET Core
3232
uses: actions/setup-dotnet@v1
3333
with:
34-
dotnet-version: 5.0.x
34+
dotnet-version: 6.0.x
35+
include-prerelease: True
3536
- name: Install dependencies
3637
run: dotnet restore EntityFrameworkCore.Triggered.sln -p:Configuration=ReleaseV1
3738
- name: Build
@@ -60,7 +61,8 @@ jobs:
6061
- name: Setup .NET Core
6162
uses: actions/setup-dotnet@v1
6263
with:
63-
dotnet-version: 5.0.x
64+
dotnet-version: 6.0.x
65+
include-prerelease: True
6466
- name: Install dependencies
6567
run: dotnet restore EntityFrameworkCore.Triggered.sln -p:Configuration=Release
6668
- name: Build
@@ -89,7 +91,8 @@ jobs:
8991
- name: Setup .NET Core
9092
uses: actions/setup-dotnet@v1
9193
with:
92-
dotnet-version: 5.0.x
94+
dotnet-version: 6.0.x
95+
include-prerelease: True
9396
- name: Install dependencies
9497
run: dotnet restore EntityFrameworkCore.Triggered.Samples.slnf
9598
- name: Build

‎Directory.Build.props‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<LangVersion>9.0</LangVersion>
66
<Nullable>enable</Nullable>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
8-
<Configurations>Debug;DebugV1;Release;ReleaseV1</Configurations>
8+
<Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
99
</PropertyGroup>
1010

1111
<PropertyGroup>
@@ -18,13 +18,21 @@
1818
</PropertyGroup>
1919

2020
<PropertyGroup>
21+
<EFCoreTriggeredVersion>3</EFCoreTriggeredVersion>
22+
<EFCorePackageVersion>6.0.0-rc.1.21452.10</EFCorePackageVersion>
23+
<MicrosoftExtensionsVersion>6.0.0-rc.1.21451.13</MicrosoftExtensionsVersion>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugV2' Or '$(Configuration)' == 'ReleaseV2' ">
2127
<EFCoreTriggeredVersion>2</EFCoreTriggeredVersion>
2228
<EFCorePackageVersion>5.0.0</EFCorePackageVersion>
23-
</PropertyGroup>
24-
29+
<MicrosoftExtensionsVersion>5.0.0</MicrosoftExtensionsVersion>
30+
</PropertyGroup>
31+
2532
<PropertyGroup Condition=" '$(Configuration)' == 'DebugV1' Or '$(Configuration)' == 'ReleaseV1' ">
2633
<EFCoreTriggeredVersion>1</EFCoreTriggeredVersion>
2734
<EFCorePackageVersion>3.1.0</EFCorePackageVersion>
35+
<MicrosoftExtensionsVersion>3.1.0</MicrosoftExtensionsVersion>
2836
</PropertyGroup>
2937

3038
<Target Name="Debug">

‎EntityFrameworkCore.Triggered.sln‎

Lines changed: 73 additions & 3 deletions
Large diffs are not rendered by default.

‎benchmarks/EntityFrameworkCore.Triggered.Benchmarks/EntityFrameworkCore.Triggered.Benchmarks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<OutputType>Exe</OutputType>
55
</PropertyGroup>
66
<PropertyGroup>
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-rc.1.21452.10" />
1717
</ItemGroup>
1818
<ItemGroup>
1919
<ProjectReference Include="..\..\src\EntityFrameworkCore.Triggered\EntityFrameworkCore.Triggered.csproj" />

‎samples/v1/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<PropertyGroup>
3+
<Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
34
<EFCoreTriggeredPackageVersion Condition=" '$(EFCoreTriggeredPackageVersion )'=='' ">1.4.0</EFCoreTriggeredPackageVersion >
45
</PropertyGroup>
56
</Project>

‎samples/v2/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<Project>
22
<PropertyGroup>
3+
<Configurations>Debug;Release;DebugV1;ReleaseV1;DebugV2;ReleaseV2</Configurations>
34
<EFCorePackageVersion Condition=" '$(EFCorePackageVersion)'=='' ">5.0.0</EFCorePackageVersion>
45
<EFCoreTriggeredPackageVersion Condition=" '$(EFCoreTriggeredPackageVersion )'=='' ">2.3.2</EFCoreTriggeredPackageVersion>
56
</PropertyGroup>

‎src/Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<Import Project="..\Directory.Build.props" />
33

44
<PropertyGroup>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<DefineConstants>EFCORETRIGGERED3</DefineConstants>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition=" '$(EFCoreTriggeredVersion)' == '2' ">
510
<TargetFramework>netstandard2.1</TargetFramework>
611
<DefineConstants>EFCORETRIGGERED2</DefineConstants>
712
</PropertyGroup>

‎src/EntityFrameworkCore.Triggered.AspNetCore/Extensions/ServiceCollectionExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.DependencyInjection
77
{
88
public static class ServiceCollectionExtensions
99
{
10-
#if EFCORETRIGGERED2
10+
#if EFCORETRIGGERED2 || EFCORETRIGGERED3
1111
[Obsolete("AddAspNetCoreTriggeredDbContext is obsolete and can be replaced by a call to AddTriggeredDbContext instead. EntityFrameworkCore.Triggered.AspNetCore is no longer needed")]
1212
#endif
1313
public static IServiceCollection AddAspNetCoreTriggeredDbContext<TContext>(this IServiceCollection serviceCollection, Action<DbContextOptionsBuilder>? optionsAction = null, ServiceLifetime contextLifetime = ServiceLifetime.Scoped, ServiceLifetime optionsLifetime = ServiceLifetime.Scoped) where TContext : DbContext

‎src/EntityFrameworkCore.Triggered.Extensions/ServiceCollectionExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static void RegisterTriggerTypes(Type triggerImplementationType, IServiceCollect
3434

3535
foreach (var customTrigger in customTriggers)
3636
{
37-
services.TryAdd(new ServiceDescriptor(customTrigger, sp => sp.GetService(triggerImplementationType), ServiceLifetime.Transient)); ;
37+
services.TryAdd(new ServiceDescriptor(customTrigger, sp => sp.GetRequiredService(triggerImplementationType), ServiceLifetime.Transient)); ;
3838
}
3939
}
4040
}
@@ -96,7 +96,7 @@ public static IServiceCollection AddAssemblyTriggers(this IServiceCollection ser
9696
registered = true;
9797
}
9898

99-
services.TryAdd(new ServiceDescriptor(triggerType, sp => sp.GetService(assemblyType), ServiceLifetime.Transient));
99+
services.TryAdd(new ServiceDescriptor(triggerType, sp => sp.GetRequiredService(assemblyType), ServiceLifetime.Transient));
100100
}
101101
}
102102

‎src/EntityFrameworkCore.Triggered.Transactions/Internal/AfterCommitTriggerDescriptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public AfterCommitTriggerDescriptor(Type entityType)
1717
var triggerMethod = triggerType.GetMethod(nameof(IAfterCommitTrigger<object>.AfterCommit));
1818

1919
_triggerType = triggerType;
20-
_invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod);
20+
_invocationDelegate = TriggerTypeDescriptorHelpers.GetWeakDelegate(triggerType, entityType, triggerMethod!);
2121
}
2222

2323
public Type TriggerType => _triggerType;

0 commit comments

Comments
 (0)