Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
3.1.0
  • Loading branch information
roji committed May 23, 2016
2 parents aac8342 + 28472b2 commit 51649e9
Show file tree
Hide file tree
Showing 46 changed files with 4,184 additions and 694 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ end_of_line = LF
[*.cs]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
; trim_trailing_whitespace = true
insert_final_newline = true
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
*.sln.docstates
*.userprefs
/*.nupkg
.nuget/
[Bb]in/
[Bb]uild/
[Oo]bj/
[Oo]bj/
packages/*/
packages.stable
artifacts/
# Roslyn cache directories
*.ide/
*.lock.json
.build
TestResult.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
<?xml version="1.0" encoding="UTF-8"?>
<build-type xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="e94e99e3-b0bb-4147-b412-a0129ee64005" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
<name>Build</name>
<description />
<settings>
<parameters />
<build-runners>
<runner id="RUNNER_15" name="Set build number" type="simpleRunner">
<parameters>
<param name="command.executable" value="teamcity_set_version.cmd" />
<param name="command.parameters" value="%build.counter%" />
<param name="teamcity.step.mode" value="default" />
</parameters>
</runner>
<runner id="RUNNER_39" name="NuGet Restore" type="jb.nuget.installer">
<parameters>
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
<param name="nuget.updatePackages.mode" value="sln" />
<param name="nuget.use.restore" value="restore" />
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
<param name="sln.path" value="EntityFramework6.Npgsql.sln" />
<param name="teamcity.step.mode" value="default" />
</parameters>
</runner>
<runner id="RUNNER_23" name="Build Debug" type="MSBuild">
<parameters>
<param name="build-file-path" value="EntityFramework6.Npgsql.sln" />
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
<param name="dotNetCoverage.NCover.Reg" value="selected" />
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
<param name="msbuild_version" value="14.0" />
<param name="run-platform" value="x86" />
<param name="runnerArgs" value="/p:Configuration=Debug" />
<param name="teamcity.step.mode" value="default" />
<param name="toolsVersion" value="14.0" />
</parameters>
</runner>
<runner id="RUNNER_36" name="Test" type="NUnit">
<parameters>
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
<param name="dotNetCoverage.NCover.Reg" value="selected" />
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
<param name="dotNetTestRunner.Type" value="NUnit" />
<param name="nunit_enabled" value="checked" />
<param name="nunit_environment" value="auto" />
<param name="nunit_include" value="test/EntityFramework6.Npgsql.Tests/bin/Debug/EntityFramework6.Npgsql.Tests.dll" />
<param name="nunit_path" value="C:\dev\nunit-3.2.1\nunit-console\nunit3-console.exe" />
<param name="nunit_platform" value="MSIL" />
<param name="nunit_version" value="NUnit-3.0.0" />
<param name="teamcity.step.mode" value="default" />
</parameters>
</runner>
<runner id="RUNNER_40" name="Build Release" type="MSBuild">
<parameters>
<param name="build-file-path" value="EntityFramework6.Npgsql.sln" />
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
<param name="dotNetCoverage.NCover.Reg" value="selected" />
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
<param name="msbuild_version" value="14.0" />
<param name="run-platform" value="x86" />
<param name="runnerArgs" value="/p:Configuration=Release" />
<param name="teamcity.step.mode" value="default" />
<param name="toolsVersion" value="14.0" />
</parameters>
</runner>
<runner id="RUNNER_41" name="NuGet Pack" type="jb.nuget.pack">
<parameters>
<param name="nuget.pack.as.artifact" value="true" />
<param name="nuget.pack.include.sources" value="true" />
<param name="nuget.pack.output.clean" value="true" />
<param name="nuget.pack.output.directory" value="nupkg/" />
<param name="nuget.pack.project.dir" value="as_is" />
<param name="nuget.pack.properties" value="Configuration=Release" />
<param name="nuget.pack.specFile"><![CDATA[src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec
src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.nuspec]]></param>
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
<param name="teamcity.step.mode" value="default" />
</parameters>
</runner>
<runner id="RUNNER_38" name="Publish nugets to myget" type="jb.nuget.publish">
<parameters>
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
<param name="nuget.publish.files" value="nupkg/*.nupkg" />
<param name="nuget.publish.source" value="https://www.myget.org/F/npgsql-unstable" />
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
<param name="secure:nuget.api.key" value="zxxca89988ce5b6f9ad529c572cd56e162ccda4fdff046b0cdb8bff3560c8e35dcbda3e64637e4ca2f1" />
<param name="teamcity.step.mode" value="default" />
</parameters>
</runner>
</build-runners>
<vcs-settings>
<vcs-entry-ref root-id="EntityFramework6Npgsql_Github" />
</vcs-settings>
<requirements />
<build-triggers />
<cleanup />
</settings>
</build-type>

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<versionedSettings rootId="EntityFramework6Npgsql_Github" enabled="true" showChanges="false" buildSettings="PREFER_VCS" />
</settings>

