diff --git a/src/Susanoo.Core/Pipeline/Command/CommandExpression.cs b/src/Susanoo.Core/Pipeline/Command/CommandExpression.cs index 31c1b32..3e6c251 100644 --- a/src/Susanoo.Core/Pipeline/Command/CommandExpression.cs +++ b/src/Susanoo.Core/Pipeline/Command/CommandExpression.cs @@ -505,27 +505,27 @@ public virtual IEnumerable BuildPropertyParameters(IDatabaseManager _parameterInclusions.Select(p => p.Key).ToArray(), _parameterExclusions.ToArray()); - foreach (var propInfo in implicitProperties.Keys) + foreach (var propInfo in implicitProperties) { - if (!_parameterExclusions.Contains(propInfo.Name)) + if (!_parameterExclusions.Contains(propInfo.Value.ActiveAlias)) { var param = databaseManager.CreateParameter(); - param.ParameterName = propInfo.Name; + param.ParameterName = propInfo.Value.ActiveAlias; param.Direction = ParameterDirection.Input; #if !NETFX40 - param.Value = propInfo.GetValue(filter); + param.Value = propInfo.Key.GetValue(filter); #else param.Value = propInfo.GetValue(filter, null); #endif - var type = CommandManager.GetDbType(propInfo.PropertyType); + var type = CommandManager.GetDbType(propInfo.Key.PropertyType); if (type.HasValue) param.DbType = type.Value; Action value; - if (_parameterInclusions.TryGetValue(propInfo.Name, out value)) + if (_parameterInclusions.TryGetValue(propInfo.Value.ActiveAlias, out value)) { if (value != null) { diff --git a/src/Susanoo.Json/Susanoo.Json.csproj b/src/Susanoo.Json/Susanoo.Json.csproj index 7f1a0c3..463261e 100644 --- a/src/Susanoo.Json/Susanoo.Json.csproj +++ b/src/Susanoo.Json/Susanoo.Json.csproj @@ -40,9 +40,9 @@ False ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll - + False - ..\packages\Susanoo.Core.0.6.3.16\lib\net45\Susanoo.Core.dll + ..\packages\Susanoo.Core.0.7.0.20\lib\net45\Susanoo.Core.dll diff --git a/src/Susanoo.Json/packages.config b/src/Susanoo.Json/packages.config index cd5a74a..1cd2e21 100644 --- a/src/Susanoo.Json/packages.config +++ b/src/Susanoo.Json/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/Susanoo.SqlServer.Tests/Susanoo.SqlServer.Tests.csproj b/src/Susanoo.SqlServer.Tests/Susanoo.SqlServer.Tests.csproj index 86d3cf2..9c3734b 100644 --- a/src/Susanoo.SqlServer.Tests/Susanoo.SqlServer.Tests.csproj +++ b/src/Susanoo.SqlServer.Tests/Susanoo.SqlServer.Tests.csproj @@ -52,9 +52,9 @@ ..\packages\NUnitTestAdapter.1.2\lib\NUnit.VisualStudio.TestAdapter.dll False - + False - ..\packages\Susanoo.Core.0.6.3.16\lib\net45\Susanoo.Core.dll + ..\packages\Susanoo.Core.0.7.0.20\lib\net45\Susanoo.Core.dll diff --git a/src/Susanoo.SqlServer.Tests/packages.config b/src/Susanoo.SqlServer.Tests/packages.config index 1ea6b96..de33289 100644 --- a/src/Susanoo.SqlServer.Tests/packages.config +++ b/src/Susanoo.SqlServer.Tests/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/src/Susanoo.SqlServer/Susanoo.SqlServer.csproj b/src/Susanoo.SqlServer/Susanoo.SqlServer.csproj index 52bee73..cc34468 100644 --- a/src/Susanoo.SqlServer/Susanoo.SqlServer.csproj +++ b/src/Susanoo.SqlServer/Susanoo.SqlServer.csproj @@ -37,9 +37,9 @@ Properties\Key.snk - + False - ..\packages\Susanoo.Core.0.6.3.16\lib\net45\Susanoo.Core.dll + ..\packages\Susanoo.Core.0.7.0.20\lib\net45\Susanoo.Core.dll diff --git a/src/Susanoo.SqlServer/packages.config b/src/Susanoo.SqlServer/packages.config index a79a0f8..dd4f51c 100644 --- a/src/Susanoo.SqlServer/packages.config +++ b/src/Susanoo.SqlServer/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file