Skip to content

Commit

Permalink
Merge branch 'release/v0.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
verdie-g committed Jan 19, 2018
2 parents 5931f6d + 5c89765 commit 8af43a8
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 30 deletions.
27 changes: 12 additions & 15 deletions StoredProcedureEFCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27004.2008
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoredProcedureEFCore", "StoredProcedureEFCore\StoredProcedureEFCore.csproj", "{4AD24010-ADC2-463A-B0F7-7BFD8B89CDB7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoredProcedureEFCore.Tests.SqlServer", "StoredProcedureEFCore.Tests.SqlServer\StoredProcedureEFCore.Tests.SqlServer.csproj", "{B0106B50-2BA8-4DF1-87C9-18EF750495EF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoredProcedureEFCore.Tests", "StoredProcedureEFCore.Tests\StoredProcedureEFCore.Tests.csproj", "{5D2098BD-42DB-48D5-8AF9-90796F436538}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StoredProcedureEFCore.Tests.PgSql", "StoredProcedureEFCore.Tests.PgSql\StoredProcedureEFCore.Tests.PgSql.csproj", "{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StoredProcedureEFCore.Tests.PgSql", "StoredProcedureEFCore.Tests.PgSql\StoredProcedureEFCore.Tests.PgSql.csproj", "{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}"
EndProject
Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "StoredProcedureEFCore.Tests.SqlServer.Database", "StoredProcedureEFCore.Tests.SqlServer.Database\StoredProcedureEFCore.Tests.SqlServer.Database.sqlproj", "{3C66C52D-A576-4E88-8883-A98A241C3EB5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StoredProcedureEFCore", "StoredProcedureEFCore\StoredProcedureEFCore.csproj", "{654361F1-5E5A-4C9E-8A12-CF2F682D5CB7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{4AD24010-ADC2-463A-B0F7-7BFD8B89CDB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AD24010-ADC2-463A-B0F7-7BFD8B89CDB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AD24010-ADC2-463A-B0F7-7BFD8B89CDB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AD24010-ADC2-463A-B0F7-7BFD8B89CDB7}.Release|Any CPU.Build.0 = Release|Any CPU
{B0106B50-2BA8-4DF1-87C9-18EF750495EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B0106B50-2BA8-4DF1-87C9-18EF750495EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B0106B50-2BA8-4DF1-87C9-18EF750495EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -30,20 +27,20 @@ Global
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Release|Any CPU.Build.0 = Release|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Release|Any CPU.Build.0 = Release|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Release|Any CPU.Build.0 = Release|Any CPU
{3C66C52D-A576-4E88-8883-A98A241C3EB5}.Release|Any CPU.Deploy.0 = Release|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5D2098BD-42DB-48D5-8AF9-90796F436538}.Release|Any CPU.Build.0 = Release|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CD344F4-31A9-4A7F-AF62-0DC9A08C98F9}.Release|Any CPU.Build.0 = Release|Any CPU
{654361F1-5E5A-4C9E-8A12-CF2F682D5CB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{654361F1-5E5A-4C9E-8A12-CF2F682D5CB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{654361F1-5E5A-4C9E-8A12-CF2F682D5CB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{654361F1-5E5A-4C9E-8A12-CF2F682D5CB7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion StoredProcedureEFCore/DbTypeConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace StoredProcedureEFCore
{
public static class DbTypeConverter
internal static class DbTypeConverter
{
private static Dictionary<Type, DbType> _typeMap = new Dictionary<Type, DbType>
{
Expand Down
12 changes: 6 additions & 6 deletions StoredProcedureEFCore/StoredProcBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ public StoredProcBuilder(DbContext ctx, string name)

public IStoredProcBuilder AddParam<T>(string name, T val)
{
AddParamInner<T>(name, val, ParameterDirection.Input);
AddParamInner(name, val, ParameterDirection.Input);
return this;
}

public IStoredProcBuilder AddParam<T>(string name, out IOutParam<T> outParam)
{
outParam = AddOutputParamInner<T>(name, default(T), ParameterDirection.Output);
outParam = AddOutputParamInner(name, default(T), ParameterDirection.Output);
return this;
}

public IStoredProcBuilder AddParam<T>(string name, T val, out IOutParam<T> outParam)
{
outParam = AddOutputParamInner<T>(name, val, ParameterDirection.InputOutput);
outParam = AddOutputParamInner(name, val, ParameterDirection.InputOutput);
return this;
}

public IStoredProcBuilder ReturnValue<T>(out IOutParam<T> retParam)
{
retParam = AddOutputParamInner<T>("_retParam", default(T), ParameterDirection.ReturnValue);
retParam = AddOutputParamInner("_retParam", default(T), ParameterDirection.ReturnValue);
return this;
}

Expand Down Expand Up @@ -169,9 +169,9 @@ private void OpenConnection()
_cmd.Connection.Open();
}

private async Task OpenConnectionAsync()
private Task OpenConnectionAsync()
{
await _cmd.Connection.OpenAsync();
return _cmd.Connection.OpenAsync();
}
}
}
12 changes: 4 additions & 8 deletions StoredProcedureEFCore/StoredProcedureEFCore.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFramework>netstandard1.3</TargetFramework>
<Title>StoredProcedureEFCore</Title>
<Version>0.3.1</Version>
<Version>0.3.2</Version>
<Authors>Grégoire Verdier</Authors>
<Description>Entity Framework Core extension to execute a stored procedure and map the result</Description>
<RepositoryUrl>https://github.com/verdie-g/StoredProcedureEFCore</RepositoryUrl>
Expand All @@ -17,10 +16,7 @@
<IsPackable>true</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.0.1" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
</ItemGroup>

</Project>

0 comments on commit 8af43a8

Please sign in to comment.