10 changes: 10 additions & 0 deletions .teamcity/EntityFramework6Npgsql/project-config.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="09eb5dd5-0a39-4df3-b923-f38bf144d668" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
<name>EntityFramework6.Npgsql</name>
<description>Entity Framework 6/5 for PostgreSQL</description>
<parameters>
<param name="env.NPGSQL_TEST_DB" value="Server=localhost;Port=5495;User ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests_ef6" />
</parameters>
<cleanup />
</project>

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<vcs-root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" uuid="bcf84c85-91ad-4ae5-b5cd-122f1b9145d8" type="jetbrains.git" xsi:noNamespaceSchemaLocation="http://www.jetbrains.com/teamcity/schemas/9.0/project-config.xsd">
<name>https://github.com/npgsql/EntityFramework6.Npgsql.git</name>
<param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
<param name="agentCleanPolicy" value="ALWAYS" />
<param name="authMethod" value="PASSWORD" />
<param name="branch" value="dev" />
<param name="ignoreKnownHosts" value="true" />
<param name="secure:password" value="zxx9b1a45147d7e64e7775d03cbe80d301b" />
<param name="submoduleCheckout" value="CHECKOUT" />
<param name="teamcity:branchSpec"><![CDATA[+:refs/heads/(*)
# The following activates building PRs
+:refs/pull/*/merge]]></param>
<param name="url" value="https://github.com/npgsql/EntityFramework6.Npgsql.git" />
<param name="useAlternates" value="true" />
<param name="username" value="npgsql-teamcity" />
<param name="usernameStyle" value="USERID" />
</vcs-root>

34 changes: 10 additions & 24 deletions EntityFramework6.Npgsql.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,62 +3,48 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "src\EntityFramework5.Npgsql\EntityFramework5.Npgsql.csproj", "{100998C4-5B85-11E3-911C-0022198AB089}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}"
ProjectSection(SolutionItems) = preProject
CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
Npgsql.snk = Npgsql.snk
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEDE5FBC-717B-460F-9970-26A275F1E061}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A27CECA5-F398-48F8-BE64-9CB2E1507F1F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "src\EntityFramework5.Npgsql\EntityFramework5.Npgsql.csproj", "{100998C4-5B85-11E3-911C-0022198AB089}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|x86.ActiveCfg = Debug|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|x86.Build.0 = Debug|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|Any CPU.Build.0 = Release|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|x86.ActiveCfg = Release|Any CPU
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|x86.Build.0 = Release|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|x86.ActiveCfg = Debug|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|x86.Build.0 = Debug|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.Build.0 = Release|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Release|x86.ActiveCfg = Release|Any CPU
{100998C4-5B85-11E3-911C-0022198AB089}.Release|x86.Build.0 = Release|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|x86.ActiveCfg = Debug|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|x86.Build.0 = Debug|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.Build.0 = Release|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|x86.ActiveCfg = Release|Any CPU
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{3EC85CBA-5B79-11E3-8104-0022198AB089} = {EEDE5FBC-717B-460F-9970-26A275F1E061}
{100998C4-5B85-11E3-911C-0022198AB089} = {EEDE5FBC-717B-460F-9970-26A275F1E061}
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {A27CECA5-F398-48F8-BE64-9CB2E1507F1F}
{3EC85CBA-5B79-11E3-8104-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{100998C4-5B85-11E3-911C-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Npgsql.csproj
Expand Down
Loading

0 comments on commit 51649e9

Please sign in to comment.