From 117b2c865414bc646d47bb1565ee8681ac94d7fa Mon Sep 17 00:00:00 2001
From: MASES Public Developers Team
<94312179+masesdevelopers@users.noreply.github.com>
Date: Thu, 19 Oct 2023 20:20:43 +0200
Subject: [PATCH] Added .NET 6 distinguishing between different frameworks
(#114)
---
src/net/Common/Common.props | 2 +-
src/net/KEFCore.SerDes/KEFCore.SerDes.csproj | 3 ++-
...afkaQueryableMethodTranslatingExpressionVisitor.cs | 7 ++++++-
test/Common/Common.props | 11 +++++++++++
.../KEFCore.Benchmark.Avro.Test.csproj | 6 ------
test/KEFCore.Benchmark.Avro.Test/Program.cs | 1 -
.../KEFCore.Benchmark.Test.csproj | 5 -----
test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj | 5 -----
.../KEFCore.Extractor.Test.csproj | 6 ------
test/KEFCore.Test/KEFCore.Test.csproj | 9 ---------
10 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
index 49da5850..1a59d6e0 100644
--- a/src/net/Common/Common.props
+++ b/src/net/Common/Common.props
@@ -5,7 +5,7 @@
MASES s.r.l.
MASES s.r.l.
0.10.0.0
- net6.0
+ net6.0;net7.0
latest
true
true
diff --git a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj
index ce7bdc86..e9fd2a8a 100644
--- a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj
+++ b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj
@@ -41,11 +41,12 @@
+
+
All
None
-
all
runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/net/KEFCore/Query/Internal/KafkaQueryableMethodTranslatingExpressionVisitor.cs b/src/net/KEFCore/Query/Internal/KafkaQueryableMethodTranslatingExpressionVisitor.cs
index 611620a0..aa78f990 100644
--- 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
index 3eb53b36..096215e1 100644
--- a/test/Common/Common.props
+++ b/test/Common/Common.props
@@ -10,7 +10,18 @@
+
+
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
\ No newline at end of file
diff --git a/test/KEFCore.Benchmark.Avro.Test/KEFCore.Benchmark.Avro.Test.csproj b/test/KEFCore.Benchmark.Avro.Test/KEFCore.Benchmark.Avro.Test.csproj
index 195377ff..770ed589 100644
--- 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 @@
-
-
-
-
-
-
PreserveNewest
diff --git a/test/KEFCore.Benchmark.Avro.Test/Program.cs b/test/KEFCore.Benchmark.Avro.Test/Program.cs
index c7e5138e..6b513583 100644
--- 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
index 8f160196..90dea3ac 100644
--- a/test/KEFCore.Benchmark.Test/KEFCore.Benchmark.Test.csproj
+++ b/test/KEFCore.Benchmark.Test/KEFCore.Benchmark.Test.csproj
@@ -14,11 +14,6 @@
-
-
-
-
-
PreserveNewest
diff --git a/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj b/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj
index cf49456f..2ecf4495 100644
--- a/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj
+++ b/test/KEFCore.Complex.Test/KEFCore.Complex.Test.csproj
@@ -14,11 +14,6 @@
-
-
-
-
-
PreserveNewest
diff --git a/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj b/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj
index 13630b7a..7df147d5 100644
--- a/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj
+++ b/test/KEFCore.Extractor.Test/KEFCore.Extractor.Test.csproj
@@ -14,12 +14,6 @@
-
-
-
-
-
-
PreserveNewest
diff --git a/test/KEFCore.Test/KEFCore.Test.csproj b/test/KEFCore.Test/KEFCore.Test.csproj
index afb269a6..11b74b0f 100644
--- a/test/KEFCore.Test/KEFCore.Test.csproj
+++ b/test/KEFCore.Test/KEFCore.Test.csproj
@@ -14,15 +14,6 @@
-
-
-
-
-
-
-
-
-
PreserveNewest