Skip to content

Commit b3865b5

Browse files
rojiroji
committed
Merge branch 'dev' (release 2.1)
2 parents f651b8a + c3b3cf9 commit b3865b5

381 files changed

Lines changed: 24004 additions & 8096 deletions

File tree

Some content is hidden

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

‎.appveyor.yml‎

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,47 @@
1-
image: Visual Studio 2017 Preview
2-
version: 2.0.2-{build}
1+
image: Visual Studio 2017
2+
version: 2.1.0-{build}
33
services:
4-
- postgresql
4+
- postgresql101
55
environment:
66
global:
77
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
88
DOTNET_CLI_TELEMETRY_OPTOUT: 1
99
Test__Npgsql__DefaultConnection: Host=localhost;Database=postgres;Username=postgres;Password=Password12!
10+
PGUSER: postgres
11+
PGPASSWORD: Password12!
12+
POSTGIS_EXE: postgis-bundle-pg10x64-setup-2.4.4-1.exe
13+
NoPackageAnalysis: true # Suppresses warning about SemVer 2.0.0 version suffixes when packing
1014
cache:
1115
- '%USERPROFILE%\.nuget\packages -> **\*.csproj'
12-
shallow_clone: true
16+
- $(POSTGIS_EXE)
17+
clone_depth: 10
1318
install:
14-
- ps: $env:padded_build_number = $env:appveyor_build_number.PadLeft(5, '0')
19+
- powershell .build\setup_appveyor.ps1
1520
# Install .NET Core 2.0
1621
- ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
17-
- ps: .\install-dotnet.ps1 -Version 2.0.0
22+
- ps: .\install-dotnet.ps1 -Version 2.1.300-rc1-008673
23+
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
1824
before_build:
19-
- dotnet --info
2025
- appveyor-retry dotnet restore -v Minimal
2126
build_script:
22-
- msbuild /p:Configuration=Debug
23-
- msbuild /p:Configuration=Release
24-
- dotnet pack src\EFCore.PG\EFCore.PG.csproj -c Release --version-suffix ci-%PADDED_BUILD_NUMBER%
27+
- dotnet pack src\EFCore.PG\EFCore.PG.csproj -c Release
28+
- dotnet pack src\EFCore.PG.NodaTime\EFCore.PG.NodaTime.csproj -c Release
29+
- dotnet pack src\EFCore.PG.NTS\EFCore.PG.NTS.csproj -c Release
2530
test_script:
2631
- dotnet test test\EFCore.PG.Tests\EFCore.PG.Tests.csproj
2732
- dotnet test test\EFCore.PG.FunctionalTests\EFCore.PG.FunctionalTests.csproj
28-
- dotnet test test\EFCore.PG.Design.FunctionalTests\EFCore.PG.Design.FunctionalTests.csproj
2933
artifacts:
30-
- path: 'src\EFCore.PG\bin\**\*.nupkg'
34+
- path: 'src\**\*.nupkg'
3135
deploy:
32-
- provider: NuGet
33-
server: https://www.myget.org/F/npgsql/api/v2/package
34-
api_key:
35-
secure: kiMn9uBvgMa5EtEmTIhNBFUfyatiATnhkgx5Xj/1EsmKTtEkUv+hJAQs0L3VGzPw
36-
artifact: /.*\.nupkg/
37-
skip_symbols: true
38-
#skip_symbols: false
39-
#symbol_server: https://your.symbol.server/feed
40-
36+
- provider: Environment
37+
name: MyGet Unstable
38+
on:
39+
deploy_myget_unstable: true
40+
- provider: Environment
41+
name: MyGet Stable
42+
on:
43+
deploy_myget_stable: true
44+
- provider: Environment
45+
name: EFCore.PG Github
46+
on:
47+
deploy_github_release: true

