Added .NET 6 distinguishing between different frameworks (#114)

masesgroup · Oct 19, 2023 · 117b2c8 · 117b2c8
1 parent 868303a
commit 117b2c8
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 35 deletions.
diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
@@ -5,7 +5,7 @@
 		<Authors>MASES s.r.l.</Authors>
 		<Company>MASES s.r.l.</Company>
 		<Version>0.10.0.0</Version>
-		<TargetFrameworks>net6.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj
@@ -41,11 +41,12 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.23" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net6.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net7.0'"/>
 		<PackageReference Include="MASES.KNet" Version="2.2.0">
 			<IncludeAssets>All</IncludeAssets>
 			<PrivateAssets>None</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" PrivateAssets="none" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/net/KEFCore/Query/Internal/KafkaQueryableMethodTranslatingExpressionVisitor.cs b/src/net/KEFCore/Query/Internal/KafkaQueryableMethodTranslatingExpressionVisitor.cs
@@ -89,7 +89,12 @@ protected override Expression VisitMethodCall(MethodCallExpression methodCallExp
 
         return base.VisitMethodCall(methodCallExpression);
     }
-
+#if NET6_0
+    protected override ShapedQueryExpression CreateShapedQueryExpression(Type elementType)
+    {
+        throw new NotImplementedException();
+    }
+#endif
     protected override ShapedQueryExpression CreateShapedQueryExpression(IEntityType entityType)
         => CreateShapedQueryExpressionStatic(entityType);
 

diff --git a/test/Common/Common.props b/test/Common/Common.props
@@ -10,7 +10,18 @@
 		<None Include="..\..\src\net\Common\JCOB128x128.png" Pack="true" PackagePath="" />
 		<None Include="..\..\src\net\Common\efcorekafka.snk" Link="efcorekafka.snk" />
 	</ItemGroup>
+
 	<ItemGroup>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.23" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net6.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.23" Condition="'$(TargetFramework)' == 'net6.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net7.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" Condition="'$(TargetFramework)' == 'net7.0'"/>
 		<ProjectReference Include="..\..\src\net\KEFCore\KEFCore.csproj" />
+		<ProjectReference Include="..\..\src\net\KEFCore.SerDes.Avro\KEFCore.SerDes.Avro.csproj" />
+
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 	</ItemGroup>
 </Project>
diff --git a/test/KEFCore.Benchmark.Avro.Test/KEFCore.Benchmark.Avro.Test.csproj b/test/KEFCore.Benchmark.Avro.Test/KEFCore.Benchmark.Avro.Test.csproj
@@ -14,12 +14,6 @@
 		<Compile Include="..\Common\ProgramConfig.cs" Link="ProgramConfig.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\..\src\net\KEFCore.SerDes.Avro\KEFCore.SerDes.Avro.csproj" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Update="Benchmark.Avro.Test.InMemory.json">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/test/KEFCore.Benchmark.Avro.Test/Program.cs b/test/KEFCore.Benchmark.Avro.Test/Program.cs
@@ -88,7 +88,6 @@ static void Main(string[] args)
                     ApplicationId = config.ApplicationId,
                     DbName = databaseName,
                     StreamsConfig = streamConfig,
-
                 })
                 {
                     if (config.UseAvro)

diff --git a/test/KEFCore.Benchmark.Test/KEFCore.Benchmark.Test.csproj b/test/KEFCore.Benchmark.Test/KEFCore.Benchmark.Test.csproj
@@ -14,11 +14,6 @@
 	  <Compile Include="..\Common\ProgramConfig.cs" Link="ProgramConfig.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <None Update="BenchmarkTest.InMemory.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj b/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj
@@ -14,11 +14,6 @@
 	  <Compile Include="..\Common\ProgramConfig.cs" Link="ProgramConfig.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <None Update="ComplexTest.KNetReplicator.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj b/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj
@@ -14,12 +14,6 @@
 		<Compile Include="..\Common\ProgramConfig.cs" Link="ProgramConfig.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\..\src\net\KEFCore.SerDes.Avro\KEFCore.SerDes.Avro.csproj" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<None Update="Extractor.Test.Blog.Avro.json">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/test/KEFCore.Test/KEFCore.Test.csproj b/test/KEFCore.Test/KEFCore.Test.csproj
@@ -14,15 +14,6 @@
 	  <Compile Include="..\Common\ProgramConfig.cs" Link="ProgramConfig.cs" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.12" />
-	  <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.12" />
-	</ItemGroup>
-
-	<ItemGroup>
-	  <ProjectReference Include="..\..\src\net\KEFCore.SerDes.Avro\KEFCore.SerDes.Avro.csproj" />
-	</ItemGroup>
-
 	<ItemGroup>
 	  <None Update="InMemoryTest.json">
 	    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>