Added support for EF 7

Author: PawelGerr

README.md

@@ -5,6 +5,7 @@
 [![Thinktecture.Runtime.Extensions.EntityFrameworkCore](https://img.shields.io/nuget/v/Thinktecture.Runtime.Extensions.EntityFrameworkCore.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.EntityFrameworkCore+(DEPRECATED+in+v5))](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.EntityFrameworkCore/)  
 [![Thinktecture.Runtime.Extensions.EntityFrameworkCore5](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.EntityFrameworkCore5.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.EntityFrameworkCore5)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.EntityFrameworkCore5/)  
 [![Thinktecture.Runtime.Extensions.EntityFrameworkCore6](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.EntityFrameworkCore6)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/)  
+[![Thinktecture.Runtime.Extensions.EntityFrameworkCore7](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.EntityFrameworkCore7.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.EntityFrameworkCore7)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.EntityFrameworkCore7/)  
 [![Thinktecture.Runtime.Extensions.Json](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.Json.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.Json)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.Newtonsoft.Json/)  
 [![Thinktecture.Runtime.Extensions.Newtonsoft.Json](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.Newtonsoft.Json.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.Newtonsoft.Json)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.Newtonsoft.Json/)  
 [![Thinktecture.Runtime.Extensions.MessagePack](https://img.shields.io/nuget/vpre/Thinktecture.Runtime.Extensions.MessagePack.svg?maxAge=60&label=Thinktecture.Runtime.Extensions.MessagePack)](https://www.nuget.org/packages/Thinktecture.Runtime.Extensions.MessagePack.Json/)  

Thinktecture.Runtime.Extensions.sln

@@ -76,6 +76,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extens
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore5.Tests", "test\Thinktecture.Runtime.Extensions.EntityFrameworkCore5.Tests\Thinktecture.Runtime.Extensions.EntityFrameworkCore5.Tests.csproj", "{70C5A190-2227-473B-B54B-89082A041240}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore7", "src\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.csproj", "{9A80C790-3BE2-4FA7-ACC1-574577E759EF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests", "test\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests.csproj", "{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,6 +178,14 @@ Global
 		{70C5A190-2227-473B-B54B-89082A041240}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{70C5A190-2227-473B-B54B-89082A041240}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{70C5A190-2227-473B-B54B-89082A041240}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A80C790-3BE2-4FA7-ACC1-574577E759EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A80C790-3BE2-4FA7-ACC1-574577E759EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A80C790-3BE2-4FA7-ACC1-574577E759EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9A80C790-3BE2-4FA7-ACC1-574577E759EF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -202,6 +214,8 @@ Global
 		{267EAD74-3F4D-41B8-BCF6-9D0F6F99A16F} = {E6F200ED-86D2-4D5C-9D5F-34592908B107}
 		{5FDAF5A0-C0F8-4AE4-B3B5-B922A53DF07F} = {8F117684-7943-4DCE-8861-F2B854924837}
 		{70C5A190-2227-473B-B54B-89082A041240} = {AE711F89-41F2-4519-B20D-BA1FAB0EB364}
+		{9A80C790-3BE2-4FA7-ACC1-574577E759EF} = {8F117684-7943-4DCE-8861-F2B854924837}
+		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA} = {AE711F89-41F2-4519-B20D-BA1FAB0EB364}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1C34F508-A60B-4C0E-AFA0-0F4CFFB23603}

samples/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Samples/Thinktecture.Runtime.Extensions.EntityFrameworkCore.Samples.csproj

@@ -4,12 +4,12 @@
         <OutputType>EXE</OutputType>
     </PropertyGroup>
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore6\Thinktecture.Runtime.Extensions.EntityFrameworkCore6.csproj" />
+        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.csproj" />
         <ProjectReference Include="..\Thinktecture.Runtime.Extensions.Samples\Thinktecture.Runtime.Extensions.Samples.csproj" />
         <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.9" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     </ItemGroup>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore5/Thinktecture.Runtime.Extensions.EntityFrameworkCore5.csproj

@@ -14,8 +14,8 @@
          <Link>IsExternalInit.cs</Link>
       </Compile>
 
-      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore6\**\*.cs" />
-      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore6\obj\**\*.cs" />
+      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\**\*.cs" />
+      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\obj\**\*.cs" />
    </ItemGroup>
 
    <ItemGroup>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.csproj

@@ -13,10 +13,13 @@
       <Compile Include="..\..\shared\IsExternalInit.cs">
          <Link>IsExternalInit.cs</Link>
       </Compile>
+
+      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\**\*.cs" />
+      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\obj\**\*.cs" />
    </ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.9" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.13" />
    </ItemGroup>
 
 </Project>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.csproj.DotSettings

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+   <PropertyGroup>
+      <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
+      <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+      <PackageTags>common;EntityFrameworkCore</PackageTags>
+      <DefineConstants>$(DefineConstants);EFCORE7</DefineConstants>
+   </PropertyGroup>
+
+   <ItemGroup>
+      <ProjectReference Include="..\Thinktecture.Runtime.Extensions\Thinktecture.Runtime.Extensions.csproj" />
+
+      <Compile Include="..\..\shared\IsExternalInit.cs">
+         <Link>IsExternalInit.cs</Link>
+      </Compile>
+   </ItemGroup>
+
+   <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.2" />
+   </ItemGroup>
+
+</Project>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/EntityFrameworkCore/Conventions/ValueObjectConventionPlugin.cs renamed to src/Thinktecture.Runtime.Extensions.EntityFrameworkCore7/EntityFrameworkCore/Conventions/ValueObjectConventionPlugin.cs

@@ -11,8 +11,8 @@
    </ItemGroup>
 
    <ItemGroup>
-      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore6.Tests\**\*.cs" />
-      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore6.Tests\obj\**\*.cs" />
+      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests\**\*.cs" />
+      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests\obj\**\*.cs" />
    </ItemGroup>
 
    <ItemGroup>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/EntityFrameworkCore/Conventions/ValueObjectConventionSetPlugin.cs renamed to src/Thinktecture.Runtime.Extensions.EntityFrameworkCore7/EntityFrameworkCore/Conventions/ValueObjectConventionSetPlugin.cs

@@ -12,7 +12,12 @@
    </ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.9" />
+      <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests\**\*.cs" />
+      <Compile Remove="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.Tests\obj\**\*.cs" />
+   </ItemGroup>
+
+   <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.13" />
    </ItemGroup>
 
 </Project>

src/Thinktecture.Runtime.Extensions.EntityFrameworkCore6/EntityFrameworkCore/Infrastructure/ValueObjectDbContextOptionsExtension.cs renamed to src/Thinktecture.Runtime.Extensions.EntityFrameworkCore7/EntityFrameworkCore/Infrastructure/ValueObjectDbContextOptionsExtension.cs

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+   <PropertyGroup>
+      <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+      <DefineConstants>$(DefineConstants);EFCORE7</DefineConstants>
+   </PropertyGroup>
+
+   <ItemGroup>
+      <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore7\Thinktecture.Runtime.Extensions.EntityFrameworkCore7.csproj" />
+      <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
+      <ProjectReference Include="..\Thinktecture.Runtime.Extensions.Tests.Shared\Thinktecture.Runtime.Extensions.Tests.Shared.csproj" />
+   </ItemGroup>
+
+   <ItemGroup>
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
+   </ItemGroup>
+
+</Project>