Skip to content

Commit 10999c1

Browse files
eben-rouxeben-roux
committed
- net core 2.1
1 parent 7831112 commit 10999c1

File tree

8 files changed

+19
-61
lines changed

8 files changed

+19
-61
lines changed

‎Shuttle.Core.Data.Tests/ConnectionConfigurationProviderFixture.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void Should_be_able_to_get_configuration()
1313

1414
Assert.That(() => provider.Get("not-defined"), Throws.TypeOf<InvalidOperationException>());
1515

16-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
16+
#if (!NETCOREAPP2_1)
1717
var configuration = provider.Get("Shuttle");
1818

1919
Assert.That(configuration.Name, Is.EqualTo("Shuttle"));

‎Shuttle.Core.Data.Tests/DatabaseContextFactoryFixture.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@ public void Should_be_able_to_create_a_database_context()
1616

1717
private IDatabaseContextFactory GetDefaultDatabaseContextFactory()
1818
{
19-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
20-
var connectionFactory = new DbConnectionFactory();
21-
#else
22-
var connectionFactory = new DbConnectionFactory(new DefaultDbProviderFactories());
23-
#endif
2419
return new DatabaseContextFactory(
2520
GetConnectionConfigurationProvider(),
26-
connectionFactory,
21+
new DbConnectionFactory(),
2722
new DbCommandFactory(),
2823
new ThreadStaticDatabaseContextCache());
2924
}

‎Shuttle.Core.Data.Tests/Fixture.cs‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System.Data;
2+
using System.Data.Common;
3+
using System.Data.SqlClient;
24
using Moq;
35
using NUnit.Framework;
46

@@ -11,13 +13,16 @@ public abstract class Fixture
1113
protected static string DefaultProviderName = "System.Data.SqlClient";
1214
protected static string DefaultConnectionString = "Data Source=.\\sqlexpress;Initial Catalog=Shuttle;Integrated Security=SSPI";
1315

16+
protected Fixture()
17+
{
18+
#if NETCOREAPP2_1
19+
DbProviderFactories.RegisterFactory("System.Data.SqlClient", SqlClientFactory.Instance);
20+
#endif
21+
}
22+
1423
protected DbConnectionFactory GetDbConnectionFactory()
1524
{
16-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
1725
return new DbConnectionFactory();
18-
#else
19-
return new DbConnectionFactory(new DefaultDbProviderFactories());
20-
#endif
2126
}
2227

2328
protected IDatabaseContext GetDatabaseContext()

‎Shuttle.Core.Data.Tests/Shuttle.Core.Data.Tests.csproj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
55
<ApplicationIcon />
66
<OutputType>Library</OutputType>
77
<StartupObject />
@@ -21,17 +21,16 @@
2121
<PackageReference Include="Moq" Version="4.10.0" />
2222
<PackageReference Include="NUnit" Version="3.11.0" />
2323
<PackageReference Include="NUnit3TestAdapter" Version="3.11.0" />
24-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
25-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
26-
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" />
24+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
25+
<PackageReference Include="System.Data.SqlClient" Version="4.5.1" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
2726
</ItemGroup>
2827

2928
<ItemGroup>
3029
<ProjectReference Include="..\Shuttle.Core.Data\Shuttle.Core.Data.csproj" />
3130
</ItemGroup>
3231

3332
<ItemGroup>
34-
<Compile Remove="ConnectionConfigurationProvider.cs" Condition="'$(TargetFramework)' != 'net46'" />
35-
<Compile Remove="DefaultDbProviderFactories.cs" Condition="'$(TargetFramework)' != 'netcoreapp2.0'" />
33+
<Compile Remove="ConnectionConfigurationProvider.cs" Condition="'$(TargetFramework)' != 'net461'" />
34+
<Compile Remove="DefaultDbProviderFactories.cs" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
3635
</ItemGroup>
3736
</Project>

‎Shuttle.Core.Data/.build/package.nuspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,23 @@
1919
<dependency id="Shuttle.Core.Configuration" version="{Shuttle.Core.Configuration-version}" />
2020
<dependency id="Shuttle.Core.Container" version="{Shuttle.Core.Container-version}" />
2121
<dependency id="Shuttle.Core.Logging" version="{Shuttle.Core.Logging-version}" />
22+
<dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
2223
</group>
2324

