Skip to content

Commit 4d901de

Browse files
Merge pull request #563 from johelvisguzman/issue562
Fixed crash when executing a dataset or a datatable in the ado.net context
2 parents d2737bb + d1465f0 commit 4d901de

File tree

5 files changed

+5
-264
lines changed

5 files changed

+5
-264
lines changed

src/DotNetToolkit.Repository.AdoNet/DbHelper.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ internal DbHelper(IRepositoryConventions conventions, string nameOrConnectionStr
8787
"The connection string does not exist in your configuration file.");
8888

8989
_conventions = conventions;
90-
_factory = Internal.DbProviderFactories.GetFactory(css.ProviderName);
90+
_factory = DbProviderFactories.GetFactory(css.ProviderName);
9191
_connectionString = css.ConnectionString;
9292
_ownsConnection = true;
9393
}
@@ -105,7 +105,7 @@ internal DbHelper(IRepositoryConventions conventions, string providerName, strin
105105
Guard.NotEmpty(connectionString, nameof(connectionString));
106106

107107
_conventions = conventions;
108-
_factory = Internal.DbProviderFactories.GetFactory(providerName);
108+
_factory = DbProviderFactories.GetFactory(providerName);
109109
_connectionString = connectionString;
110110
_ownsConnection = true;
111111
}
@@ -121,6 +121,7 @@ internal DbHelper(IRepositoryConventions conventions, DbConnection existingConne
121121
Guard.NotNull(existingConnection, nameof(existingConnection));
122122

123123
_conventions = conventions;
124+
_factory = DbProviderFactories.GetFactory(existingConnection);
124125
_connection = existingConnection;
125126
_ownsConnection = false;
126127
}

src/DotNetToolkit.Repository.AdoNet/DotNetToolkit.Repository.AdoNet.csproj

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,21 @@
33
<Import Project="..\..\build\common.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>net451;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>net451</TargetFrameworks>
77
<AssemblyName>DotNetToolkit.Repository.AdoNet</AssemblyName>
88
<RootNamespace>DotNetToolkit.Repository.AdoNet</RootNamespace>
99
<Description>A repository context provider for ADO.NET (for testing purposes only).</Description>
1010
</PropertyGroup>
1111

12-
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
13-
<DefineConstants>NETCORE;NETSTANDARD;NETSTANDARD2_0</DefineConstants>
14-
</PropertyGroup>
15-
16-
<PropertyGroup Condition="'$(TargetFramework)' == 'net451'">
17-
<DefineConstants>NET45;NETFULL</DefineConstants>
18-
</PropertyGroup>
19-
2012
<ItemGroup>
2113
<ProjectReference Include="..\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
2214
</ItemGroup>
2315

24-
<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
16+
<ItemGroup>
2517
<Reference Include="System.Configuration" />
2618
<Reference Include="System.ComponentModel.DataAnnotations" />
2719
</ItemGroup>
2820

29-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
30-
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
32-
</ItemGroup>
33-
3421
<ItemGroup>
3522
<Compile Update="Properties\Resources.Designer.cs">
3623
<DesignTime>True</DesignTime>

src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProvider.cs

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProviderType.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/DotNetToolkit.Repository.AdoNet/Internal/DbProviderFactories.cs

Lines changed: 0 additions & 200 deletions
This file was deleted.

0 commit comments

Comments
 (0)