From 88ff4fd914c120912eaf3c6cdf2cab596db14f50 Mon Sep 17 00:00:00 2001
From: AlexanderPro <illarionov.pro@gmail.com>
Date: Thu, 2 Feb 2023 17:55:27 +0300
Subject: [PATCH] Fix .NET 7.0

---
 .../Properties/AssemblyInfo.cs                      |  4 ++--
 .../EntityFrameworkCore.MemoryJoin.Ef6.csproj       |  8 ++++----
 ...FrameworkCore.MemoryJoin.IntegrationTests.csproj |  9 ++++++++-
 ...tyFrameworkCore.MemoryJoin.TestRunnerCore.csproj |  9 ++++++++-
 .../EntityFrameworkCore.MemoryJoin.csproj           | 13 +++++++++----
 src/EntityFrameworkCore.MemoryJoin/MemoryJoiner.cs  |  2 +-
 6 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/EntityFramework.MemoryJoin/Properties/AssemblyInfo.cs b/src/EntityFramework.MemoryJoin/Properties/AssemblyInfo.cs
index 6db30ff..2e6548c 100644
--- a/src/EntityFramework.MemoryJoin/Properties/AssemblyInfo.cs
+++ b/src/EntityFramework.MemoryJoin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.7.0")]
-[assembly: AssemblyFileVersion("0.7.7.0")]
+[assembly: AssemblyVersion("0.7.8.0")]
+[assembly: AssemblyFileVersion("0.7.8.0")]
diff --git a/src/EntityFrameworkCore.MemoryJoin.Ef6/EntityFrameworkCore.MemoryJoin.Ef6.csproj b/src/EntityFrameworkCore.MemoryJoin.Ef6/EntityFrameworkCore.MemoryJoin.Ef6.csproj
index 552ffcc..22ce862 100644
--- a/src/EntityFrameworkCore.MemoryJoin.Ef6/EntityFrameworkCore.MemoryJoin.Ef6.csproj
+++ b/src/EntityFrameworkCore.MemoryJoin.Ef6/EntityFrameworkCore.MemoryJoin.Ef6.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
     <Copyright>Copyright © Anton Shkuratov 2018</Copyright>
     <Company />
     <Authors>Anton Shkuratov</Authors>
     <PackageId>EntityFramework.MemoryJoin</PackageId>
-    <Version>0.7.7</Version>
-    <AssemblyVersion>0.7.7.0</AssemblyVersion>
-    <FileVersion>0.7.7.0</FileVersion>
+    <Version>0.7.8</Version>
+    <AssemblyVersion>0.7.8.0</AssemblyVersion>
+    <FileVersion>0.7.8.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <AssemblyName>EntityFrameworkCore.MemoryJoin</AssemblyName>
+    <TargetFrameworks>net7.0;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/EntityFrameworkCore.MemoryJoin.IntegrationTests/EntityFrameworkCore.MemoryJoin.IntegrationTests.csproj b/src/EntityFrameworkCore.MemoryJoin.IntegrationTests/EntityFrameworkCore.MemoryJoin.IntegrationTests.csproj
index 7ee80a3..eed56b3 100644
--- a/src/EntityFrameworkCore.MemoryJoin.IntegrationTests/EntityFrameworkCore.MemoryJoin.IntegrationTests.csproj
+++ b/src/EntityFrameworkCore.MemoryJoin.IntegrationTests/EntityFrameworkCore.MemoryJoin.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,12 +11,19 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
diff --git a/src/EntityFrameworkCore.MemoryJoin.TestRunnerCore/EntityFrameworkCore.MemoryJoin.TestRunnerCore.csproj b/src/EntityFrameworkCore.MemoryJoin.TestRunnerCore/EntityFrameworkCore.MemoryJoin.TestRunnerCore.csproj
index f16be32..55b1b12 100644
--- a/src/EntityFrameworkCore.MemoryJoin.TestRunnerCore/EntityFrameworkCore.MemoryJoin.TestRunnerCore.csproj
+++ b/src/EntityFrameworkCore.MemoryJoin.TestRunnerCore/EntityFrameworkCore.MemoryJoin.TestRunnerCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -18,12 +18,19 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\EntityFrameworkCore.MemoryJoin\EntityFrameworkCore.MemoryJoin.csproj" />
   </ItemGroup>
diff --git a/src/EntityFrameworkCore.MemoryJoin/EntityFrameworkCore.MemoryJoin.csproj b/src/EntityFrameworkCore.MemoryJoin/EntityFrameworkCore.MemoryJoin.csproj
index 84417ef..c16ebb9 100644
--- a/src/EntityFrameworkCore.MemoryJoin/EntityFrameworkCore.MemoryJoin.csproj
+++ b/src/EntityFrameworkCore.MemoryJoin/EntityFrameworkCore.MemoryJoin.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;netstandard2.1</TargetFrameworks>
     <Copyright>Copyright © Anton Shkuratov 2018</Copyright>
     <Company />
     <Authors>Anton Shkuratov</Authors>
     <PackageId>EntityFramework.MemoryJoin</PackageId>
-    <Version>0.8.0</Version>
-    <AssemblyVersion>0.8.0.0</AssemblyVersion>
-    <FileVersion>0.8.0.0</FileVersion>
+    <Version>0.9.0</Version>
+    <AssemblyVersion>0.9.0.0</AssemblyVersion>
+    <FileVersion>0.9.0.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -32,9 +32,14 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.3" />
   </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/EntityFrameworkCore.MemoryJoin/MemoryJoiner.cs b/src/EntityFrameworkCore.MemoryJoin/MemoryJoiner.cs
index 19a60d0..1386706 100644
--- a/src/EntityFrameworkCore.MemoryJoin/MemoryJoiner.cs
+++ b/src/EntityFrameworkCore.MemoryJoin/MemoryJoiner.cs
@@ -162,7 +162,7 @@ public static IQueryable<T> FromLocalList<T>(this DbContext context, IList<T> da
                 var set = setMethod.MakeGenericMethod(queryClass)
                     .Invoke(context, new object[] { });
 
-                if (fromSqlMethod != null)
+                if (fromSqlMethod != null && rawSqlStringType != null)
                 {
                     // .Net Core < 5 case
                     var rawSqlString = Activator.CreateInstance(rawSqlStringType, new object[] { sb.ToString() });