2425
<group targetFramework="netstandard2.0">
2526
<dependency id="System.Configuration.ConfigurationManager" version="{System.Configuration.ConfigurationManager-version}" />
2627
<dependency id="Shuttle.Core.Configuration" version="{Shuttle.Core.Configuration-version}" />
2728
<dependency id="Shuttle.Core.Container" version="{Shuttle.Core.Container-version}" />
2829
<dependency id="Shuttle.Core.Logging" version="{Shuttle.Core.Logging-version}" />
30+
<dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
2931
</group>
3032

3133
<group targetFramework="netcoreapp2.1">
3234
<dependency id="System.Configuration.ConfigurationManager" version="{System.Configuration.ConfigurationManager-version}" />
3335
<dependency id="Shuttle.Core.Configuration" version="{Shuttle.Core.Configuration-version}" />
3436
<dependency id="Shuttle.Core.Container" version="{Shuttle.Core.Container-version}" />
3537
<dependency id="Shuttle.Core.Logging" version="{Shuttle.Core.Logging-version}" />
38+
<dependency id="Shuttle.Core.Threading" version="{Shuttle.Core.Threading-version}" />
3639
</group>
3740
</dependencies>
3841
</metadata>

‎Shuttle.Core.Data/DatabaseContextFactory.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,9 @@ public IDatabaseContextFactory ConfigureWith(IDbConnection dbConnection)
112112
return this;
113113
}
114114

115-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
116115
public static IDatabaseContextFactory Default()
117116
{
118117
var dbConnectionFactory = new DbConnectionFactory();
119-
#else
120-
public static IDatabaseContextFactory Default(IDbProviderFactories dbProviderFactories)
121-
{
122-
var dbConnectionFactory = new DbConnectionFactory(dbProviderFactories);
123-
#endif
124118

125119
return new DatabaseContextFactory(new ConnectionConfigurationProvider(), dbConnectionFactory, new DbCommandFactory(), new ThreadStaticDatabaseContextCache());
126120
}

‎Shuttle.Core.Data/DbConnectionFactory.cs‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System.Data;
22
using System.Data.Common;
3-
using Shuttle.Core.Contract;
43
using Shuttle.Core.Logging;
54

65
namespace Shuttle.Core.Data
@@ -9,31 +8,14 @@ public class DbConnectionFactory : IDbConnectionFactory
98
{
109
private readonly ILog _log;
1110

12-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
1311
public DbConnectionFactory()
1412
{
1513
_log = Log.For(this);
1614
}
17-
#else
18-
private readonly IDbProviderFactories _providerFactories;
19-
20-
public DbConnectionFactory(IDbProviderFactories providerFactories)
21-
{
22-
Guard.AgainstNull(providerFactories, nameof(providerFactories));
23-
24-
_providerFactories = providerFactories;
25-
_log = Log.For(this);
26-
}
27-
#endif
2815

2916
public IDbConnection CreateConnection(string providerName, string connectionString)
3017
{
31-
#if (!NETCOREAPP2_0 && !NETSTANDARD2_0)
3218
var dbProviderFactory = DbProviderFactories.GetFactory(providerName);
33-
#else
34-
var dbProviderFactory = _providerFactories.GetFactory(providerName);
35-
#endif
36-
3719
var connection = dbProviderFactory.CreateConnection();
3820

3921
if (connection == null)

‎Shuttle.Core.Data/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,10 @@
11
using System.Reflection;
22
using System.Runtime.InteropServices;
33

4-
#if NET46
5-
[assembly: AssemblyTitle(".NET Framework 4.6")]
6-
#endif
7-
84
#if NET461
95
[assembly: AssemblyTitle(".NET Framework 4.6.1")]
106
#endif
117

12-
#if NET462
13-
[assembly: AssemblyTitle(".NET Framework 4.6.2")]
14-
#endif
15-
16-
#if NET47
17-
[assembly: AssemblyTitle(".NET Framework 4.7")]
18-
#endif
19-
20-
#if NET471
21-
[assembly: AssemblyTitle(".NET Framework 4.7.1")]
22-
#endif
23-
24-
#if NETCOREAPP2_0
25-
[assembly: AssemblyTitle(".NET Core 2.0")]
26-
#endif
27-
288
#if NETCOREAPP2_1
299
[assembly: AssemblyTitle(".NET Core 2.1")]
3010
#endif

0 commit comments

Comments
 (0)