From 02b5793327b6275f7c9544efd30c5d17704ae5d9 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Mon, 20 May 2019 15:12:26 +0200 Subject: [PATCH 1/3] Target .NET Standard 2.1, update version * Version is now 3.3.0 * Take dependency on EntityFramework 6.3.0-preview5-19254-05 * All tests pass * Remove unneeded implicit assembly references for net45 Closes #119 --- Directory.Build.props | 4 +++ .../EntityFramework6.Npgsql.csproj | 8 ++--- .../EntityFramework6.Npgsql.Tests.csproj | 3 +- .../EntityFrameworkBasicTests.cs | 8 ++--- .../Support/AssemblySetup.cs | 30 +++++++++++++++++++ .../Support/TestBase.cs | 21 ------------- .../Support/TestDbConfiguration.cs | 15 ++++++++++ 7 files changed, 59 insertions(+), 30 deletions(-) create mode 100644 test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs create mode 100644 test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs 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); + } + } +} From 8180248c62fec3214727f4d9bc9d0a4b638edfbe Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 26 Sep 2019 15:50:45 +0200 Subject: [PATCH 2/3] Remove conceptual docs See https://github.com/npgsql/doc/issues/10 --- doc/index.md | 116 --------------------------------------------------- doc/toc.md | 1 - 2 files changed, 117 deletions(-) delete mode 100644 doc/index.md delete mode 100644 doc/toc.md diff --git a/doc/index.md b/doc/index.md deleted file mode 100644 index 1dd3137..0000000 --- a/doc/index.md +++ /dev/null @@ -1,116 +0,0 @@ ---- -layout: doc -title: Entity Framework 6 ---- - -Npgsql has an Entity Framework 6 provider. You can use it by installing the -[EntityFramework6.Npgsql](https://www.nuget.org/packages/EntityFramework6.Npgsql/) nuget. - -## Basic Configuration ## -To use Entity Framework with Npgsql, define a class that inherits from `DbConfiguration` in the same assembly as your class inheriting `DbContext`. Ensure that you configure provider services, a provider factory, a default connection factory as shown below: - -```csharp -using Npgsql; -using System.Data.Entity; - -class NpgSqlConfiguration : DbConfiguration -{ - public NpgSqlConfiguration() - { - var name = "Npgsql"; - - SetProviderFactory(providerInvariantName: name, - providerFactory: NpgsqlFactory.Instance); - - SetProviderServices(providerInvariantName: name, - provider: NpgsqlServices.Instance); - - SetDefaultConnectionFactory(connectionFactory: new NpgsqlConnectionFactory()); - } -} -``` - -## Guid Support ## - -Npgsql EF migrations support uses `uuid_generate_v4()` function to generate guids. -In order to have access to this function, you have to install the extension uuid-ossp through the following command: - -```sql -create extension "uuid-ossp"; -``` - -If you don't have this extension installed, when you run Npgsql migrations you will get the following error message: - -``` -ERROR: function uuid_generate_v4() does not exist -``` - -If the database is being created by Npgsql Migrations, you will need to -[run the `create extension` command in the `template1` database](http://stackoverflow.com/a/11584751). -This way, when the new database is created, the extension will be installed already. - -## Template Database ## - -When the Entity Framework 6 provider creates a database, it issues a simple `CREATE DATABASE` command. -In PostgreSQL, this implicitly uses `template1` as the template - anything existing in `template1` will -be copied to your new database. If you wish to change the database used as a template, you can specify -the `EF Template Database` connection string parameter. For more info see the -[PostgreSQL docs](https://www.postgresql.org/docs/current/static/sql-createdatabase.html). - -## Customizing DataReader Behavior ## - -You can use [an Entity Framework 6 IDbCommandInterceptor](https://msdn.microsoft.com/en-us/library/dn469464(v=vs.113).aspx) to wrap the `DataReader` instance returned by Npgsql when Entity Framework executes queries. This is possible using a ```DbConfiguration``` class. - -Example use cases: -- Forcing all returned ```DateTime``` and ```DateTimeOffset``` values to be in the UTC timezone. -- Preventing accidental insertion of DateTime values having ```DateTimeKind.Unspecified```. -- Forcing all postgres date/time types to be returned to Entity Framework as ```DateTimeOffset```. - -```c# -[DbConfigurationType(typeof(AppDbContextConfiguration))] -public class AppDbContext : DbContext -{ - // ... -} - -public class AppDbContextConfiguration : DbConfiguration -{ - public AppDbContextConfiguration() - { - this.AddInterceptor(new MyEntityFrameworkInterceptor()); - } -} - -class MyEntityFrameworkInterceptor : DbCommandInterceptor -{ - public override void ReaderExecuted( - DbCommand command, - DbCommandInterceptionContext interceptionContext) - { - if (interceptionContext.Result == null) return; - interceptionContext.Result = new WrappingDbDataReader(interceptionContext.Result); - } - - public override void ScalarExecuted( - DbCommand command, - DbCommandInterceptionContext interceptionContext) - { - interceptionContext.Result = ModifyReturnValues(interceptionContext.Result); - } - - static object ModifyReturnValues(object result) - { - // Transform and then - return result; - } -} - -class WrappingDbDataReader : DbDataReader, IDataReader -{ - // Wrap an existing DbDataReader, proxy all calls to the underlying instance, - // modify return values and/or parameters as needed... - public WrappingDbDataReader(DbDataReader reader) - { - } -} -``` diff --git a/doc/toc.md b/doc/toc.md deleted file mode 100644 index 0d45642..0000000 --- a/doc/toc.md +++ /dev/null @@ -1 +0,0 @@ -# [Getting Started](index.md) From d3023711263b6ba7b9df405985c3e06062ff7ed7 Mon Sep 17 00:00:00 2001 From: Shay Rojansky Date: Thu, 10 Oct 2019 04:26:59 +0200 Subject: [PATCH 3/3] Update to version 6.3.0 * Take dependency on EF6 6.3.0 GA * Take dependency on Npgsql 4.0.10. Also tested successfully with 4.1.1, but not taking dependency in order to preserve compatibility with .NET Framework 4.5. * Package snupkg * Nuget icon * Use transforms instead of Add-EFProvider (in install.ps1). See https://github.com/aspnet/EntityFramework6/pull/953 * Various build cleanups, project renames, etc. Closes #137 --- Directory.Build.props | 5 +++-- Directory.Build.targets | 12 +++++++++++ .../App.config | 2 +- EF6.PG.Tests/EF6.PG.Tests.csproj | 19 ++++++++++++++++++ .../EntityFrameworkBasicTests.cs | 8 ++++---- .../EntityFrameworkMigrationTests.cs | 0 .../FullTextSearchTests.cs | 0 .../NLogLoggingProvider.cs | 0 .../PatternMatchingTests.cs | 0 .../Spatial/PostgisServiceTests.cs | 0 .../Support/AssemblySetup.cs | 0 .../Support/CodeAnnotations.cs | 0 .../Support/EntityFrameworkTestBase.cs | 0 .../Support/TestBase.cs | 0 .../Support/TestDbConfiguration.cs | 0 .../Support/TestUtil.cs | 0 .../xmlModel/XmlTest.ObjectLayer.EF6.cs | 0 .../xmlModel/XmlTest.ObjectLayer.cs | 0 .../xmlModel/XmlTest.csdl | 0 .../xmlModel/XmlTest.msl | 0 .../xmlModel/XmlTest.ssdl | 0 .../App.config | 0 .../EF6.PG.csproj | 17 ++++++++++------ .../NpgsqlConnectionFactory.cs | 0 .../NpgsqlMigrationSqlGenerator.cs | 0 .../NpgsqlProviderManifest.cs | 0 .../NpgsqlRankingNormalization.cs | 0 .../NpgsqlServices.cs | 0 .../NpgsqlTextFunctions.cs | 0 .../NpgsqlTypeFunctions.cs | 0 .../NpgsqlWeightLabel.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../NpgsqlProviderManifest.Manifest.xml | 0 .../Resources/NpgsqlSchema.msl | 0 .../Resources/NpgsqlSchema.ssdl | 0 .../Resources/NpgsqlSchemaV3.ssdl | 0 .../Spatial/PostgisDataReader.cs | 0 .../Spatial/PostgisServices.cs | 0 .../SqlGenerators/PendingProjectsNode.cs | 0 .../SqlGenerators/SqlBaseGenerator.cs | 0 .../SqlGenerators/SqlDeleteGenerator.cs | 0 .../SqlGenerators/SqlInsertGenerator.cs | 0 .../SqlGenerators/SqlSelectGenerator.cs | 0 .../SqlGenerators/SqlUpdateGenerator.cs | 0 .../SqlGenerators/StringPair.cs | 0 .../SqlGenerators/VisitedExpression.cs | 0 EF6.PG/content/App.config.install.xdt | 9 +++++++++ EF6.PG/content/App.config.transform | 11 ++++++++++ EF6.PG/content/Web.config.install.xdt | 9 +++++++++ EF6.PG/content/Web.config.transform | 11 ++++++++++ EF6.PG/postgresql.png | Bin 0 -> 9675 bytes EntityFramework6.Npgsql.sln | 10 ++++----- src/EntityFramework6.Npgsql/install.ps1 | 3 --- .../EntityFramework6.Npgsql.Tests.csproj | 17 ---------------- 54 files changed, 94 insertions(+), 39 deletions(-) create mode 100644 Directory.Build.targets rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/App.config (95%) create mode 100644 EF6.PG.Tests/EF6.PG.Tests.csproj rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/EntityFrameworkBasicTests.cs (99%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/EntityFrameworkMigrationTests.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/FullTextSearchTests.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/NLogLoggingProvider.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/PatternMatchingTests.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Spatial/PostgisServiceTests.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/AssemblySetup.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/CodeAnnotations.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/EntityFrameworkTestBase.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/TestBase.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/TestDbConfiguration.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/Support/TestUtil.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/xmlModel/XmlTest.ObjectLayer.EF6.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/xmlModel/XmlTest.ObjectLayer.cs (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/xmlModel/XmlTest.csdl (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/xmlModel/XmlTest.msl (100%) rename {test/EntityFramework6.Npgsql.Tests => EF6.PG.Tests}/xmlModel/XmlTest.ssdl (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/App.config (100%) rename src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj => EF6.PG/EF6.PG.csproj (67%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlConnectionFactory.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlMigrationSqlGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlProviderManifest.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlRankingNormalization.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlServices.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlTextFunctions.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlTypeFunctions.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/NpgsqlWeightLabel.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Properties/AssemblyInfo.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Resources/NpgsqlProviderManifest.Manifest.xml (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Resources/NpgsqlSchema.msl (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Resources/NpgsqlSchema.ssdl (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Resources/NpgsqlSchemaV3.ssdl (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Spatial/PostgisDataReader.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/Spatial/PostgisServices.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/PendingProjectsNode.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/SqlBaseGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/SqlDeleteGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/SqlInsertGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/SqlSelectGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/SqlUpdateGenerator.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/StringPair.cs (100%) rename {src/EntityFramework6.Npgsql => EF6.PG}/SqlGenerators/VisitedExpression.cs (100%) create mode 100644 EF6.PG/content/App.config.install.xdt create mode 100644 EF6.PG/content/App.config.transform create mode 100644 EF6.PG/content/Web.config.install.xdt create mode 100644 EF6.PG/content/Web.config.transform create mode 100644 EF6.PG/postgresql.png delete mode 100644 src/EntityFramework6.Npgsql/install.ps1 delete mode 100644 test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj diff --git a/Directory.Build.props b/Directory.Build.props index d53ede3..c164035 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,13 +1,14 @@  - true + true + snupkg - + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000..37c0136 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/test/EntityFramework6.Npgsql.Tests/App.config b/EF6.PG.Tests/App.config similarity index 95% rename from test/EntityFramework6.Npgsql.Tests/App.config rename to EF6.PG.Tests/App.config index 3bd6d0b..f113db7 100644 --- a/test/EntityFramework6.Npgsql.Tests/App.config +++ b/EF6.PG.Tests/App.config @@ -29,7 +29,7 @@ - + diff --git a/EF6.PG.Tests/EF6.PG.Tests.csproj b/EF6.PG.Tests/EF6.PG.Tests.csproj new file mode 100644 index 0000000..e2a05da --- /dev/null +++ b/EF6.PG.Tests/EF6.PG.Tests.csproj @@ -0,0 +1,19 @@ + + + latest + net45;netcoreapp3.0 + EntityFramework6.Npgsql.Tests + EntityFramework6.Npgsql.Tests + + + + + + + + + + + + + diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs b/EF6.PG.Tests/EntityFrameworkBasicTests.cs similarity index 99% rename from test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs rename to EF6.PG.Tests/EntityFrameworkBasicTests.cs index 180fb08..4e89635 100644 --- a/test/EntityFramework6.Npgsql.Tests/EntityFrameworkBasicTests.cs +++ b/EF6.PG.Tests/EntityFrameworkBasicTests.cs @@ -17,7 +17,7 @@ namespace EntityFramework6.Npgsql.Tests { public class EntityFrameworkBasicTests : EntityFrameworkTestBase { - [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/860")] + [Test] 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, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")] + [Test] public void TestComplicatedQueries() { using (var context = new BloggingContext(ConnectionString)) @@ -517,7 +517,7 @@ public void TestComplicatedQueries() } } - [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")] + [Test] [MonoIgnore("Probably bug in mono. See https://github.com/npgsql/Npgsql/issues/289.")] public void TestComplicatedQueriesMonoFails() { @@ -541,7 +541,7 @@ public void TestComplicatedQueriesMonoFails() } } - [Test, Ignore("https://github.com/aspnet/EntityFramework6/issues/861")] + [Test] public void TestComplicatedQueriesWithApply() { using (var conn = OpenConnection(ConnectionString)) diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs b/EF6.PG.Tests/EntityFrameworkMigrationTests.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/EntityFrameworkMigrationTests.cs rename to EF6.PG.Tests/EntityFrameworkMigrationTests.cs diff --git a/test/EntityFramework6.Npgsql.Tests/FullTextSearchTests.cs b/EF6.PG.Tests/FullTextSearchTests.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/FullTextSearchTests.cs rename to EF6.PG.Tests/FullTextSearchTests.cs diff --git a/test/EntityFramework6.Npgsql.Tests/NLogLoggingProvider.cs b/EF6.PG.Tests/NLogLoggingProvider.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/NLogLoggingProvider.cs rename to EF6.PG.Tests/NLogLoggingProvider.cs diff --git a/test/EntityFramework6.Npgsql.Tests/PatternMatchingTests.cs b/EF6.PG.Tests/PatternMatchingTests.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/PatternMatchingTests.cs rename to EF6.PG.Tests/PatternMatchingTests.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Spatial/PostgisServiceTests.cs b/EF6.PG.Tests/Spatial/PostgisServiceTests.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Spatial/PostgisServiceTests.cs rename to EF6.PG.Tests/Spatial/PostgisServiceTests.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs b/EF6.PG.Tests/Support/AssemblySetup.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/AssemblySetup.cs rename to EF6.PG.Tests/Support/AssemblySetup.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/CodeAnnotations.cs b/EF6.PG.Tests/Support/CodeAnnotations.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/CodeAnnotations.cs rename to EF6.PG.Tests/Support/CodeAnnotations.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/EntityFrameworkTestBase.cs b/EF6.PG.Tests/Support/EntityFrameworkTestBase.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/EntityFrameworkTestBase.cs rename to EF6.PG.Tests/Support/EntityFrameworkTestBase.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs b/EF6.PG.Tests/Support/TestBase.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/TestBase.cs rename to EF6.PG.Tests/Support/TestBase.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs b/EF6.PG.Tests/Support/TestDbConfiguration.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/TestDbConfiguration.cs rename to EF6.PG.Tests/Support/TestDbConfiguration.cs diff --git a/test/EntityFramework6.Npgsql.Tests/Support/TestUtil.cs b/EF6.PG.Tests/Support/TestUtil.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/Support/TestUtil.cs rename to EF6.PG.Tests/Support/TestUtil.cs diff --git a/test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ObjectLayer.EF6.cs b/EF6.PG.Tests/xmlModel/XmlTest.ObjectLayer.EF6.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ObjectLayer.EF6.cs rename to EF6.PG.Tests/xmlModel/XmlTest.ObjectLayer.EF6.cs diff --git a/test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ObjectLayer.cs b/EF6.PG.Tests/xmlModel/XmlTest.ObjectLayer.cs similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ObjectLayer.cs rename to EF6.PG.Tests/xmlModel/XmlTest.ObjectLayer.cs diff --git a/test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.csdl b/EF6.PG.Tests/xmlModel/XmlTest.csdl similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.csdl rename to EF6.PG.Tests/xmlModel/XmlTest.csdl diff --git a/test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.msl b/EF6.PG.Tests/xmlModel/XmlTest.msl similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.msl rename to EF6.PG.Tests/xmlModel/XmlTest.msl diff --git a/test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ssdl b/EF6.PG.Tests/xmlModel/XmlTest.ssdl similarity index 100% rename from test/EntityFramework6.Npgsql.Tests/xmlModel/XmlTest.ssdl rename to EF6.PG.Tests/xmlModel/XmlTest.ssdl diff --git a/src/EntityFramework6.Npgsql/App.config b/EF6.PG/App.config similarity index 100% rename from src/EntityFramework6.Npgsql/App.config rename to EF6.PG/App.config diff --git a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj b/EF6.PG/EF6.PG.csproj similarity index 67% rename from src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj rename to EF6.PG/EF6.PG.csproj index 471878e..87cf8ba 100644 --- a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj +++ b/EF6.PG/EF6.PG.csproj @@ -12,12 +12,13 @@ CS1591 true Npgsql + EntityFramework6.Npgsql true - ../../Npgsql.snk + ../Npgsql.snk true true - http://www.npgsql.org - http://www.npgsql.org/img/postgresql.gif + https://github.com/npgsql/EntityFramework6.Npgsql + postgresql.png PostgreSQL git git://github.com/npgsql/EntityFramework6.Npgsql @@ -27,7 +28,11 @@ - + + + + + @@ -39,7 +44,7 @@ - - + + diff --git a/src/EntityFramework6.Npgsql/NpgsqlConnectionFactory.cs b/EF6.PG/NpgsqlConnectionFactory.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlConnectionFactory.cs rename to EF6.PG/NpgsqlConnectionFactory.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlMigrationSqlGenerator.cs b/EF6.PG/NpgsqlMigrationSqlGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlMigrationSqlGenerator.cs rename to EF6.PG/NpgsqlMigrationSqlGenerator.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlProviderManifest.cs b/EF6.PG/NpgsqlProviderManifest.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlProviderManifest.cs rename to EF6.PG/NpgsqlProviderManifest.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlRankingNormalization.cs b/EF6.PG/NpgsqlRankingNormalization.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlRankingNormalization.cs rename to EF6.PG/NpgsqlRankingNormalization.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlServices.cs b/EF6.PG/NpgsqlServices.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlServices.cs rename to EF6.PG/NpgsqlServices.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlTextFunctions.cs b/EF6.PG/NpgsqlTextFunctions.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlTextFunctions.cs rename to EF6.PG/NpgsqlTextFunctions.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlTypeFunctions.cs b/EF6.PG/NpgsqlTypeFunctions.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlTypeFunctions.cs rename to EF6.PG/NpgsqlTypeFunctions.cs diff --git a/src/EntityFramework6.Npgsql/NpgsqlWeightLabel.cs b/EF6.PG/NpgsqlWeightLabel.cs similarity index 100% rename from src/EntityFramework6.Npgsql/NpgsqlWeightLabel.cs rename to EF6.PG/NpgsqlWeightLabel.cs diff --git a/src/EntityFramework6.Npgsql/Properties/AssemblyInfo.cs b/EF6.PG/Properties/AssemblyInfo.cs similarity index 100% rename from src/EntityFramework6.Npgsql/Properties/AssemblyInfo.cs rename to EF6.PG/Properties/AssemblyInfo.cs diff --git a/src/EntityFramework6.Npgsql/Resources/NpgsqlProviderManifest.Manifest.xml b/EF6.PG/Resources/NpgsqlProviderManifest.Manifest.xml similarity index 100% rename from src/EntityFramework6.Npgsql/Resources/NpgsqlProviderManifest.Manifest.xml rename to EF6.PG/Resources/NpgsqlProviderManifest.Manifest.xml diff --git a/src/EntityFramework6.Npgsql/Resources/NpgsqlSchema.msl b/EF6.PG/Resources/NpgsqlSchema.msl similarity index 100% rename from src/EntityFramework6.Npgsql/Resources/NpgsqlSchema.msl rename to EF6.PG/Resources/NpgsqlSchema.msl diff --git a/src/EntityFramework6.Npgsql/Resources/NpgsqlSchema.ssdl b/EF6.PG/Resources/NpgsqlSchema.ssdl similarity index 100% rename from src/EntityFramework6.Npgsql/Resources/NpgsqlSchema.ssdl rename to EF6.PG/Resources/NpgsqlSchema.ssdl diff --git a/src/EntityFramework6.Npgsql/Resources/NpgsqlSchemaV3.ssdl b/EF6.PG/Resources/NpgsqlSchemaV3.ssdl similarity index 100% rename from src/EntityFramework6.Npgsql/Resources/NpgsqlSchemaV3.ssdl rename to EF6.PG/Resources/NpgsqlSchemaV3.ssdl diff --git a/src/EntityFramework6.Npgsql/Spatial/PostgisDataReader.cs b/EF6.PG/Spatial/PostgisDataReader.cs similarity index 100% rename from src/EntityFramework6.Npgsql/Spatial/PostgisDataReader.cs rename to EF6.PG/Spatial/PostgisDataReader.cs diff --git a/src/EntityFramework6.Npgsql/Spatial/PostgisServices.cs b/EF6.PG/Spatial/PostgisServices.cs similarity index 100% rename from src/EntityFramework6.Npgsql/Spatial/PostgisServices.cs rename to EF6.PG/Spatial/PostgisServices.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/PendingProjectsNode.cs b/EF6.PG/SqlGenerators/PendingProjectsNode.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/PendingProjectsNode.cs rename to EF6.PG/SqlGenerators/PendingProjectsNode.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlBaseGenerator.cs b/EF6.PG/SqlGenerators/SqlBaseGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/SqlBaseGenerator.cs rename to EF6.PG/SqlGenerators/SqlBaseGenerator.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlDeleteGenerator.cs b/EF6.PG/SqlGenerators/SqlDeleteGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/SqlDeleteGenerator.cs rename to EF6.PG/SqlGenerators/SqlDeleteGenerator.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlInsertGenerator.cs b/EF6.PG/SqlGenerators/SqlInsertGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/SqlInsertGenerator.cs rename to EF6.PG/SqlGenerators/SqlInsertGenerator.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlSelectGenerator.cs b/EF6.PG/SqlGenerators/SqlSelectGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/SqlSelectGenerator.cs rename to EF6.PG/SqlGenerators/SqlSelectGenerator.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlUpdateGenerator.cs b/EF6.PG/SqlGenerators/SqlUpdateGenerator.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/SqlUpdateGenerator.cs rename to EF6.PG/SqlGenerators/SqlUpdateGenerator.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/StringPair.cs b/EF6.PG/SqlGenerators/StringPair.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/StringPair.cs rename to EF6.PG/SqlGenerators/StringPair.cs diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/VisitedExpression.cs b/EF6.PG/SqlGenerators/VisitedExpression.cs similarity index 100% rename from src/EntityFramework6.Npgsql/SqlGenerators/VisitedExpression.cs rename to EF6.PG/SqlGenerators/VisitedExpression.cs diff --git a/EF6.PG/content/App.config.install.xdt b/EF6.PG/content/App.config.install.xdt new file mode 100644 index 0000000..ace92ed --- /dev/null +++ b/EF6.PG/content/App.config.install.xdt @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/EF6.PG/content/App.config.transform b/EF6.PG/content/App.config.transform new file mode 100644 index 0000000..1dad58e --- /dev/null +++ b/EF6.PG/content/App.config.transform @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/EF6.PG/content/Web.config.install.xdt b/EF6.PG/content/Web.config.install.xdt new file mode 100644 index 0000000..ace92ed --- /dev/null +++ b/EF6.PG/content/Web.config.install.xdt @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/EF6.PG/content/Web.config.transform b/EF6.PG/content/Web.config.transform new file mode 100644 index 0000000..1dad58e --- /dev/null +++ b/EF6.PG/content/Web.config.transform @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/EF6.PG/postgresql.png b/EF6.PG/postgresql.png new file mode 100644 index 0000000000000000000000000000000000000000..3a21b19f7a164a0d7de90043974a06a273fdbd7b GIT binary patch literal 9675 zcmV;+B{bTJP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DC16QJK~#8N?VSgd z6vfuZucRes5Lj{sU09+Z86=4a0uog~KrkQ(`cT0SP~hp4pdunD3KA7j1OdrWRDwhW zmYj3WaliW4bobn;8JN{lpOq!1%kjN4*d5aY5KyTv#z#vw6&7h|6oF=B*;a0&n(QdTiCiVbqQs~mMr|?hR%8*wUk-?|L5#n}I4H(m zF;=Gkd-i41PV$2cab1@*Gwqd6L;6XPt1|GB%!ZlkA z2nXJbpYRJWV3IqF@thb~ny~~sPV(f*DO({T-xpU{}(4j+g z@7_J*-;N9ZyJE$PQQ5L(sZym%RIOSyDp;_f{JX)jfB$}3vSbNu*sy^XFJ3I~eK1;# zkz#}-2%$_Emi7PMT-`t8Z~NA;lhO}Dk@685oyw-p-h=F$p?k?c2A@H)HEoY`uQ*s~C}D6qI)iOmK8`G}WzJR}Q?T z{!G?^0|#jH=FRdm{r&gfv~b}<%9=GRJ^SplRHaH4DqR|ji*rB-APl2MjiS@1p%!># zs2BrWm*D|V4NK4^F`&^}Lp;#f#*G`tPM$nD_Wb$tVt(yGJp9pJ>((t+2$J&u z^fiR=#f}&;B31~N@s|>Y+js89Ub}fK_WI4+v3JCEFwC4eQ$AZy-%|`&64k{Bm_Szm zD04H#s3h+U@MaGfFn~IA=s*uX_@MDy=fKj4w{g{~RWyD2bmO;fYS*q!g9Z(va^=cV z#*8pJoJGtJ9X@@Lb{{!IhfZCfV`nbXfs^Oy>h;@n{_-`taqAA<7Te36yZ7jU2Ogk^ zl*uVW+SK%5=Jb>~eQL^^BQq7sorTI2&MkhzQ1Z@-6)R}SkRh~m=~Cl23WLQM0VxOL~Qd~hj}C!@Gfe2#s`&(T3KK^LxEr_&d% z(hc$X@R^b)dw|lVP9;ay3~A-0;nLj}FBa)0hVN~6ACO*;;rGJX>p^(z*mHnq!A zbWyl3RG>Tc?%kU{{~Xq#!e%k*iE&Qe`M@6mC@IDoF|x@!!Sl~QPhxM4^VXje%iWa4 zn`qglJ#<7YiFT4qyc%`N6_F3WVu`#|xUy z_&j6h{6_PB-$_?**f;T>s3j((UiqT*_#=2vR8C*GLhnskN^7^nmt_yw9(uQ`F1IEQ ztd&}|YSE=j(9JEdKVa@o$U6_jCjhWBUvpg&b?w@fKKke*X#<;J$$M||QaUV@pK#Ol z@ygWW$tuR33%vFH#?Ke~`wina;h|Liob-B|T2!_Oyvr(I&Ra*H&xM=cKHlz7SFS>w zW5@|6(;Y$GE>z*NooNaivR<2yBEc`Fdf}VRlunTp70#EUzETSV7kuUSd5_u2>!#`BGELkOm*q#Wbl~CcoX5iV17NF8)4vl3o}wOX@u)@Wm`z1l3L9|HQynpx{XWpiy;mT@vNXmyde& z>Sf%y6s-SFTb^Lc?DLH)$p>iy9YlZ7i3NPFuEW2V{tlCD8Pn3ZzAdS69^Ve1K!5}4 znPD@8rQ@CxxT?ST<{RVA;uGVig(m@MA_f9GlAb+#D*OI7i#F2s{a%$yM=4({lG;D! z_B%ir2Tfd@pnHCNz(Leu=nT5Zl+ui8BWQHb=9E5-eL>2jXD(8Ykv|xBE)cUokcxq@ zxDqSzBmmDCKjp-C>C(lxb2(JLU%Ab=3qRePK0?Wpxj*ul*=y<8S;g#0l*Al4P3?wE zQ}+G`v!tibUu$99*~3n;HUDSaJmb!V2mb)JcMDwr@T$XuBzf++=VbKD1m3iSdfQ<0 zS16v>xFcG#{Q%AW^)KTt@q@|78+!4odnG6-Ovg`pB7MR>mTlTghfljr^46_e>kd1( zi7j*iK#14+x9ilYV_b>lR!sc&s}k<*huO!OB1}H`@Bc|4Q1tT0KN@!~9(|}l9D6=g zCd^-NT!{%5D`tfXNX)W83Y+D~(FLHX@l#3-qG~1^V~)yTPC`&Je-5frI=^v8(x<;6 zCQcCKAHmK;r|GrN<{Eb{-fUk-m~%OeyU@Y&;UH;+fuIVKRwcRsSf(G`ihSugf!5kz*Y1dasG z>TN#LlN%(Gp9#Ny^BQ~V*Cy(CwBUcpQpU3ZH1o0eH@{HK$Hnr z~K$`x)0|cx-m=2G-n*q;SMp#JPVSWDUy! z!3Ds|xIn@tk|s^|ACEV$z!Bh6M>2>BT+nvs86-5wSBMec%Ot8$E@>Hr3|k~UWH(ze zAT9uwEy5=s96g&b54~t)cIi4b(Y4!u3kauk-qIp`!2sRK1erq`)-SjKpoUF?v~AA0 zODKp5KYDC^({8uY^lxIvp;PqBdUq~i?yMQ;iK-|q44xDz+*6BM2Mxz$$Lco?Q)B zI-OSKjpF&-pJVsYGj#o?tz~hE3RqgmT{J-wERth`A$z8DGLh9pOA`aulE4MPO03hh zMx;%L8>D6P6!C5Q5+(u}PNpu|WL&v;;R$5o2M(Sc2US)Y)_%hUz|su$bf$zbyCbu! z(!cYtJ!#g7892CjbkkD?us`I^rdFz>w2c9i;Hv9V6#&%fOHd@qfvYmyl-6?Zc|6?{ zsZ*tpOCKC5g>z@6TtbmbY#@uNLh(rI+N3hQ+qnUa>(hcJ_G>N2*xpak@E%Vn$s-xk zMg-*;(hFITG0ec*Z!M>MW)bR>reOQ_?P==NskoGMA2~~LTZV%kO{>TUWzwkM1Uhrk z5?uK(AtaBK%12d7<(K;<9+=LG&HHG@mc258HK9NX_p|lOOU>TXXY>V76}$*0^$!I+dDt9}c(_BZh8HKC*(|Xj6;k z4DCc?dNrr#8dMO*Ck*RpiOMpH5A)8A=N?dnAbJozAFy41#% z|8V7b*REZB@_`c5=K^5)dr=$DK@mo{!IExrR!lyY&Pi{!q49lNQkyzu1Adqgl1Xp2 zriTkzrHzh*90sIqBhaIRbhbUhvO!Ykmc7Si+PJ6era%*K)1^rz{Rk$1{`seIWub&p z`4%urjNZ6F82J2ocUzjz=lo7z&R=KTg$L}5{!SJi+{Rr;WQFdfYd7fD?YmM3Kp7b_ zi8y%hZQh+~YihP9;Klqx2rCy<`2N3Ju|;l62(Ed`uEJI}SFCO(BWJFrX-ie>z!z{M z^DHA2^PrHFQAiBS-sCHQ&6A`Sj# zi7X01&f=W4f6I*AUZ2jP_Cuyo3=3vqLV`7~0^zk*)s@LdQR zDu6i|v_#R%LZAadR~px@U29xP-~du$>0AI5O#|IAOiKAth-o(|lP5Q>R8ac$%&_V7 z!pI+FhB6#PCeROFYF3p7KKB^C()>|bn1RXfK4KP~W(s5z@$k8)%x((i$|B3VP2j`$ z^vAW7OPFV0i(&CMAeA*VUpFQoVSu&)N)w|37 z+#@S?OsbT!A>`_XVv*`Hyk+k(`E$V^I~9{o7THW)u9(>R629lCYLWQ@if&pK1w_Ls zjW`m)1pw|MtE^OW9#BDTX>uC)#!V0d@HDwP112ntpU*+Xbg>Euk>MqD|;_&PzR9xS<<$wGGO)NOemMt@`B+&8Vm;_t^fc0t6 zi-vZtlGA90-d|QQL`1Ih(QUOGh3jD;%vHyfCp@qj2@Hcgzxm|G2sizh%NM}c} zh$o>gp4V-|qkT;v)GXt69Une?n6_k!1-x@#!aZ;spTR(x+ zVeq;MfO38f^m>ScE&$59&-DO&kznJ~!GJy6B#^hr7kbwazTesjJbawU?EW>l;wA53 zcK`|?TGg0f_13m<^r(pw69&2fV9l{IK+zF|Q>lbIL&s@&*;le;_CzC5KF#fFryN|| z@dW&RZfHKm;d+oSatJe*XHQ}BwGc2`>Ut!uhC*Z&+v|#8I76&_|FUQLT^v2*_P5*F zsDXp*W!{x6x~PBKr@qzsn*oK&DIT$(G-;A?Wf5mTF!3Y+meU_ng#NuI)uU9ux|486 zik*cZrbPhsH_lEr>~cGI5Rvq6yHQ2m-)~**VYg2MZDH1|QB*m6Vf9UBcoG1`0l>Eb zc(QnXzLTJ9r-_|az!xsNGi0Hh>DfH{&{yJN`B&@FH9QFbqy;B+NYId(Q@NySZa76sme+nQ0B=}) zaCb0pYDI&SX9;s%qt$DCR@ABUYKS_%Z38O=uOC2*IL-WnKR-^lD2}&pZ~aHeC_ztu z6Lho=2i*IIngF}dw-ay8nC(E{1`w$7#dRU*T=~V8>kFjA@yzKjzW9P}-&S50bcyn* zN_hMBR?y(;)vJm%5H5!h_lVh9m!R+YHtLsg_+{NLCCjHl#bQ1cPY5Ru{-lZU?f+<2 zU8(1#nKQB7Ti~1dT>gPK0a$GOl;G3~6TF#);^}E`2U*zicT!s#LqYE=>~zr!Pew(! z_Q^+mpE81sCX?ck-u)CX$sb|c@$A{N>94<(o=I56)rg)4ya@pG04pA>D;B!j(QdG; z@i!&VtQcS9U`>{hQ{b<&C0KYT5P&2QU+g{RHd7-~c}|J}5G3w4_MrUXl(Bg6wEX5jzx?t`x^_)5A#t>vUti9b04V+du3#Xg%F_uJcEM}g z0gjom1HAoQYd&-`JOY4KVD4JWvX+zAteUF8ndrU%oGHY?vd>o#cx%Uw9c$cK#63vK z3%&#ZPsjSyKm4G!A#J3!Zm|=mO40N*^NnHbH-PkRPVbi0J$fN^KLv6GI87cYr9>A$ z`|LB>9h`x4o%}wy$d>>BYa4*1@jSsg(at4R>Y6!Mc0!?1B~@qq$v z7D^vqiSC!+F9V)KvubWD0;&7oefOPlXMy?-zll!(lq3R}8YcJxPUQ#anmIQKg9VBc z5C0-RFx;KbunO>OA#@1UpJ8e(_klkPymWjOn=@yQlC&ehG80hW{P+X_4ggF2*L%E~M zMH?0GAc|LbA}Bu%4R62s@3yQFrTlx}e)}zL+N6|>A&46357m(+-e&@yV*jmFw^+lY=K*Nx9g* zP!MZ^y&vZZYkVq(szLgJKLVhHm$)7PcrKcqtY--o(1hzmt6|STKnG3^dh;bDIB$vj z{A-jcB>fXeQqBLMyAs=Miq*PK8Kt5Ky&Kl8Q;Ky_#x=!t85sTu0L($_6auZ-z%c

