From 68848bb1c0afa644ba19ab1508501124b1cf7930 Mon Sep 17 00:00:00 2001 From: MASES Public Developers Team <94312179+masesdevelopers@users.noreply.github.com> Date: Sat, 4 May 2024 01:49:01 +0200 Subject: [PATCH] Update to latest version of KNet and Microsoft.EntityFrameworkCore, updated version for publishing (#227) --- src/net/Common/Common.props | 2 +- .../KEFCore.SerDes.Avro.Compiler.csproj | 2 +- src/net/KEFCore.SerDes/KEFCore.SerDes.csproj | 8 ++++---- .../Infrastructure/Internal/KafkaOptionsExtension.cs | 2 ++ src/net/templates/templates/kefcoreApp/kefcoreApp.csproj | 2 +- .../kefcoreAppWithEvents/kefcoreAppWithEvents.csproj | 2 +- test/Common/Common.props | 6 +++--- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props index 9c28ed3e..eff38c0d 100644 --- a/src/net/Common/Common.props +++ b/src/net/Common/Common.props @@ -4,7 +4,7 @@ MASES s.r.l. MASES s.r.l. MASES s.r.l. - 2.1.0.0 + 2.1.1.0 net6.0;net7.0;net8.0 latest true diff --git a/src/net/KEFCore.SerDes.Avro.Compiler/KEFCore.SerDes.Avro.Compiler.csproj b/src/net/KEFCore.SerDes.Avro.Compiler/KEFCore.SerDes.Avro.Compiler.csproj index 3d4fb352..9c667100 100644 --- a/src/net/KEFCore.SerDes.Avro.Compiler/KEFCore.SerDes.Avro.Compiler.csproj +++ b/src/net/KEFCore.SerDes.Avro.Compiler/KEFCore.SerDes.Avro.Compiler.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj index 6b82d063..8b870867 100644 --- a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj +++ b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj @@ -41,10 +41,10 @@ - - - - + + + + All None diff --git a/src/net/KEFCore/Infrastructure/Internal/KafkaOptionsExtension.cs b/src/net/KEFCore/Infrastructure/Internal/KafkaOptionsExtension.cs index 5591bcbf..674dee46 100644 --- a/src/net/KEFCore/Infrastructure/Internal/KafkaOptionsExtension.cs +++ b/src/net/KEFCore/Infrastructure/Internal/KafkaOptionsExtension.cs @@ -27,6 +27,7 @@ using MASES.KNet.Consumer; using MASES.KNet.Producer; using MASES.KNet.Streams; +using Org.Apache.Kafka.Streams; using System.Globalization; namespace MASES.EntityFrameworkCore.KNet.Infrastructure.Internal; @@ -352,6 +353,7 @@ public virtual StreamsConfigBuilder StreamsOptions() builder.BootstrapServers = BootstrapServers; builder.DefaultKeySerdeClass = Class.ForName("org.apache.kafka.common.serialization.Serdes$ByteArraySerde", true, SystemClassLoader); builder.DefaultValueSerdeClass = Class.ForName("org.apache.kafka.common.serialization.Serdes$ByteArraySerde", true, SystemClassLoader); + builder.DefaultDSLStore = UsePersistentStorage ? Org.Apache.Kafka.Streams.StreamsConfig.ROCKS_DB : Org.Apache.Kafka.Streams.StreamsConfig.IN_MEMORY; //if (props.ContainsKey(Org.Apache.Kafka.Streams.StreamsConfig.APPLICATION_ID_CONFIG)) //{ diff --git a/src/net/templates/templates/kefcoreApp/kefcoreApp.csproj b/src/net/templates/templates/kefcoreApp/kefcoreApp.csproj index ccd1d406..3caa35a2 100644 --- a/src/net/templates/templates/kefcoreApp/kefcoreApp.csproj +++ b/src/net/templates/templates/kefcoreApp/kefcoreApp.csproj @@ -9,6 +9,6 @@ - + diff --git a/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj b/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj index ccd1d406..3caa35a2 100644 --- a/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj +++ b/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj @@ -9,6 +9,6 @@ - + diff --git a/test/Common/Common.props b/test/Common/Common.props index dbaf26b6..3e0335ef 100644 --- a/test/Common/Common.props +++ b/test/Common/Common.props @@ -16,8 +16,8 @@ - - - + + + \ No newline at end of file