Update to latest version of KNet and Microsoft.EntityFrameworkCore, u…

…pdated version for publishing (#227)
masesgroup · May 3, 2024 · 68848bb · 68848bb
1 parent 5e34882
commit 68848bb
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/src/net/Common/Common.props b/src/net/Common/Common.props
@@ -4,7 +4,7 @@
 		<Owners>MASES s.r.l.</Owners>
 		<Authors>MASES s.r.l.</Authors>
 		<Company>MASES s.r.l.</Company>
-		<Version>2.1.0.0</Version>
+		<Version>2.1.1.0</Version>
 		<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<GenerateAssemblyInfo>true</GenerateAssemblyInfo>

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
@@ -23,7 +23,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="MASES.KNet.Serialization.Avro" Version="2.6.0" />
+		<PackageReference Include="MASES.KNet.Serialization.Avro" Version="2.6.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj b/src/net/KEFCore.SerDes/KEFCore.SerDes.csproj
@@ -41,10 +41,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.27" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net6.0'" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.16" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net7.0'" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net8.0'" />		
-		<PackageReference Include="MASES.KNet" Version="2.6.0">
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.29" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net6.0'" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.18" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net7.0'" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" PrivateAssets="none" Condition="'$(TargetFramework)' == 'net8.0'" />		
+		<PackageReference Include="MASES.KNet" Version="2.6.1">
 			<IncludeAssets>All</IncludeAssets>
 			<PrivateAssets>None</PrivateAssets>
 		</PackageReference>

diff --git 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
@@ -9,6 +9,6 @@
 	</ItemGroup>
 	<ItemGroup Condition="!Exists('..\..\..\KEFCore\KEFCore.csproj')">
 		<!--Outside GitHub repo-->
-		<PackageReference Include="MASES.EntityFrameworkCore.KNet" Version="2.1.0" IncludeAssets="All" PrivateAssets="None" />
+		<PackageReference Include="MASES.EntityFrameworkCore.KNet" Version="2.1.1" IncludeAssets="All" PrivateAssets="None" />
 	</ItemGroup>
 </Project>
diff --git a/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj b/src/net/templates/templates/kefcoreAppWithEvents/kefcoreAppWithEvents.csproj
@@ -9,6 +9,6 @@
 	</ItemGroup>
 	<ItemGroup Condition="!Exists('..\..\..\KEFCore\KEFCore.csproj')">
 		<!--Outside GitHub repo-->
-		<PackageReference Include="MASES.EntityFrameworkCore.KNet" Version="2.1.0" IncludeAssets="All" PrivateAssets="None" />
+		<PackageReference Include="MASES.EntityFrameworkCore.KNet" Version="2.1.1" IncludeAssets="All" PrivateAssets="None" />
 	</ItemGroup>
 </Project>
diff --git a/test/Common/Common.props b/test/Common/Common.props
@@ -16,8 +16,8 @@
 		<ProjectReference Include="..\..\src\net\KEFCore\KEFCore.csproj" />
 		<ProjectReference Include="..\..\src\net\KEFCore.SerDes.Avro\KEFCore.SerDes.Avro.csproj" />
 		<ProjectReference Include="..\..\src\net\KEFCore.SerDes.Protobuf\KEFCore.SerDes.Protobuf.csproj" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.27" Condition="'$(TargetFramework)' == 'net6.0'"/>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.16" Condition="'$(TargetFramework)' == 'net7.0'"/>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.2" Condition="'$(TargetFramework)' == 'net8.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.29" Condition="'$(TargetFramework)' == 'net6.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.18" Condition="'$(TargetFramework)' == 'net7.0'"/>
+		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.4" Condition="'$(TargetFramework)' == 'net8.0'"/>
 	</ItemGroup>
 </Project>