Vgfw~C1V{MR!~0w#~**Jp9_dLa+d2daQqbj#T?X6u70e7+F9H##?Spj zF@s<>RShr>fx18wJXAe6laTO(9RQzb^bx?>$$a}l=N25?sWC*1po7}}3IMhN%ix?f zYnGBEV)uy`CUBk%ouY0zAH2}m?}82-$-@8Lg&Shz-%Ko^@wF#s6a;n7+8xxZMKvW; z7{|tA1!f@PheN%C#$N#dmgvD0oHorJY(jp3Q%)f~B%DBQg2GF5*Yb2ks}2r#=B(JP zES-shx4-ZXt;Bi^Ak$at^ns=EJ=bOM1ma_bANWnzrOOn-p;9JrQ?A+O zb`{$ROu|PWE@(A%K&23ZDLBOpJ$AhDpLVsaWfe7px<5WK0M8(lTi)0K4YDeg$Y)hV zq1P{3y~M;QmBjxOW3uZ~0y`PLZg`e(>~Cu^a4Z=P41#IlvCn>>YBfxa4z5e0{rmS@ zoyD9OS`V1yE)@<7^1we0I1I4dJixza_ zMx3lDG*Lu)5#D-y(f9%;*zU11V1g{|GjPM&wG~KJT<<1^nm9CNasnuG*!#Jr>@Tn+ zCNKU|CV=iccGhR7k%R)@49OU|z5?r%ahrx{I|wfdD6n%Aip& z0syn4zw1>zUmlojSSOnxXRrnjhE+ykuDZd8QC5m(c(L$D;-Vx{C26jf4WLRj-!S zWqyUHGI$*JFk-|A+3w}|@#C`e3#s2Y)dgn(<<6a((A~XAks|WE;8LYZQGo(#kD|BU zdW+tFU-1>eZ_o-C!3Y2p3hT9xii)DGTiv|}mkUk%jnCENOG5z<2yZ_6-me$c*VH%s8$Y!wJ%?Su<&Ucw^6=J=C&gOG?iA3?ih8t?B7OQ|OyTYM&(Z6in`5 zb&xk8+&r@vR@AVm%c#xZsr1fQ3#n=Ui8OKHhJf7G_#5bgveQErHLvXuSke{D7GQ$) z#8SyoLRP%ETY-6Y*o=_Uxsf@GH^c;!k2hP7M(Q9*qHo{6#+^`kh35b2CqF3-B?on? zuM}&(EA)YI=LaB}X84Ox%3YwJ5r!vlc0#$Lk+RWbie$-TbQC4?=PzHQi&tGehjC8e zRbeT$sud-Vo8ijxxN+mCM~@!HodoscHE%P(%P76KhD2Xa4! z|8#h)9KF^`em)6Oo}YjId6@*^i`QR&U5S*z?K^1V;y9;`;q6;Ks=IL~_OoT1W&5^p z(q0I6AC?}DH$Idc1@squxp`HkQy74LgkgYZItzMNrb z=mDGmr=NZ@eq(`2?<|I*MA;z#h+7t=qkUH}ZeoA6KGZ=H6AI zLIwKjtFI`3{`d=0(MkM^dFyDyE~W3a0yJ-|GMt6$cTxWdUi&CH0zcNp4$u~6=+L3k zYp5;x0KY&C$I{tM><|Eeu;c*OrR(T-dTu0 z*u%sFl=#6_i(Y|ouuA{{%8@KPuu-E%v|xeSo({zr(~QU+CLV`Az1^XXQtE^+(W+G| znRSE+7|(t+Cw%Q+2kG~}4|zRxLkIt_zHMrH?b9=R&0jQRikju*G&u9ftW!ja7xwKE zCA^p0AsB?X3tlYb2H^Q%@_8&q1JW>93%{_g9Z(vfddE1YXEz9%92ffp8$r6A{;8E=LPB@OBha=aDg*~77y=cCAp3nGlpJy z1(90U!QD9JD@BSFQYeslh2hSHVz##v4*!0XWX( zztcj>tO^LY%4fV|rBz6!4FQ`F!CQ_!9=5RGiH~**0Kh9d$aU!gI>CSe1C$IR6G%2r zw(8iiW1Q2<02Dzz6+KuGTZe^$tY$2!<`KCwS8k;brhDzBXglb$G_Fre#vi0I!OHP8ETIFO1iry}V;!OMpul3MRsv`Z4z$yzMYY(KjCntmedC>l|(Lclt zFwq!TU9`3-3P`jxb%5`M4)A^$bpYK7q&13wJsj76?GR22fC<)a&m|iw-qqDXEUn$kgLE2u54uUFyIaI?#Z&5a0S9Ku{f|8 zb{{N-c49yv;6jcP12tc$JJ9ztCUh&pYKG&<(Td!kVggeqz)V4S;NZZf4W&rWc*MGo9`}fOBZ>q; zL)uM4F)W*sCra|p-@ESyHcr)59NICI!3q!zz!fhFf*}gz?qJYlE@ju(uvk( zh)v)p5(*Icf}oizi{&=tD}e5hauQTf@t#MTa;hFR5(fT>0^kWeIP9C~ErTcOtyt1Z zuIDR&lLtrW=xyJ$9zV{WXzhW2ivakGWfmaa+9aF;fCLT>9AS+60^l%~0PtQ%cAZM* z57{!Ql|S0yj=B=;I7wCjc&Sx{O??Rcp(IOjM}e(o1vpb(>w}~w09KAQ?{APM!oPzZ z?I2wmcW??R>~Kgi?ymq2W9_lL`?ZGlvtD zVBN~$iRA6~1>vntGe~Lz05eOj{d@}m;ShlG#oUdcv=hF7+B!5$BsBp5GIJT#%$$On zi`H&%0939l?hYqf3;-z2f5Sym6ad*E2_85e5iF9&SpmRd73leIq8-T#WgzSdAV`V= zAe}7;!y+5U1Rchlq(+q534|ZYEeKyiqDE2_0PBMT-`drWtzha%QdGMk_Y$qaBA% z(uFH7_i@^Yl=6sscn{&=sVA2C+$cpCLZE}mfBEH?b%nEw7@iv^+$XG{J_}ZX9OcTD zi}l6jYd2y~U$_!`>FN#RH{Q8-?_TWe*|TE{7A$D}ePgI?RqvDFpzWAK*q?v?IW{^vnol|gw8}WAKHMj9fMfBL3G3RmtKWivNnf~dVQlBlony0S z&#wF(W1x`_>KhXsNnHovKnR++F5SRPY~H*%<;#~(_Th()fSLjnbRef62QnbHj~ALS zpzOitfRcAB7vVmM7wpfT-rzt7-uUri_}drZK8XlS8oYC!Cf3)$q{GSoq8PqgnI_UdT!`u-*n>#nMi2+NW#}$}cz)OmJ3@o#{{ban)HTt50$l(A N002ovPDHLkV1k}&RRI71 literal 0 HcmV?d00001 diff --git a/EntityFramework6.Npgsql.sln b/EntityFramework6.Npgsql.sln index 54bf88e..2609a94 100644 --- a/EntityFramework6.Npgsql.sln +++ b/EntityFramework6.Npgsql.sln @@ -5,16 +5,14 @@ VisualStudioVersion = 15.0.27703.2035 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}" ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets Npgsql.snk = Npgsql.snk EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF6.PG", "EF6.PG\EF6.PG.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF6.PG.Tests", "EF6.PG.Tests\EF6.PG.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/EntityFramework6.Npgsql/install.ps1 b/src/EntityFramework6.Npgsql/install.ps1 deleted file mode 100644 index b6b6c15..0000000 --- a/src/EntityFramework6.Npgsql/install.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -param($installPath, $toolsPath, $package, $project) - -Add-EFProvider $project 'Npgsql' 'Npgsql.NpgsqlServices, EntityFramework6.Npgsql' diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj b/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj deleted file mode 100644 index 5c8d4cf..0000000 --- a/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - latest - net45;netcoreapp3.0 - - - - - - - - - - - - -