Skip to content

Commit 51649e9

Browse files
rojiroji
committed
Merge branch 'dev'
3.1.0
2 parents aac8342 + 28472b2 commit 51649e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+4184
-694
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ end_of_line = LF
99
[*.cs]
1010
indent_style = space
1111
indent_size = 4
12-
trim_trailing_whitespace = true
12+
; trim_trailing_whitespace = true
1313
insert_final_newline = true

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@
55
*.sln.docstates
66
*.userprefs
77
/*.nupkg
8+
.nuget/
89
[Bb]in/
910
[Bb]uild/
1011
[Oo]bj/
1112
[Oo]bj/
1213
packages/*/
14+
packages.stable
1315
artifacts/
1416
# Roslyn cache directories
1517
*.ide/
18+
*.lock.json
19+
.build
20+
TestResult.xml

‎.teamcity/EntityFramework6Npgsql/buildTypes/EntityFramework6Npgsql_Build.xml

+136
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<name>Build</name>
4+
<description />
5+
<settings>
6+
<parameters />
7+
<build-runners>
8+
<runner id="RUNNER_15" name="Set build number" type="simpleRunner">
9+
<parameters>
10+
<param name="command.executable" value="teamcity_set_version.cmd" />
11+
<param name="command.parameters" value="%build.counter%" />
12+
<param name="teamcity.step.mode" value="default" />
13+
</parameters>
14+
</runner>
15+
<runner id="RUNNER_39" name="NuGet Restore" type="jb.nuget.installer">
16+
<parameters>
17+
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
18+
<param name="nuget.updatePackages.mode" value="sln" />
19+
<param name="nuget.use.restore" value="restore" />
20+
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
21+
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
22+
<param name="sln.path" value="EntityFramework6.Npgsql.sln" />
23+
<param name="teamcity.step.mode" value="default" />
24+
</parameters>
25+
</runner>
26+
<runner id="RUNNER_23" name="Build Debug" type="MSBuild">
27+
<parameters>
28+
<param name="build-file-path" value="EntityFramework6.Npgsql.sln" />
29+
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
30+
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
31+
<param name="dotNetCoverage.NCover.Reg" value="selected" />
32+
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
33+
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
34+
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
35+
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
36+
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
37+
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
38+
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
39+
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
40+
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
41+
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
42+
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
43+
<param name="msbuild_version" value="14.0" />
44+
<param name="run-platform" value="x86" />
45+
<param name="runnerArgs" value="/p:Configuration=Debug" />
46+
<param name="teamcity.step.mode" value="default" />
47+
<param name="toolsVersion" value="14.0" />
48+
</parameters>
49+
</runner>
50+
<runner id="RUNNER_36" name="Test" type="NUnit">
51+
<parameters>
52+
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
53+
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
54+
<param name="dotNetCoverage.NCover.Reg" value="selected" />
55+
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
56+
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
57+
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
58+
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
59+
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
60+
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
61+
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
62+
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
63+
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
64+
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
65+
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
66+
<param name="dotNetTestRunner.Type" value="NUnit" />
67+
<param name="nunit_enabled" value="checked" />
68+
<param name="nunit_environment" value="auto" />
69+
<param name="nunit_include" value="test/EntityFramework6.Npgsql.Tests/bin/Debug/EntityFramework6.Npgsql.Tests.dll" />
70+
<param name="nunit_path" value="C:\dev\nunit-3.2.1\nunit-console\nunit3-console.exe" />
71+
<param name="nunit_platform" value="MSIL" />
72+
<param name="nunit_version" value="NUnit-3.0.0" />
73+
<param name="teamcity.step.mode" value="default" />
74+
</parameters>
75+
</runner>
76+
<runner id="RUNNER_40" name="Build Release" type="MSBuild">
77+
<parameters>
78+
<param name="build-file-path" value="EntityFramework6.Npgsql.sln" />
79+
<param name="dotNetCoverage.NCover.HTMLReport.File.Sort" value="0" />
80+
<param name="dotNetCoverage.NCover.HTMLReport.File.Type" value="1" />
81+
<param name="dotNetCoverage.NCover.Reg" value="selected" />
82+
<param name="dotNetCoverage.NCover.platformBitness" value="x86" />
83+
<param name="dotNetCoverage.NCover.platformVersion" value="v2.0" />
84+
<param name="dotNetCoverage.NCover3.Reg" value="selected" />
85+
<param name="dotNetCoverage.NCover3.args" value="//ias .*" />
86+
<param name="dotNetCoverage.NCover3.platformBitness" value="x86" />
87+
<param name="dotNetCoverage.NCover3.platformVersion" value="v2.0" />
88+
<param name="dotNetCoverage.NCover3.reporter.executable.args" value="//or FullCoverageReport:Html:{teamcity.report.path}" />
89+
<param name="dotNetCoverage.PartCover.Reg" value="selected" />
90+
<param name="dotNetCoverage.PartCover.includes" value="[*]*" />
91+
<param name="dotNetCoverage.PartCover.platformBitness" value="x86" />
92+
<param name="dotNetCoverage.PartCover.platformVersion" value="v2.0" />
93+
<param name="msbuild_version" value="14.0" />
94+
<param name="run-platform" value="x86" />
95+
<param name="runnerArgs" value="/p:Configuration=Release" />
96+
<param name="teamcity.step.mode" value="default" />
97+
<param name="toolsVersion" value="14.0" />
98+
</parameters>
99+
</runner>
100+
<runner id="RUNNER_41" name="NuGet Pack" type="jb.nuget.pack">
101+
<parameters>
102+
<param name="nuget.pack.as.artifact" value="true" />
103+
<param name="nuget.pack.include.sources" value="true" />
104+
<param name="nuget.pack.output.clean" value="true" />
105+
<param name="nuget.pack.output.directory" value="nupkg/" />
106+
<param name="nuget.pack.project.dir" value="as_is" />
107+
<param name="nuget.pack.properties" value="Configuration=Release" />
108+
<param name="nuget.pack.specFile"><![CDATA[src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.nuspec
109+
src/EntityFramework5.Npgsql/EntityFramework5.Npgsql.nuspec]]></param>
110+
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
111+
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
112+
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
113+
<param name="teamcity.step.mode" value="default" />
114+
</parameters>
115+
</runner>
116+
<runner id="RUNNER_38" name="Publish nugets to myget" type="jb.nuget.publish">
117+
<parameters>
118+
<param name="nuget.path" value="?NuGet.CommandLine.DEFAULT" />
119+
<param name="nuget.publish.files" value="nupkg/*.nupkg" />
120+
<param name="nuget.publish.source" value="https://www.myget.org/F/npgsql-unstable" />
121+
<param name="nugetCustomPath" value="?NuGet.CommandLine.DEFAULT" />
122+
<param name="nugetPathSelector" value="?NuGet.CommandLine.DEFAULT" />
123+
<param name="secure:nuget.api.key" value="zxxca89988ce5b6f9ad529c572cd56e162ccda4fdff046b0cdb8bff3560c8e35dcbda3e64637e4ca2f1" />
124+
<param name="teamcity.step.mode" value="default" />
125+
</parameters>
126+
</runner>
127+
</build-runners>
128+
<vcs-settings>
129+
<vcs-entry-ref root-id="EntityFramework6Npgsql_Github" />
130+
</vcs-settings>
131+
<requirements />
132+
<build-triggers />
133+
<cleanup />
134+
</settings>
135+
</build-type>
136+

