Skip to content

Commit a3603a6

Browse files
rojiroji
committed
Merge branch 'dev'
2 parents a3132b9 + a171c96 commit a3603a6

335 files changed

Lines changed: 8506 additions & 7720 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: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
image: Visual Studio 2017 Preview
2+
version: 2.0.0-{build}
3+
services:
4+
- postgresql
5+
environment:
6+
global:
7+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
8+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
9+
Test__Npgsql__DefaultConnection: Host=localhost;Database=postgres;Username=postgres;Password=Password12!
10+
cache:
11+
- '%USERPROFILE%\.nuget\packages -> **\*.csproj'
12+
shallow_clone: true
13+
install:
14+
- ps: $env:padded_build_number = $env:appveyor_build_number.PadLeft(5, '0')
15+
# Install .NET Core 2.0
16+
- 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
18+
before_build:
19+
- dotnet --info
20+
- appveyor-retry dotnet restore -v Minimal
21+
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%
25+
test_script:
26+
- cd test\EFCore.PG.Tests && dotnet xunit && cd ..\..\
27+
- cd test\EFCore.PG.FunctionalTests && dotnet xunit && cd ..\..\
28+
- cd test\EFCore.PG.Design.FunctionalTests && dotnet xunit && cd ..\..\
29+
artifacts:
30+
- path: 'src\EFCore.PG\bin\**\*.nupkg'
31+
- path: 'src\EFCore.PG.Design\bin\**\*.nupkg'
32+
deploy:
33+
- provider: NuGet
34+
server: https://www.myget.org/F/npgsql-unstable/api/v2/package
35+
api_key:
36+
secure: kiMn9uBvgMa5EtEmTIhNBFUfyatiATnhkgx5Xj/1EsmKTtEkUv+hJAQs0L3VGzPw
37+
artifact: /.*\.nupkg/
38+
skip_symbols: true
39+
#skip_symbols: false
40+
#symbol_server: https://your.symbol.server/feed
41+

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/buildTypes/NpgsqlEntityFrameworkCorePostgreSQL_Build.xml‎

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

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

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

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/project-config.xml‎

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

‎.teamcity/NpgsqlEntityFrameworkCorePostgreSQL/vcsRoots/NpgsqlEntityFrameworkCorePostgreSQL_Github.xml‎

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

‎.travis.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
language: csharp
2+
solution: EFCore.PG.sln
3+
dist: trusty
4+
sudo: false
5+
mono: none
6+
dotnet: 2.0.0
7+
8+
services:
9+
- postgresql
10+
addons:
11+
postgresql: "9.6"
12+
13+
env:
14+
- Test__Npgsql__DefaultConnection: '"Host=localhost;Database=postgres;Username=postgres;Password="'
15+
16+
before_script:
17+
- dotnet restore -v Minimal
18+
script:
19+
- cd test/EFCore.PG.Tests && dotnet xunit -framework netcoreapp2.0 && cd ../../
20+
- cd test/EFCore.PG.FunctionalTests && dotnet xunit -framework netcoreapp2.0 && cd ../../
21+
- cd test/EFCore.PG.Design.FunctionalTests && dotnet xunit -framework netcoreapp2.0 && cd ../../
22+
23+
cache:
24+
directories:
25+
- $HOME/.nuget/packages
26+

Npgsql.EntityFrameworkCore.PostgreSQL.sln renamed to EFCore.PG.sln

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26206.0
3+
VisualStudioVersion = 15.0.26621.2
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
@@ -12,15 +12,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7
1212
EndProject
1313
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
1414
EndProject
15-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.EntityFrameworkCore.PostgreSQL", "src\Npgsql.EntityFrameworkCore.PostgreSQL\Npgsql.EntityFrameworkCore.PostgreSQL.csproj", "{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}"
15+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG", "src\EFCore.PG\EFCore.PG.csproj", "{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}"
1616
EndProject
17-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Design", "src\Npgsql.EntityFrameworkCore.PostgreSQL.Design\Npgsql.EntityFrameworkCore.PostgreSQL.Design.csproj", "{8EDCED17-2D1D-45BE-9B61-0F715876DA94}"
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Tests", "test\EFCore.PG.Tests\EFCore.PG.Tests.csproj", "{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}"
1818
EndProject
19-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Tests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.Tests\Npgsql.EntityFrameworkCore.PostgreSQL.Tests.csproj", "{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}"
19+
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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests\Npgsql.EntityFrameworkCore.PostgreSQL.FunctionalTests.csproj", "{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}"
22-
EndProject
23-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests", "test\Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests\Npgsql.EntityFrameworkCore.PostgreSQL.Design.FunctionalTests.csproj", "{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC}"
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}"
2422
EndProject
2523
Global
2624
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -40,14 +38,6 @@ Global
4038
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|Any CPU.Build.0 = Release|Any CPU
4139
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|x64.ActiveCfg = Release|Any CPU
4240
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|x86.ActiveCfg = Release|Any CPU
43-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Debug|x64.ActiveCfg = Debug|Any CPU
46-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Debug|x86.ActiveCfg = Debug|Any CPU
47-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Release|x64.ActiveCfg = Release|Any CPU
50-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94}.Release|x86.ActiveCfg = Release|Any CPU
5141
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5242
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
5343
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -78,11 +68,13 @@ Global
7868
EndGlobalSection
7969
GlobalSection(NestedProjects) = preSolution
8070
{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
81-
{8EDCED17-2D1D-45BE-9B61-0F715876DA94} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
8271
{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
8372
{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
8473
{1410D291-C519-4E74-AE3D-6BC6C4A7C1DC} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
8574
EndGlobalSection
75+
GlobalSection(ExtensibilityGlobals) = postSolution
76+
SolutionGuid = {F4EAAE6D-758C-4184-9D8C-7113384B61A8}
77+
EndGlobalSection
8678
GlobalSection(MonoDevelopProperties) = preSolution
8779
StartupItem = Npgsql.csproj
8880
EndGlobalSection

Npgsql.EntityFrameworkCore.PostgreSQL.sln.DotSettings renamed to EFCore.PG.sln.DotSettings

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_CASE_FROM_SWITCH/@EntryValue">False</s:Boolean>
55
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_AFTER_TYPECAST_PARENTHESES/@EntryValue">False</s:Boolean>
66
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
7+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EF/@EntryIndexedValue">EF</s:String>
78
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
89
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
910
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

‎NuGet.Config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +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" />
89
</packageSources>
910
</configuration>

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Npgsql Entity Framework Core provider for PostgreSQL
22
=============
33

44
Npgsql.EntityFrameworkCore.PostgreSQL is an Entity Framework Core provider built on top of
5-
[Npgsql](https://github.com/npgsql/npgsql). It allows you to use the EF Core ORM with
5+
[Npgsql](https://github.com/npgsql/npgsql). It allows you to use the EF Core O/RM with
66
PostreSQL.
77

8-
Note that beta packages are available for for dotnet RC1, and RC2 work is in progress.
8+
Documentation is available on [the Npgsql site](http://www.npgsql.org/efcore/index.html).

0 commit comments

Comments
 (0)