Updated ConnectionString extension method to address .net8 config bin…

…der changes
ccuono · Jan 11, 2024 · 20f5b3a · 20f5b3a
1 parent 308244b
commit 20f5b3a
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/Nemo/Configuration/ConnectionStringSettingsExtensions.cs b/src/Nemo/Configuration/ConnectionStringSettingsExtensions.cs
@@ -53,7 +53,7 @@ public static ConnectionStringSettings ConnectionString(this Microsoft.Extension
                 if (connectionStringCollection == null || connectionStringCollection.Count == 0 || connectionStringCollection.All(c => c.Name == null))
                 {
                     var connectionStrings = configuration.GetSection(section).Get<Dictionary<string, ConnectionStringSettings>>();
-                    if (connectionStrings == null || connectionStrings.Count == 0 || !connectionStrings.ContainsKey(name) || connectionStrings[name].Name == null)
+                    if (connectionStrings == null || connectionStrings.Count == 0)
                     {
                         var connectionStringMap = configuration.GetSection(section).Get<Dictionary<string, string>>();
                         if (connectionStringMap == null || connectionStringMap.Count == 0)
@@ -73,6 +73,22 @@ public static ConnectionStringSettings ConnectionString(this Microsoft.Extension
                     {
                         return null;
                     }
+                    else if (connectionStringSettings.Name == null)
+                    {
+                        var connectionStringMap = configuration.GetSection(section).Get<Dictionary<string, string>>();
+                        if (connectionStringMap == null || connectionStringMap.Count == 0)
+                        {
+                            return null;
+                        }
+                        else if (!connectionStringMap.TryGetValue(name, out var connectionString))
+                        {
+                            return null;
+                        }
+                        else
+                        {
+                            connectionStringSettings.ConnectionString = connectionString;
+                        }
+                    }
                 }
                 else if (!connectionStringCollection.TryGetValue(name, out connectionStringSettings))
                 {

diff --git a/src/Nemo/Nemo.csproj b/src/Nemo/Nemo.csproj
@@ -11,9 +11,9 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <AssemblyName>Nemo</AssemblyName>
     <AssemblyTitle>Nemo</AssemblyTitle>
-    <AssemblyVersion>2.8.4</AssemblyVersion>
-    <FileVersion>2.8.4</FileVersion>
-    <PackageVersion>2.8.4</PackageVersion>
+    <AssemblyVersion>2.8.5</AssemblyVersion>
+    <FileVersion>2.8.5</FileVersion>
+    <PackageVersion>2.8.5</PackageVersion>
     <RootNamespace>Nemo</RootNamespace>
 
     <PackageId>Nemo</PackageId>

diff --git a/tests/Nemo.Test.Core/Nemo.Test.Core.csproj b/tests/Nemo.Test.Core/Nemo.Test.Core.csproj
@@ -2,14 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>NemoTestCore</RootNamespace>
     <AssemblyName>NemoTestCore</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.0" />
     <PackageReference Include="System.ComponentModel" Version="4.3.0" />

diff --git a/tests/Nemo.Test.Core/appsettings.json b/tests/Nemo.Test.Core/appsettings.json
@@ -6,8 +6,11 @@
   //    "ProviderName": "System.Data.SqlClient"
   //  }
   //],
-  "ConnectionStrings": {
-    "Name": "DbConnection",
-    "ConnectionString": "Data Source=.;Initial Catalog=Northwind;Uid=sa;Pwd=Passw0rd;"
-  }
+  //"ConnectionStrings": {
+  //  "Name": "DbConnection",
+  //  "ConnectionString": "Data Source=.;Initial Catalog=Northwind;Uid=sa;Pwd=Passw0rd;"
+  //},
+  "ConnectionStrings:DbConnection": "Data Source=.;Initial Catalog=Northwind;Uid=sa;Pwd=Passw0rd;",
+  "ConnectionStrings:DbConnection1": "Data Source=.;Initial Catalog=Northwind;Uid=sa;Pwd=Passw0rd;",
+  "ConnectionStrings:DbConnection2": "Data Source=.;Initial Catalog=Northwind;Uid=sa;Pwd=Passw0rd;"
 }