Project now builds and passes tests

npgsql · May 23, 2016 · aac8342 · aac8342
1 parent daadedb
commit aac8342
Show file tree

Hide file tree

Showing 17 changed files with 787 additions and 141 deletions.
diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Security;
+using System.Reflection;
+using System.Resources;
+
+// Contains assembly attributes shared by all Npgsql projects
+
+[assembly: CLSCompliant(false)]
+[assembly: AllowPartiallyTrustedCallers()]
+[assembly: SecurityRules(SecurityRuleSet.Level1)]
+[assembly: AssemblyCompany("Npgsql Development Team")]
+[assembly: AssemblyProduct("Npgsql")]
+[assembly: AssemblyCopyright("Copyright © 2002 - 2016 Npgsql Development Team")]
+[assembly: AssemblyTrademark("")]
+[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.MainAssembly)]
+
+// The following version attributes get rewritten by GitVersion as part of the build
+[assembly: AssemblyVersion("3.2.0")]
+[assembly: AssemblyFileVersion("3.2.0")]
+[assembly: AssemblyInformationalVersion("3.2.0-ci")]
diff --git a/src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj b/src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj
@@ -38,6 +38,10 @@
     <LangVersion>5</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Npgsql, Version=3.0.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Npgsql.3.0.7\lib\net45\Npgsql.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -52,7 +56,7 @@
     <EmbeddedResource Include="..\EntityFramework6.Npgsql\NpgsqlSchema.ssdl" />
     <EmbeddedResource Include="..\EntityFramework6.Npgsql\NpgsqlSchemaV3.ssdl" />
     <EmbeddedResource Include="..\EntityFramework6.Npgsql\NpgsqlProviderManifest.Manifest.xml" />
-    <None Include="..\EntityFramework6.Npgsql\packages.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\EntityFramework6.Npgsql\NpgsqlServices.cs" />

diff --git a/src/EntityFramework5.Npgsql/packages.config b/src/EntityFramework5.Npgsql/packages.config
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages />
diff --git a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj b/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj
@@ -38,6 +38,10 @@
     <LangVersion>5</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Npgsql, Version=3.0.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Npgsql.3.0.7\lib\net45\Npgsql.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />

diff --git a/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec b/src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec
@@ -16,7 +16,7 @@
     <language>en-US</language>
     <tags>npgsql postgresql postgres data database entity framework ef orm</tags>
     <dependencies>
-      <dependency id="Npgsql" version="[$version$]" />
+      <dependency id="Npgsql" version="[3.0,3.1)" />
       <dependency id="EntityFramework" version="6.0.0" />
     </dependencies>
   </metadata>

diff --git a/src/EntityFramework6.Npgsql/SqlGenerators/SqlBaseGenerator.cs b/src/EntityFramework6.Npgsql/SqlGenerators/SqlBaseGenerator.cs
@@ -33,6 +33,7 @@
 using System.Data.Metadata.Edm;
 #endif
 using System.Linq;
+using Npgsql;
 using NpgsqlTypes;
 
 namespace Npgsql.SqlGenerators

diff --git a/src/EntityFramework6.Npgsql/packages.config b/src/EntityFramework6.Npgsql/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.1.3" targetFramework="net40" />
-</packages>
+  <package id="Npgsql" version="3.0.7" targetFramework="net45" />
+</packages>
diff --git a/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj b/test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj
@@ -35,8 +35,17 @@
     <DefineConstants>NET45</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NLog.4.3.4\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Npgsql, Version=3.0.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Npgsql.3.0.7\lib\net45\Npgsql.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.framework, Version=3.2.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NUnit.3.2.1\lib\net45\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core">
@@ -58,8 +67,12 @@
   <ItemGroup>
     <Compile Include="EntityFrameworkBasicTests.cs" />
     <Compile Include="EntityFrameworkMigrationTests.cs" />
-    <Compile Include="EntityFrameworkTestBase.cs" />
     <Compile Include="FullTextSearchTests.cs" />
+    <Compile Include="Support\CodeAnnotations.cs" />
+    <Compile Include="Support\EntityFrameworkTestBase.cs" />
+    <Compile Include="Support\NLogLoggingProvider.cs" />
+    <Compile Include="Support\TestBase.cs" />
+    <Compile Include="Support\TestUtil.cs" />
     <Compile Include="xmlModel\XmlTest.ObjectLayer.cs" />
     <Compile Include="xmlModel\XmlTest.Views.cs" />
   </ItemGroup>
@@ -82,5 +95,6 @@
       <Name>EntityFramework6.Npgsql</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
 </Project>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="utf-8"?>
		<packages />