From c74a6200fbcf8591422ad2b8dfcdb4235bee1d06 Mon Sep 17 00:00:00 2001
From: Gregorius Soedharmo <arkatufus@yahoo.com>
Date: Tue, 21 Jan 2025 00:39:27 +0700
Subject: [PATCH] Fix Microsoft.Bcl.AsyncInterfaces conflict on sample and test
 (#508)

---
 .../Akka.Persistence.Sql.Data.Compatibility.Tests.csproj      | 1 +
 .../Akka.Persistence.Sql.TagTableMigration.csproj             | 1 +
 src/Directory.Packages.props                                  | 4 +++-
 src/Examples/HoconConfiguration/HoconConfiguration.csproj     | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Akka.Persistence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj b/src/Akka.Persistence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj
index 56a2d8a7..69132687 100644
--- a/src/Akka.Persistence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj
+++ b/src/Akka.Persistence.Sql.Data.Compatibility.Tests/Akka.Persistence.Sql.Data.Compatibility.Tests.csproj
@@ -23,6 +23,7 @@
 
     <PackageReference Include="System.Data.SQLite" />
 
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     <PackageReference Include="Microsoft.Extensions.Hosting" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio">
diff --git a/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj b/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj
index f88c1764..326e9313 100644
--- a/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj
+++ b/src/Akka.Persistence.Sql.TagTableMigration/Akka.Persistence.Sql.TagTableMigration.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="System.CommandLine" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index fa2ab091..f0ced5a9 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -6,6 +6,7 @@
     <FluentMigratorVersion>5.2.0</FluentMigratorVersion>
     <SqliteVersion>1.0.118</SqliteVersion>
     <MicrosoftSqliteVersion>8.0.7</MicrosoftSqliteVersion>
+    <MicrosoftExtensionsVersion>[8.0.0, )</MicrosoftExtensionsVersion>
   </PropertyGroup>
   <!-- Akka dependencies -->
   <ItemGroup>
@@ -75,7 +76,8 @@
     <PackageVersion Include="xunit" Version="2.8.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftExtensionsVersion)" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftExtensionsVersion)" />
   </ItemGroup>
   <!-- SourceLink support for all Akka.NET projects -->
   <ItemGroup>
diff --git a/src/Examples/HoconConfiguration/HoconConfiguration.csproj b/src/Examples/HoconConfiguration/HoconConfiguration.csproj
index 0a2bfc07..dd4d6870 100644
--- a/src/Examples/HoconConfiguration/HoconConfiguration.csproj
+++ b/src/Examples/HoconConfiguration/HoconConfiguration.csproj
@@ -13,6 +13,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Data.Sqlite" />
+      <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
     </ItemGroup>
 
     <ItemGroup>