‎.build/setup_appveyor.ps1‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
###################
2+
### Setup PostgreSQL
3+
####################
4+
5+
Write-Host Enabling PostGIS...
6+
If (!(Test-Path $env:POSTGIS_EXE)) {
7+
Write-Host Downloading PostGIS...
8+
(New-Object Net.WebClient).DownloadFile("http://download.osgeo.org/postgis/windows/pg10/$env:POSTGIS_EXE", "$env:POSTGIS_EXE")
9+
}
10+
iex ".\$env:POSTGIS_EXE /S /D='C:\Program Files\PostgreSQL\10'"
11+
12+
########################
13+
## Set version variables
14+
########################
15+
16+
Set-Variable -Name TruncatedSha1 -Value $env:APPVEYOR_REPO_COMMIT.subString(0, 9)
17+
18+
if ($env:APPVEYOR_REPO_TAG -eq 'true' -and $env:APPVEYOR_REPO_TAG_NAME -match '^v\d+\.\d+\.\d+')
19+
{
20+
Write-Host "Release tag detected ($env:APPVEYOR_REPO_TAG_NAME), no version suffix is set."
21+
Set-AppveyorBuildVariable -Name deploy_github_release -Value true
22+
}
23+
#elseif (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)
24+
#{
25+
# Set-AppveyorBuildVariable -Name deploy_myget_unstable -Value true
26+
# Set-Variable -Name VersionSuffix -Value "pr$($env:APPVEYOR_PULL_REQUEST_NUMBER).$($env:APPVEYOR_BUILD_NUMBER)+sha.$TruncatedSha1"
27+
# Write-Host "Pull request detected (#$env:APPVEYOR_PULL_REQUEST_NUMBER), setting version suffix to $VersionSuffix"
28+
# Set-AppveyorBuildVariable -Name VersionSuffix -Value $VersionSuffix
29+
#}
30+
else
31+
{
32+
# Set which myget feed we deploy to
33+
if ($env:APPVEYOR_REPO_BRANCH.StartsWith("hotfix/")) {
34+
Set-AppveyorBuildVariable -Name deploy_myget_stable -Value true
35+
} else {
36+
Set-AppveyorBuildVariable -Name deploy_myget_unstable -Value true
37+
}
38+
39+
Set-Variable -Name VersionSuffix -Value "ci.$($env:APPVEYOR_BUILD_NUMBER)+sha.$TruncatedSha1"
40+
Write-Host "Setting version suffix to $VersionSuffix"
41+
Set-AppveyorBuildVariable -Name VersionSuffix -Value $VersionSuffix
42+
}

‎.editorconfig‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
; Top-most EditorConfig file
21
root = true
32

4-
; Unix-style newlines
53
[*]
64
end_of_line = LF
75

8-
; 4-column space indentation
96
[*.cs]
107
indent_style = space
118
indent_size = 4
12-
; trim_trailing_whitespace = true
9+
trim_trailing_whitespace = true
1310
insert_final_newline = true
1411

1512
[*.cs]

‎.gitignore‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,13 @@
66
*.userprefs
77
/*.nupkg
88
.nuget/
9+
.idea/
910
.vs/
1011
[Bb]in/
1112
[Bb]uild/
1213
[Oo]bj/
1314
[Oo]bj/
14-
packages/*/
15-
packages.stable
1615
artifacts/
1716
# Roslyn cache directories
1817
*.ide/
19-
*.lock.json
20-
.build
2118
TestResult.xml

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ solution: EFCore.PG.sln
33
dist: trusty
44
sudo: false
55
mono: none
6-
dotnet: 2.0.0
6+
dotnet: 2.1.300-rc1-008673
77

88
services:
99
- postgresql
@@ -14,11 +14,11 @@ env:
1414
- Test__Npgsql__DefaultConnection: '"Host=localhost;Database=postgres;Username=postgres;Password="'
1515

1616
before_script:
17+
- psql -c 'CREATE EXTENSION hstore'
1718
- dotnet restore -v Minimal
1819
script:
1920
- dotnet test test/EFCore.PG.Tests/EFCore.PG.Tests.csproj
2021
- dotnet test test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj
21-
- dotnet test test/EFCore.PG.Design.FunctionalTests/EFCore.PG.Design.FunctionalTests.csproj
2222

2323
cache:
2424
directories:

‎EFCore.PG.sln‎

