Skip to content

Commit ce48f8f

Browse files
committed
Merge branch 'develop' into master
2 parents 6845da5 + 9172fa9 commit ce48f8f

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

pack.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dotnet restore src/SimpleStack.Orm.PostgreSQL
99
dotnet pack -c Release -o nuget src/SimpleStack.Orm.PostgreSQL
1010
dotnet restore src/SimpleStack.Orm.SQLite
1111
dotnet pack -c Release -o nuget src/SimpleStack.Orm.SQLite
12-
dotnet restore src/SimpleStack.Orm.SDSQlite
13-
dotnet pack -c Release -o nuget src/SimpleStack.Orm.SDSQlite
12+
dotnet restore src/SimpleStack.Orm.SDSQLite
13+
dotnet pack -c Release -o nuget src/SimpleStack.Orm.SDSQLite
1414
dotnet restore src/SimpleStack.Orm.SQLServer
1515
dotnet pack -c Release -o nuget src/SimpleStack.Orm.SQLServer

src/SimpleStack.Orm/OrmCommand.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22
using System.Data.Common;
33
using SimpleStack.Orm.Logging;
44

5-
//using SimpleStack.Orm.Logging;
6-
75
namespace SimpleStack.Orm
86
{
97
internal class OrmCommand : DbCommand
108
{
119
private ILogger<OrmCommand> _logger;
1210

13-
private readonly DbCommand _command;
11+
private DbCommand _command;
1412
private readonly ILoggerFactory _loggerFactory;
1513

1614
internal OrmCommand(DbCommand command, ILoggerFactory loggerFactory)
@@ -104,5 +102,15 @@ public override object ExecuteScalar()
104102
_logger.LogDebug("ExecuteScalar complete with result '{0}'", res);
105103
return res;
106104
}
105+
106+
protected override void Dispose(bool disposing)
107+
{
108+
if (disposing)
109+
{
110+
_command.Dispose();
111+
_command = null;
112+
}
113+
base.Dispose(disposing);
114+
}
107115
}
108116
}

src/SimpleStack.Orm/SimpleStack.Orm.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1313
<Version>1.2.0-beta95</Version>
1414
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
15-
<AssemblyVersion>1.2.0.0</AssemblyVersion>
16-
<FileVersion>1.2.0.0</FileVersion>
17-
<PackageVersion>1.2.0</PackageVersion>
15+
<AssemblyVersion>1.2.1.0</AssemblyVersion>
16+
<FileVersion>1.2.1.0</FileVersion>
17+
<PackageVersion>1.2.1</PackageVersion>
1818
<TargetFramework>netstandard2.0</TargetFramework>
1919
<PackageProjectUrl>https://simplestack.org/</PackageProjectUrl>
2020
<RepositoryUrl>https://github.com/SimpleStack/simplestack.orm</RepositoryUrl>

0 commit comments

Comments
 (0)