Skip to content

Commit e847c64

Browse files
rojiroji
committed
Project now builds
* Reverted to old csproj-based build, project.json and dotnet cli don't provide any actual value here. * Target net45 instead of net451 Still need to work out CI build and version management.
1 parent 219cb11 commit e847c64

25 files changed

Lines changed: 921 additions & 393 deletions

‎EntityFramework6.Npgsql.sln‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7
1313
EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql", "src\Npgsql\Npgsql.csproj", "{9D13B739-62B1-4190-B386-7A9547304EB3}"
17-
EndProject
1816
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}"
1917
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "src\EntityFramework5.Npgsql\EntityFramework5.Npgsql.csproj", "{100998C4-5B85-11E3-911C-0022198AB089}"
21-
ProjectSection(ProjectDependencies) = postProject
22-
{E9C258D7-0D8E-4E6A-9857-5C6438591755} = {E9C258D7-0D8E-4E6A-9857-5C6438591755}
23-
EndProjectSection
24-
EndProject
25-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.Tests", "test\Npgsql.Tests\Npgsql.Tests.csproj", "{E9C258D7-0D8E-4E6A-9857-5C6438591755}"
2619
EndProject
2720
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
2821
EndProject
@@ -32,10 +25,6 @@ Global
3225
Release|Any CPU = Release|Any CPU
3326
EndGlobalSection
3427
GlobalSection(ProjectConfigurationPlatforms) = postSolution
35-
{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{9D13B739-62B1-4190-B386-7A9547304EB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{9D13B739-62B1-4190-B386-7A9547304EB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{9D13B739-62B1-4190-B386-7A9547304EB3}.Release|Any CPU.Build.0 = Release|Any CPU
3928
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4029
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
4130
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -44,29 +33,18 @@ Global
4433
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
4534
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
4635
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{E9C258D7-0D8E-4E6A-9857-5C6438591755}.Release|Any CPU.Build.0 = Release|Any CPU
5136
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5237
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
5338
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5439
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.Build.0 = Release|Any CPU
55-
{4EB6FD81-6A30-4C35-AA89-BD2B0EDDAFF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56-
{4EB6FD81-6A30-4C35-AA89-BD2B0EDDAFF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
57-
{4EB6FD81-6A30-4C35-AA89-BD2B0EDDAFF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
58-
{4EB6FD81-6A30-4C35-AA89-BD2B0EDDAFF3}.Release|Any CPU.Build.0 = Release|Any CPU
5940
EndGlobalSection
6041
GlobalSection(SolutionProperties) = preSolution
6142
HideSolutionNode = FALSE
6243
EndGlobalSection
6344
GlobalSection(NestedProjects) = preSolution
64-
{9D13B739-62B1-4190-B386-7A9547304EB3} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
6545
{3EC85CBA-5B79-11E3-8104-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
6646
{100998C4-5B85-11E3-911C-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
67-
{E9C258D7-0D8E-4E6A-9857-5C6438591755} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
6847
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
69-
{4EB6FD81-6A30-4C35-AA89-BD2B0EDDAFF3} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
7048
EndGlobalSection
7149
GlobalSection(MonoDevelopProperties) = preSolution
7250
StartupItem = Npgsql.csproj

‎src/CommonAssemblyInfo.cs‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
using System;
2+
using System.Runtime.CompilerServices;
3+
using System.Security;
4+
using System.Reflection;
5+
using System.Resources;
6+
7+
// Contains assembly attributes shared by all Npgsql projects
8+
9+
[assembly: CLSCompliant(false)]
10+
[assembly: AllowPartiallyTrustedCallers()]
11+
[assembly: SecurityRules(SecurityRuleSet.Level1)]
12+
[assembly: AssemblyCompany("Npgsql Development Team")]
13+
[assembly: AssemblyProduct("Npgsql")]
14+
[assembly: AssemblyCopyright("Copyright © 2002 - 2016 Npgsql Development Team")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: NeutralResourcesLanguage("en", UltimateResourceFallbackLocation.MainAssembly)]
17+
18+
// The following version attributes get rewritten by GitVersion as part of the build
19+
[assembly: AssemblyVersion("3.1.0.0")]
20+
[assembly: AssemblyFileVersion("3.1.0.0")]
21+
[assembly: AssemblyInformationalVersion("3.1.0-beta7-1+Branch.develop.Sha.a017bfc066ce372041992d892423c34089090402")]

‎src/EntityFramework5.Npgsql/App.config‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
</configSections>
7+
<entityFramework>
8+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
9+
<parameters>
10+
<parameter value="mssqllocaldb" />
11+
</parameters>
12+
</defaultConnectionFactory>
13+
<providers>
14+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
15+
</providers>
16+
</entityFramework>
17+
</configuration>

‎src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.csproj‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,15 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
17+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1818
<LangVersion>5</LangVersion>
19-
<!-- The following stops VS from complaining about runtimes in project.json, see
20-
https://github.com/Microsoft/msbuild/issues/394 -->
21-
<CopyNuGetImplementations>false</CopyNuGetImplementations>
2219
</PropertyGroup>
2320
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2421
<DebugSymbols>true</DebugSymbols>
2522
<DebugType>full</DebugType>
2623
<Optimize>false</Optimize>
2724
<OutputPath>bin\Debug\</OutputPath>
28-
<DefineConstants>TRACE;DEBUG;NET451</DefineConstants>
25+
<DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
2926
<ErrorReport>prompt</ErrorReport>
3027
<WarningLevel>4</WarningLevel>
3128
<DocumentationFile>bin\Debug\EntityFramework5.Npgsql.xml</DocumentationFile>
@@ -34,12 +31,16 @@
3431
<DebugType>pdbonly</DebugType>
3532
<Optimize>true</Optimize>
3633
<OutputPath>bin\Release\</OutputPath>
37-
<DefineConstants>TRACE;NET451</DefineConstants>
34+
<DefineConstants>TRACE;NET45</DefineConstants>
3835
<ErrorReport>prompt</ErrorReport>
3936
<WarningLevel>4</WarningLevel>
4037
<DocumentationFile>bin\Release\EntityFramework5.Npgsql.xml</DocumentationFile>
4138
</PropertyGroup>
4239
<ItemGroup>
40+
<Reference Include="Npgsql, Version=3.1.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
41+
<HintPath>..\..\packages\Npgsql.3.1.0-beta0001\lib\net45\Npgsql.dll</HintPath>
42+
<Private>True</Private>
43+
</Reference>
4344
<Reference Include="System" />
4445
<Reference Include="System.Core" />
4546
<Reference Include="System.Data" />
@@ -74,12 +75,9 @@
7475
<SubType>Code</SubType>
7576
</Compile>
7677
</ItemGroup>
77-
<ItemGroup />
7878
<ItemGroup>
79-
<ProjectReference Include="..\Npgsql\Npgsql.csproj">
80-
<Project>{9d13b739-62b1-4190-b386-7a9547304eb3}</Project>
81-
<Name>Npgsql</Name>
82-
</ProjectReference>
79+
<None Include="App.config" />
80+
<None Include="packages.config" />
8381
</ItemGroup>
8482
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
85-
</Project>
83+
</Project>

‎src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>EntityFramework5.Npgsql</id>
55
<title>Npgsql for Entity Framework 5</title>
6-
<version>0.0.0</version>
6+
<version>3.0.8</version>
77
<authors>Shay Rojansky, Emil Lenngren, Francisco Figueiredo Jr., Kenji Uno, Jon Asher, John Cooley, Federico Di Gregorio, Jon Hanna, Chris Morgan, Dave Page, Glen Parker, Brar Piening, Hiroshi Saito</authors>
88
<owners>Shay Rojansky, Emil Lenngren, Francisco Figueiredo Jr., Kenji Uno</owners>
9-
<licenseUrl>https://github.com/npgsql/npgsql/blob/develop/LICENSE.txt</licenseUrl>
9+
<licenseUrl>https://github.com/npgsql/EntityFramework6.Npgsql/blob/dev/LICENSE.txt</licenseUrl>
1010
<projectUrl>http://www.npgsql.org</projectUrl>
1111
<iconUrl>http://www.npgsql.org/img/postgresql.gif</iconUrl>
1212
<copyright>Copyright 2002 - 2016 Npgsql Development Team</copyright>
@@ -16,7 +16,7 @@
1616
<language>en-US</language>
1717
<tags>npgsql postgresql postgres data database entity framework ef orm</tags>
1818
<dependencies>
19-
<dependency id="Npgsql" version="[$version$]" />
19+
<dependency id="Npgsql" version="3.0.8" />
2020
<dependency id="EntityFramework" version="(,6.0.0)" />
2121
</dependencies>
2222
</metadata>

‎src/EntityFramework5.Npgsql/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Npgsql" version="3.1.0-beta0001" targetFramework="net45" />
4+
</packages>

‎src/EntityFramework5.Npgsql/project.json‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/EntityFramework6.Npgsql/App.config‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5+
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6+
</configSections>
7+
<entityFramework>
8+
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
9+
<parameters>
10+
<parameter value="mssqllocaldb" />
11+
</parameters>
12+
</defaultConnectionFactory>
13+
<providers>
14+
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
15+
</providers>
16+
</entityFramework>
17+
</configuration>

‎src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
1616
<TargetFrameworkProfile />
17-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
18-
<!-- The following stops VS from complaining about runtimes in project.json, see
19-
https://github.com/Microsoft/msbuild/issues/394 -->
20-
<CopyNuGetImplementations>false</CopyNuGetImplementations>
17+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
2118
</PropertyGroup>
2219
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2320
<DebugSymbols>true</DebugSymbols>
2421
<DebugType>full</DebugType>
2522
<Optimize>false</Optimize>
2623
<OutputPath>bin\Debug\</OutputPath>
27-
<DefineConstants>TRACE;DEBUG;NET451;ENTITIES6</DefineConstants>
24+
<DefineConstants>TRACE;DEBUG;NET45;ENTITIES6</DefineConstants>
2825
<ErrorReport>prompt</ErrorReport>
2926
<WarningLevel>4</WarningLevel>
3027
<DocumentationFile>bin\Debug\EntityFramework6.Npgsql.xml</DocumentationFile>
@@ -33,12 +30,24 @@
3330
<DebugType>pdbonly</DebugType>
3431
<Optimize>true</Optimize>
3532
<OutputPath>bin\Release\</OutputPath>
36-
<DefineConstants>TRACE;NET451;ENTITIES6</DefineConstants>
33+
<DefineConstants>TRACE;NET45;ENTITIES6</DefineConstants>
3734
<ErrorReport>prompt</ErrorReport>
3835
<WarningLevel>4</WarningLevel>
3936
<DocumentationFile>bin\Release\EntityFramework6.Npgsql.xml</DocumentationFile>
4037
</PropertyGroup>
4138
<ItemGroup>
39+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
41+
<Private>True</Private>
42+
</Reference>
43+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
45+
<Private>True</Private>
46+
</Reference>
47+
<Reference Include="Npgsql, Version=3.1.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
48+
<HintPath>..\..\packages\Npgsql.3.1.0-beta0001\lib\net45\Npgsql.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
4251
<Reference Include="System" />
4352
<Reference Include="System.Core" />
4453
<Reference Include="System.Data" />
@@ -78,10 +87,8 @@
7887
</Compile>
7988
</ItemGroup>
8089
<ItemGroup>
81-
<ProjectReference Include="..\Npgsql\Npgsql.csproj">
82-
<Project>{9d13b739-62b1-4190-b386-7a9547304eb3}</Project>
83-
<Name>Npgsql</Name>
84-
</ProjectReference>
90+
<None Include="App.config" />
91+
<None Include="packages.config" />
8592
</ItemGroup>
8693
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
87-
</Project>
94+
</Project>

‎src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>EntityFramework6.Npgsql</id>
55
<title>Npgsql for Entity Framework 6</title>
6-
<version>0.0.0</version>
6+
<version>3.0.8</version>
77
<authors>Shay Rojansky, Emil Lenngren, Francisco Figueiredo Jr., Kenji Uno, Jon Asher, John Cooley, Federico Di Gregorio, Jon Hanna, Chris Morgan, Dave Page, Glen Parker, Brar Piening, Hiroshi Saito</authors>
88
<owners>Shay Rojansky, Emil Lenngren, Francisco Figueiredo Jr., Kenji Uno</owners>
9-
<licenseUrl>https://github.com/npgsql/npgsql/blob/develop/LICENSE.txt</licenseUrl>
9+
<licenseUrl>https://github.com/npgsql/EntityFramework6.Npgsql/blob/dev/LICENSE.txt</licenseUrl>
1010
<projectUrl>http://www.npgsql.org</projectUrl>
1111
<iconUrl>http://www.npgsql.org/img/postgresql.gif</iconUrl>
1212
<copyright>Copyright 2002 - 2016 Npgsql Development Team</copyright>
@@ -16,7 +16,7 @@
1616
<language>en-US</language>
1717
<tags>npgsql postgresql postgres data database entity framework ef orm</tags>
1818
<dependencies>
19-
<dependency id="Npgsql" version="[$version$]" />
19+
<dependency id="Npgsql" version="3.0.8" />
2020
<dependency id="EntityFramework" version="6.0.0" />
2121
</dependencies>
2222
</metadata>

0 commit comments

Comments
 (0)