X Tutup
Skip to content

Entity framework work for release 2.1.0 #110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roji merged 8 commits into from
Dec 6, 2013
Merged

Entity framework work for release 2.1.0 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eb13bfa
Delete old EF6
roji Dec 1, 2013
2f8928e
Upgraded to EF6.0.1
roji Dec 1, 2013
d7beea2
Reorganized Entity Framework support
roji Dec 2, 2013
92ccb85
My fix to get EdmGen/EdmGen06 and my EFv6 app working.
kenjiuno Dec 3, 2013
dc4ad25
More tweaks to EntityFramework support
roji Dec 3, 2013
0265ccd
Fix for System.IO.FileNotFoundException in NpgsqlFactory.GetService
kenjiuno Dec 4, 2013
3af882b
Fixed the strategy how to approach Npgsql.EntityFrameworkLegacy.
kenjiuno Dec 5, 2013
086686b
A bit more tweaking on legacy EF support
roji Dec 5, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
/*.nupkg
[Bb]in/
[Bb]uild/
/src/[Oo]bj/
/tests/[Oo]bj/
[Oo]bj/
[Oo]bj/
17 changes: 5 additions & 12 deletions src/Npgsql/AssemblyInfo.cs → CommonAssemblyInfo.cs
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
using System;
using System;
using System.Runtime.CompilerServices;
using System.Security;
using System.Reflection;
using System.Resources;

// ------------------------------------------------------------------------------
// <autogenerated>
// This code was generated by a tool.
// Mono Runtime Version: 2.0.50727.1433
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </autogenerated>
// ------------------------------------------------------------------------------
// Contains assembly attributes shared by all Npgsql projects

[assembly: CLSCompliantAttribute(true)]
[assembly: AllowPartiallyTrustedCallersAttribute()]
#if NET40
[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)]
#endif
[assembly: AssemblyTitleAttribute("Npgsql - .Net Data Provider for PostgreSQL")]
[assembly: AssemblyDescriptionAttribute(".Net Data Provider for PostgreSQL")]
[assembly: AssemblyCompanyAttribute("Npgsql Development Team")]
[assembly: AssemblyProductAttribute("Npgsql")]
[assembly: AssemblyCopyrightAttribute("Copyright © 2002 - 2013 Npgsql Development Team")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyVersionAttribute("2.1.0")]
[assembly: AssemblyFileVersionAttribute("2.1.0")]
[assembly: AssemblyInformationalVersionAttribute("2.1.0-beta1")]
[assembly: NeutralResourcesLanguageAttribute("en", UltimateResourceFallbackLocation.MainAssembly)]

121 changes: 121 additions & 0 deletions Npgsql.EntityFramework/Npgsql.EntityFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{3EC85CBA-5B79-11E3-8104-0022198AB089}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Npgsql.EntityFramework</AssemblyName>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Npgsql.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net45|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug-net45\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40;NET45;ENTITIES6</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug-net45\Npgsql.EntityFramework.xml</DocumentationFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net45|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release-net45\</OutputPath>
<DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40;NET45;ENTITIES6</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release-net45\Npgsql.EntityFramework.xml</DocumentationFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net40|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug-net40\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40;ENTITIES6</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug-net40\Npgsql.EntityFramework.xml</DocumentationFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net40|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release-net40\</OutputPath>
<DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40;ENTITIES6</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release-net40\Npgsql.EntityFramework.xml</DocumentationFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework">
<HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\packages\EntityFramework.6.0.1\lib\net40\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Transactions" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml" />
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="NpgsqlSchema.msl" />
<EmbeddedResource Include="NpgsqlSchema.ssdl" />
<EmbeddedResource Include="NpgsqlProviderManifest.Manifest.xml" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="NpgsqlServices.cs" />
<Compile Include="NpgsqlProviderManifest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SqlGenerators\SqlBaseGenerator.cs" />
<Compile Include="SqlGenerators\SqlDeleteGenerator.cs" />
<Compile Include="SqlGenerators\SqlInsertGenerator.cs" />
<Compile Include="SqlGenerators\SqlSelectGenerator.cs" />
<Compile Include="SqlGenerators\SqlUpdateGenerator.cs" />
<Compile Include="SqlGenerators\VisitedExpression.cs" />
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Npgsql\Npgsql.csproj">
<Project>{9d13b739-62b1-4190-b386-7a9547304eb3}</Project>
<Name>Npgsql</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
28 changes: 28 additions & 0 deletions Npgsql.EntityFramework/Npgsql.EntityFramework.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Npgsql.EntityFramework</id>
<version>2.1.0-beta1</version>
<authors>Francisco Figueiredo Jr., Josh Cooley, Dave Page, Jon Asher, Brar Piening, Chris Morgan, Hiroshi Saito, Jon Hanna, Federico Di Gregorio, Glen Parker, Shay Rojansky</authors>
<owners>Francisco Figueiredo Jr., Josh Cooley, Shay Rojansky</owners>
<licenseUrl>https://github.com/npgsql/Npgsql/wiki/License</licenseUrl>
<projectUrl>https://github.com/npgsql/Npgsql</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Postgresql provider for Entity Framework 6 and above</description>
<summary>Postgresql provider for Entity Framework 6 and above</summary>
<language>en-US</language>
<tags>Npgsql postgres data database Postgresql entity framework ef</tags>
<dependencies>
<dependency id="Npgsql" version="[2.1.0-beta1]" />
</dependencies>
</metadata>
<files>
<file src="bin\Release-net40\Npgsql.EntityFramework.dll" target="lib\net40"/>
<file src="bin\Release-net40\Npgsql.EntityFramework.pdb" target="lib\net40"/>
<file src="bin\Release-net40\Npgsql.EntityFramework.xml" target="lib\net40"/>
<file src="bin\Release-net45\Npgsql.EntityFramework.dll" target="lib\net45"/>
<file src="bin\Release-net45\Npgsql.EntityFramework.pdb" target="lib\net45"/>
<file src="bin\Release-net45\Npgsql.EntityFramework.xml" target="lib\net45"/>
<file src="**\*.cs" target="src" />
</files>
</package>
140 changes: 140 additions & 0 deletions Npgsql.EntityFramework/Npgsql.EntityFrameworkLegacy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{100998C4-5B85-11E3-911C-0022198AB089}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Npgsql.EntityFrameworkLegacy</AssemblyName>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\Npgsql.snk</AssemblyOriginatorKeyFile>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net45|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Legacy-Debug-net45\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Debug-net45\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net45|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Legacy-Release-net45\</OutputPath>
<DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40;NET45</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Release-net45\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net40|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Legacy-Debug-net40\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35;NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Debug-net40\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net40|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Legacy-Release-net40\</OutputPath>
<DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35;NET40</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Release-net40\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug-net35|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Legacy-Debug-net35\</OutputPath>
<DefineConstants>TRACE;DEBUG;WINDOWS;UNMANAGED;NET35</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Debug-net35\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release-net35|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Legacy-Release-net35\</OutputPath>
<DefineConstants>TRACE;WINDOWS;UNMANAGED;NET35</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Legacy-Release-net35\Npgsql.EntityFrameworkLegacy.xml</DocumentationFile>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.Data.Entity" />
<Reference Include="System.Transactions" />
<Reference Include="System.Configuration" />
<Reference Include="System.Xml" />
<Reference Include="System.ComponentModel.DataAnnotations" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="NpgsqlSchema.msl" />
<EmbeddedResource Include="NpgsqlSchema.ssdl" />
<EmbeddedResource Include="NpgsqlProviderManifest.Manifest.xml" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Compile Include="NpgsqlServices.cs" />
<Compile Include="NpgsqlProviderManifest.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="SqlGenerators\SqlBaseGenerator.cs" />
<Compile Include="SqlGenerators\SqlDeleteGenerator.cs" />
<Compile Include="SqlGenerators\SqlInsertGenerator.cs" />
<Compile Include="SqlGenerators\SqlSelectGenerator.cs" />
<Compile Include="SqlGenerators\SqlUpdateGenerator.cs" />
<Compile Include="SqlGenerators\VisitedExpression.cs" />
<Compile Include="..\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Npgsql\Npgsql.csproj">
<Project>{9d13b739-62b1-4190-b386-7a9547304eb3}</Project>
<Name>Npgsql</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
28 changes: 28 additions & 0 deletions Npgsql.EntityFramework/Npgsql.EntityFrameworkLegacy.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0"?>
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Npgsql.EntityFrameworkLegacy</id>
<version>2.1.0-beta1</version>
<authors>Francisco Figueiredo Jr., Josh Cooley, Dave Page, Jon Asher, Brar Piening, Chris Morgan, Hiroshi Saito, Jon Hanna, Federico Di Gregorio, Glen Parker, Shay Rojansky</authors>
<owners>Francisco Figueiredo Jr., Josh Cooley, Shay Rojansky</owners>
<licenseUrl>https://github.com/npgsql/Npgsql/wiki/License</licenseUrl>
<projectUrl>https://github.com/npgsql/Npgsql</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Postgresql provider for Entity Framework 5 and below</description>
<summary>Postgresql provider for Entity Framework 5 and below</summary>
<language>en-US</language>
<tags>Npgsql postgres data database Postgresql entity framework ef</tags>
</metadata>
<files>
<file src="bin\Legacy-Release-net35\Npgsql.EntityFrameworkLegacy.dll" target="lib\net35"/>
<file src="bin\Legacy-Release-net35\Npgsql.EntityFrameworkLegacy.pdb" target="lib\net35"/>
<file src="bin\Legacy-Release-net35\Npgsql.EntityFrameworkLegacy.xml" target="lib\net35"/>
<file src="bin\Legacy-Release-net40\Npgsql.EntityFrameworkLegacy.dll" target="lib\net40"/>
<file src="bin\Legacy-Release-net40\Npgsql.EntityFrameworkLegacy.pdb" target="lib\net40"/>
<file src="bin\Legacy-Release-net40\Npgsql.EntityFrameworkLegacy.xml" target="lib\net40"/>
<file src="bin\Legacy-Release-net45\Npgsql.EntityFrameworkLegacy.dll" target="lib\net45"/>
<file src="bin\Legacy-Release-net45\Npgsql.EntityFrameworkLegacy.pdb" target="lib\net45"/>
<file src="bin\Legacy-Release-net45\Npgsql.EntityFrameworkLegacy.xml" target="lib\net45"/>
<file src="**\*.cs" target="src" />
</files>
</package>
0 ...pgsql/NpgsqlProviderManifest.Manifest.xml → ...ework/NpgsqlProviderManifest.Manifest.xml
View file
Open in desktop
File renamed without changes.
10 changes: 4 additions & 6 deletions src/Npgsql/NpgsqlProviderManifest.cs → ...EntityFramework/NpgsqlProviderManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#if ENTITIES
using System;
using System;
using System.Collections.Generic;
using System.Text;
using System.Data.Common;
Expand All @@ -17,7 +16,7 @@ namespace Npgsql
internal class NpgsqlProviderManifest : DbXmlEnabledProviderManifest
{
public NpgsqlProviderManifest(string serverVersion)
: base(CreateXmlReaderForResource("Npgsql.NpgsqlProviderManifest.Manifest.xml"))
: base(CreateXmlReaderForResource("NpgsqlProviderManifest.Manifest.xml"))
{
}

Expand All @@ -27,11 +26,11 @@ protected override XmlReader GetDbInformation(string informationType)

if (informationType == StoreSchemaDefinition)
{
xmlReader = CreateXmlReaderForResource("Npgsql.NpgsqlSchema.ssdl");
xmlReader = CreateXmlReaderForResource("NpgsqlSchema.ssdl");
}
else if (informationType == StoreSchemaMapping)
{
xmlReader = CreateXmlReaderForResource("Npgsql.NpgsqlSchema.msl");
xmlReader = CreateXmlReaderForResource("NpgsqlSchema.msl");
}

if (xmlReader == null)
Expand Down Expand Up @@ -285,4 +284,3 @@ public override string EscapeLikeArgument(string argument)

}
}
#endif
0 src/Npgsql/NpgsqlSchema.msl → Npgsql.EntityFramework/NpgsqlSchema.msl
View file
Open in desktop
File renamed without changes.
0 src/Npgsql/NpgsqlSchema.ssdl → Npgsql.EntityFramework/NpgsqlSchema.ssdl
View file
Open in desktop
File renamed without changes.
Loading
X Tutup