From 0eb25db926f94ee69e3ddf3a6b65c62ccb4ad4a6 Mon Sep 17 00:00:00 2001
From: Mads Larsen <hylkegaard@gmail.com>
Date: Thu, 23 Jan 2025 10:56:05 +0100
Subject: [PATCH] fix initail comments from Rasmus

---
 .../MsSql/EfMsSqlEventStoreTests.cs           |  4 ++--
 .../MsSql/EfMsSqlReadStoreIncludeTests.cs     |  5 ++---
 .../MsSql/EfMsSqlReadStoreTests.cs            |  4 ++--
 .../MsSql/EfMsSqlSnapshotTests.cs             |  4 ++--
 .../PostgreSql/EfPostgreSqlEventStoreTests.cs |  4 ++--
 .../PostgreSql/EfPostgreSqlReadStoreTests.cs  |  4 ++--
 .../PostgreSql/EfPostgreSqlSnapshotTests.cs   |  4 ++--
 .../EventFlow.EntityFramework.csproj          | 20 ++-----------------
 8 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlEventStoreTests.cs b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlEventStoreTests.cs
index 0adf6d749..b15081f17 100644
--- a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlEventStoreTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlEventStoreTests.cs
@@ -41,13 +41,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = MsSqlHelpz.CreateDatabase("eventflow");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, MsSqlDbContextProvider>()
                 .ConfigureForEventStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreIncludeTests.cs b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreIncludeTests.cs
index 5ea41efd0..a73f2d312 100644
--- a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreIncludeTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreIncludeTests.cs
@@ -23,7 +23,6 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using EventFlow.Configuration;
 using EventFlow.EntityFramework.Extensions;
 using EventFlow.EntityFramework.Tests.Model;
 using EventFlow.EntityFramework.Tests.MsSql.IncludeTests;
@@ -47,14 +46,14 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = MsSqlHelpz.CreateDatabase("eventflow");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, MsSqlDbContextProvider>()
                 .ConfigureForReadStoreIncludeTest()
                 .AddDefaults(typeof(EfMsSqlReadStoreIncludeTests).Assembly);
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreTests.cs b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreTests.cs
index cd6720e47..654c78431 100644
--- a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlReadStoreTests.cs
@@ -44,13 +44,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = MsSqlHelpz.CreateDatabase("eventflow");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, MsSqlDbContextProvider>()
                 .ConfigureForReadStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlSnapshotTests.cs b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlSnapshotTests.cs
index c2a3a6aa3..6f1337b19 100644
--- a/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlSnapshotTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/MsSql/EfMsSqlSnapshotTests.cs
@@ -42,13 +42,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = MsSqlHelpz.CreateDatabase("eventflow-snapshots");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, MsSqlDbContextProvider>()
                 .ConfigureForSnapshotStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlEventStoreTests.cs b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlEventStoreTests.cs
index ea3aed036..040dc860a 100644
--- a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlEventStoreTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlEventStoreTests.cs
@@ -41,13 +41,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = PostgreSqlHelpz.CreateDatabase("eventflow");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, PostgreSqlDbContextProvider>()
                 .ConfigureForEventStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlReadStoreTests.cs b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlReadStoreTests.cs
index 3eee93820..35c56b7a4 100644
--- a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlReadStoreTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlReadStoreTests.cs
@@ -44,13 +44,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = PostgreSqlHelpz.CreateDatabase("eventflow");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, PostgreSqlDbContextProvider>()
                 .ConfigureForReadStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlSnapshotTests.cs b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlSnapshotTests.cs
index 7c2491b41..0ca5073c2 100644
--- a/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlSnapshotTests.cs
+++ b/Source/EventFlow.EntityFramework.Tests/PostgreSql/EfPostgreSqlSnapshotTests.cs
@@ -41,13 +41,13 @@ protected override IServiceProvider Configure(IEventFlowOptions eventFlowOptions
         {
             _testDatabase = PostgreSqlHelpz.CreateDatabase("snapshots");
 
-            var resolver = eventFlowOptions
+            eventFlowOptions
                 .RegisterServices(sr => sr.AddTransient(c => _testDatabase.ConnectionString))
                 .ConfigureEntityFramework(EntityFrameworkConfiguration.New)
                 .AddDbContextProvider<TestDbContext, PostgreSqlDbContextProvider>()
                 .ConfigureForSnapshotStoreTest();
 
-            var serviceProvider = base.Configure(resolver);
+            var serviceProvider = base.Configure(eventFlowOptions);
 
             return serviceProvider;
         }
diff --git a/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj b/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj
index cd664c651..57355e2af 100644
--- a/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj
+++ b/Source/EventFlow.EntityFramework/EventFlow.EntityFramework.csproj
@@ -1,9 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <GenerateAssemblyInfo>True</GenerateAssemblyInfo>
-    <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
+    <TargetFramework>net8.0</TargetFramework>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <Title>EventFlow.EntityFramework</Title>
     <Authors>Frank Ebersoll</Authors>
@@ -17,29 +14,16 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageReleaseNotes>UPDATED BY BUILD</PackageReleaseNotes>
-    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+  <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore">
       <Version>8.0.11</Version>
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore">
-      <Version>9.0.0</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.EntityFrameworkCore">
-      <Version>7.0.20</Version>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>