Lines changed: 46 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26621.2
3+
VisualStudioVersion = 15.0.27130.2026
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}"
66
ProjectSection(SolutionItems) = preProject
@@ -18,7 +18,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Tests", "test\EFC
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.FunctionalTests", "test\EFCore.PG.FunctionalTests\EFCore.PG.FunctionalTests.csproj", "{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}"
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Design.FunctionalTests", "test\EFCore.PG.Design.FunctionalTests\EFCore.PG.Design.FunctionalTests.csproj", "{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}"
21+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NTS", "src\EFCore.PG.NTS\EFCore.PG.NTS.csproj", "{78E89DB4-233B-4F93-A405-A1849D8B1A85}"
22+
EndProject
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.Plugins.FunctionalTests", "test\EFCore.PG.Plugins.FunctionalTests\EFCore.PG.Plugins.FunctionalTests.csproj", "{B78A7825-BE72-4509-B0AD-01EEC67A9624}"
24+
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NodaTime", "src\EFCore.PG.NodaTime\EFCore.PG.NodaTime.csproj", "{77F0608F-6D0C-481C-9108-D5176E2EAD69}"
2226
EndProject
2327
Global
2428
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -54,14 +58,42 @@ Global
5458
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|Any CPU.Build.0 = Release|Any CPU
5559
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x64.ActiveCfg = Release|Any CPU
5660
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x86.ActiveCfg = Release|Any CPU
57-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
58-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
59-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Debug|x64.ActiveCfg = Debug|Any CPU
60-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Debug|x86.ActiveCfg = Debug|Any CPU
61-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Release|x64.ActiveCfg = Release|Any CPU
64-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}.Release|x86.ActiveCfg = Release|Any CPU
61+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
62+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|Any CPU.Build.0 = Debug|Any CPU
63+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x64.ActiveCfg = Debug|Any CPU
64+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x64.Build.0 = Debug|Any CPU
65+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x86.ActiveCfg = Debug|Any CPU
66+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x86.Build.0 = Debug|Any CPU
67+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|Any CPU.Build.0 = Release|Any CPU
69+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x64.ActiveCfg = Release|Any CPU
70+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x64.Build.0 = Release|Any CPU
71+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x86.ActiveCfg = Release|Any CPU
72+
{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x86.Build.0 = Release|Any CPU
73+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|x64.ActiveCfg = Debug|Any CPU
76+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|x64.Build.0 = Debug|Any CPU
77+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|x86.ActiveCfg = Debug|Any CPU
78+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|x86.Build.0 = Debug|Any CPU
79+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|x64.ActiveCfg = Release|Any CPU
82+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|x64.Build.0 = Release|Any CPU
83+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|x86.ActiveCfg = Release|Any CPU
84+
{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Release|x86.Build.0 = Release|Any CPU
85+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
86+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|Any CPU.Build.0 = Debug|Any CPU
87+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x64.ActiveCfg = Debug|Any CPU
88+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x64.Build.0 = Debug|Any CPU
89+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x86.ActiveCfg = Debug|Any CPU
90+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x86.Build.0 = Debug|Any CPU
91+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|Any CPU.ActiveCfg = Release|Any CPU
92+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|Any CPU.Build.0 = Release|Any CPU
93+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x64.ActiveCfg = Release|Any CPU
94+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x64.Build.0 = Release|Any CPU
95+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.ActiveCfg = Release|Any CPU
96+
{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.Build.0 = Release|Any CPU
6597
EndGlobalSection
6698
GlobalSection(SolutionProperties) = preSolution
6799
HideSolutionNode = FALSE
@@ -70,7 +102,9 @@ Global
70102
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
71103
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
72104
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
73-
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
105+
{78E89DB4-233B-4F93-A405-A1849D8B1A85} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
106+
{B78A7825-BE72-4509-B0AD-01EEC67A9624} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
107+
{77F0608F-6D0C-481C-9108-D5176E2EAD69} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
74108
EndGlobalSection
75109
GlobalSection(ExtensibilityGlobals) = postSolution
76110
SolutionGuid = {F4EAAE6D-758C-4184-9D8C-7113384B61A8}

‎EFCore.PG.sln.DotSettings‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,17 @@
22
<s:Boolean x:Key="/Default/CodeInspection/ImplicitNullability/Enabled/@EntryValue">True</s:Boolean>
33
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
44
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_CASE_FROM_SWITCH/@EntryValue">False</s:Boolean>
5+
<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
56
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
67
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
78
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EF/@EntryIndexedValue">EF</s:String>
9+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OID/@EntryIndexedValue">OID</s:String>
10+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
11+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
12+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
13+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
814
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
15+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
916
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
1017
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
1118
</wpf:ResourceDictionary>

‎NuGet.Config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</packageRestore>
66
<packageSources>
77
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
8-
<add key="AspNetCoreRelease" value="https://dotnet.myget.org/f/aspnetcore-release" />
8+
<add key="NetTopologySuite" value="https://www.myget.org/F/nettopologysuite/api/v3/index.json" />
99
</packageSources>
1010
</configuration>

0 commit comments

Comments
 (0)