diff --git a/src/Nemo/Configuration/ConnectionStringSettingsExtensions.cs b/src/Nemo/Configuration/ConnectionStringSettingsExtensions.cs index c1d29e7..554c999 100644 --- 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>(); - 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>(); 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>(); + 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 index 454626d..018bdb1 100644 --- a/src/Nemo/Nemo.csproj +++ b/src/Nemo/Nemo.csproj @@ -11,9 +11,9 @@ en-US Nemo Nemo - 2.8.4 - 2.8.4 - 2.8.4 + 2.8.5 + 2.8.5 + 2.8.5 Nemo Nemo diff --git a/tests/Nemo.Test.Core/Nemo.Test.Core.csproj b/tests/Nemo.Test.Core/Nemo.Test.Core.csproj index 82c3b7f..6b6e60d 100644 --- a/tests/Nemo.Test.Core/Nemo.Test.Core.csproj +++ b/tests/Nemo.Test.Core/Nemo.Test.Core.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 NemoTestCore NemoTestCore @@ -10,6 +10,7 @@ + diff --git a/tests/Nemo.Test.Core/appsettings.json b/tests/Nemo.Test.Core/appsettings.json index 13ddd73..2dfcb5f 100644 --- 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;" } \ No newline at end of file