diff --git a/Directory.Build.props b/Directory.Build.props
index f1d9f98..d53ede3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,9 @@
+
+ true
+
+
diff --git a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj b/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj
index 260303c..471878e 100644
--- a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj
+++ b/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj
@@ -5,9 +5,9 @@
Copyright 2019 © The Npgsql Development Team
Npgsql
npgsql postgresql postgres data database entity framework ef orm
- 3.2.0
+ 6.3.0
latest
- net45
+ net45;netstandard21
true
CS1591
true
@@ -29,7 +29,7 @@
-
+
@@ -40,6 +40,6 @@
-
+
diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj b/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj
index 12e4322..5c8d4cf 100644
--- a/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj
+++ b/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj
@@ -1,12 +1,13 @@
latest
- net45
+ net45;netcoreapp3.0
+
diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs b/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs
index 4e89635..180fb08 100644
--- a/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs
+++ b/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs
@@ -17,7 +17,7 @@ namespace EntityFramework6.Npgsql.Tests
{
public class EntityFrameworkBasicTests : EntityFrameworkTestBase
{
- [Test]
+ [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/860")]
public void InsertAndSelect()
{
var varbitVal = "10011";
@@ -457,7 +457,7 @@ public void DateFunctions()
//Hunting season is open Happy hunting on OrderBy,GroupBy,Min,Max,Skip,Take,ThenBy... and all posible combinations
- [Test]
+ [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
public void TestComplicatedQueries()
{
using (var context = new BloggingContext(ConnectionString))
@@ -517,7 +517,7 @@ public void TestComplicatedQueries()
}
}
- [Test]
+ [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
[MonoIgnore("Probably bug in mono. See https://github.com/npgsql/Npgsql/issues/289.")]
public void TestComplicatedQueriesMonoFails()
{
@@ -541,7 +541,7 @@ public void TestComplicatedQueriesMonoFails()
}
}
- [Test]
+ [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")]
public void TestComplicatedQueriesWithApply()
{
using (var conn = OpenConnection(ConnectionString))
diff --git a/test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs b/test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs
new file mode 100644
index 0000000..e503497
--- /dev/null
+++ b/test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs
@@ -0,0 +1,30 @@
+using System.Data.Entity;
+using NLog.Config;
+using NLog.Targets;
+using NUnit.Framework;
+using Npgsql.Logging;
+using EntityFramework6.Npgsql.Tests;
+using EntityFramework6.Npgsql.Tests.Support;
+
+// ReSharper disable CheckNamespace
+
+[SetUpFixture]
+public class AssemblySetup
+{
+ [OneTimeSetUp]
+ public void RegisterDbProvider()
+ {
+ var config = new LoggingConfiguration();
+ var consoleTarget = new ConsoleTarget();
+ consoleTarget.Layout = @"${message} ${exception:format=tostring}";
+ config.AddTarget("console", consoleTarget);
+ var rule = new LoggingRule("*", NLog.LogLevel.Info, consoleTarget);
+ config.LoggingRules.Add(rule);
+ NLog.LogManager.Configuration = config;
+
+ NpgsqlLogManager.Provider = new NLogLoggingProvider();
+ NpgsqlLogManager.IsParameterLoggingEnabled = true;
+
+ DbConfiguration.SetConfiguration(new TestDbConfiguration());
+ }
+}
diff --git a/test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs b/test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs
index 0ccad6d..cf23265 100644
--- a/test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs
+++ b/test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs
@@ -23,8 +23,6 @@ public abstract class TestBase
string _connectionString;
- static bool _loggingSetUp;
-
///
/// Unless the NPGSQL_TEST_DB environment variable is defined, this is used as the connection string for the
/// test database.
@@ -36,28 +34,9 @@ public abstract class TestBase
[OneTimeSetUp]
public virtual void TestFixtureSetup()
{
- SetupLogging();
_log.Debug("Connection string is: " + ConnectionString);
}
- protected virtual void SetupLogging()
- {
- var config = new LoggingConfiguration();
- var consoleTarget = new ConsoleTarget();
- consoleTarget.Layout = @"${message} ${exception:format=tostring}";
- config.AddTarget("console", consoleTarget);
- var rule = new LoggingRule("*", NLog.LogLevel.Debug, consoleTarget);
- config.LoggingRules.Add(rule);
- NLog.LogManager.Configuration = config;
-
- if (!_loggingSetUp)
- {
- NpgsqlLogManager.Provider = new NLogLoggingProvider();
- NpgsqlLogManager.IsParameterLoggingEnabled = true;
- _loggingSetUp = true;
- }
- }
-
#endregion
#region Utilities for use by tests
diff --git a/test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs b/test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs
new file mode 100644
index 0000000..2276bed
--- /dev/null
+++ b/test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Data.Entity;
+using Npgsql;
+
+namespace EntityFramework6.Npgsql.Tests.Support
+{
+ public class TestDbConfiguration : DbConfiguration
+ {
+ public TestDbConfiguration()
+ {
+ SetProviderFactory("Npgsql", NpgsqlFactory.Instance);
+ SetProviderServices("Npgsql", NpgsqlServices.Instance);
+ }
+ }
+}