‎.teamcity/EntityFramework6Npgsql/pluginData/plugin-settings.xml

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

‎.teamcity/EntityFramework6Npgsql/project-config.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<name>EntityFramework6.Npgsql</name>
4+
<description>Entity Framework 6/5 for PostgreSQL</description>
5+
<parameters>
6+
<param name="env.NPGSQL_TEST_DB" value="Server=localhost;Port=5495;User ID=npgsql_tests;Password=npgsql_tests;Database=npgsql_tests_ef6" />
7+
</parameters>
8+
<cleanup />
9+
</project>
10+

‎.teamcity/EntityFramework6Npgsql/vcsRoots/EntityFramework6Npgsql_Github.xml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<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">
3+
<name>https://github.com/npgsql/EntityFramework6.Npgsql.git</name>
4+
<param name="agentCleanFilesPolicy" value="ALL_UNTRACKED" />
5+
<param name="agentCleanPolicy" value="ALWAYS" />
6+
<param name="authMethod" value="PASSWORD" />
7+
<param name="branch" value="dev" />
8+
<param name="ignoreKnownHosts" value="true" />
9+
<param name="secure:password" value="zxx9b1a45147d7e64e7775d03cbe80d301b" />
10+
<param name="submoduleCheckout" value="CHECKOUT" />
11+
<param name="teamcity:branchSpec"><![CDATA[+:refs/heads/(*)
12+
# The following activates building PRs
13+
+:refs/pull/*/merge]]></param>
14+
<param name="url" value="https://github.com/npgsql/EntityFramework6.Npgsql.git" />
15+
<param name="useAlternates" value="true" />
16+
<param name="username" value="npgsql-teamcity" />
17+
<param name="usernameStyle" value="USERID" />
18+
</vcs-root>
19+

‎EntityFramework6.Npgsql.sln

+10-24
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,48 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25123.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "src\EntityFramework5.Npgsql\EntityFramework5.Npgsql.csproj", "{100998C4-5B85-11E3-911C-0022198AB089}"
9-
EndProject
106
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}"
117
ProjectSection(SolutionItems) = preProject
128
CommonAssemblyInfo.cs = CommonAssemblyInfo.cs
139
Npgsql.snk = Npgsql.snk
1410
EndProjectSection
1511
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
1713
EndProject
18-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEDE5FBC-717B-460F-9970-26A275F1E061}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
1915
EndProject
20-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A27CECA5-F398-48F8-BE64-9CB2E1507F1F}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql", "src\EntityFramework6.Npgsql\EntityFramework6.Npgsql.csproj", "{3EC85CBA-5B79-11E3-8104-0022198AB089}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework5.Npgsql", "src\EntityFramework5.Npgsql\EntityFramework5.Npgsql.csproj", "{100998C4-5B85-11E3-911C-0022198AB089}"
19+
EndProject
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EntityFramework6.Npgsql.Tests", "test\EntityFramework6.Npgsql.Tests\EntityFramework6.Npgsql.Tests.csproj", "{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}"
2121
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2424
Debug|Any CPU = Debug|Any CPU
25-
Debug|x86 = Debug|x86
2625
Release|Any CPU = Release|Any CPU
27-
Release|x86 = Release|x86
2826
EndGlobalSection
2927
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3028
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3129
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|x86.ActiveCfg = Debug|Any CPU
33-
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Debug|x86.Build.0 = Debug|Any CPU
3430
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
3531
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|Any CPU.Build.0 = Release|Any CPU
36-
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|x86.ActiveCfg = Release|Any CPU
37-
{3EC85CBA-5B79-11E3-8104-0022198AB089}.Release|x86.Build.0 = Release|Any CPU
3832
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3933
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|Any CPU.Build.0 = Debug|Any CPU
40-
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|x86.ActiveCfg = Debug|Any CPU
41-
{100998C4-5B85-11E3-911C-0022198AB089}.Debug|x86.Build.0 = Debug|Any CPU
4234
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.ActiveCfg = Release|Any CPU
4335
{100998C4-5B85-11E3-911C-0022198AB089}.Release|Any CPU.Build.0 = Release|Any CPU
44-
{100998C4-5B85-11E3-911C-0022198AB089}.Release|x86.ActiveCfg = Release|Any CPU
45-
{100998C4-5B85-11E3-911C-0022198AB089}.Release|x86.Build.0 = Release|Any CPU
4636
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4737
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|x86.ActiveCfg = Debug|Any CPU
49-
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Debug|x86.Build.0 = Debug|Any CPU
5038
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
5139
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|Any CPU.Build.0 = Release|Any CPU
52-
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|x86.ActiveCfg = Release|Any CPU
53-
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4}.Release|x86.Build.0 = Release|Any CPU
5440
EndGlobalSection
5541
GlobalSection(SolutionProperties) = preSolution
5642
HideSolutionNode = FALSE
5743
EndGlobalSection
5844
GlobalSection(NestedProjects) = preSolution
59-
{3EC85CBA-5B79-11E3-8104-0022198AB089} = {EEDE5FBC-717B-460F-9970-26A275F1E061}
60-
{100998C4-5B85-11E3-911C-0022198AB089} = {EEDE5FBC-717B-460F-9970-26A275F1E061}
61-
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {A27CECA5-F398-48F8-BE64-9CB2E1507F1F}
45+
{3EC85CBA-5B79-11E3-8104-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
46+
{100998C4-5B85-11E3-911C-0022198AB089} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
47+
{4A0A42DE-C8B8-11E4-8EC9-005056A163A4} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
6248
EndGlobalSection
6349
GlobalSection(MonoDevelopProperties) = preSolution
6450
StartupItem = Npgsql.csproj

0 commit comments

Comments
 (0)