Skip to content

Commit

Permalink
Merge branch 'master' into 2.5.0-alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
say25 committed Aug 27, 2019
2 parents 7e57ff7 + a355952 commit 7c67a80
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<Product />
<Description>A library for Bulk Copy / Bulk Inserts with PostgreSQL.</Description>
<PackageTags>postgresql, bulk insert</PackageTags>
<RepositoryUrl>git://github.com/bytefish/PostgreSQLCopyHelper</RepositoryUrl>
<PackageProjectUrl>https://github.com/bytefish/PostgreSQLCopyHelper</PackageProjectUrl>
<RepositoryUrl>git://github.com/PostgreSQLCopyHelper/PostgreSQLCopyHelper</RepositoryUrl>
<PackageProjectUrl>https://github.com/PostgreSQLCopyHelper/PostgreSQLCopyHelper</PackageProjectUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<Copyright>Copyright © 2019 Philipp Wagner</Copyright>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
Expand All @@ -24,4 +24,4 @@
<PackageReference Include="Npgsql" Version="4.1.0-preview1" />
</ItemGroup>

</Project>
</Project>
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# PostgreSQLCopyHelper #

[![Build Status](https://dev.azure.com/PostgreSqlCopyHelper/PostgreSQLCopyHelper/_apis/build/status/postgresqlcopyhelper.PostgreSQLCopyHelper?branchName=master)](https://dev.azure.com/PostgreSqlCopyHelper/PostgreSQLCopyHelper/_build/latest?definitionId=1&branchName=master)
[![stable](https://img.shields.io/nuget/v/PostgreSQLCopyHelper.svg?label=stable)](https://www.nuget.org/packages/PostgreSQLCopyHelper/)
[![prerelease](https://img.shields.io/nuget/vpre/PostgreSQLCopyHelper.svg?label=prerelease)](https://www.nuget.org/packages/PostgreSQLCopyHelper/)

Expand Down Expand Up @@ -88,7 +89,7 @@ private ulong WriteToDatabase(PostgreSQLCopyHelper<TestEntity> copyHelper, IEnum
{
connection.Open();

// Returns count of rows written
// Returns count of rows written
return copyHelper.SaveAll(connection, entities);
}
}
Expand All @@ -110,4 +111,4 @@ var copyHelper = new PostgreSQLCopyHelper<MixedCaseEntity>("sample", "MixedCaseE

PostgreSQLCopyHelper is licensed under the MIT License. See [LICENSE](LICENSE) for details.

Copyright (c) [Philipp Wagner](https://github.com/bytefish), [Steven Yeh](https://github.com/say25) and [Contributors](https://github.com/bytefish/PostgreSQLCopyHelper/graphs/contributors)
Copyright (c) Philipp Wagner, Steven Yeh and [Contributors](https://github.com/PostgreSQLCopyHelper/PostgreSQLCopyHelper/graphs/contributors)
79 changes: 79 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
resources:
containers:
- container: postgres_11
image: npgsql/postgres:11
options: '--volume /var/run/postgresql:/var/run/postgresql'
ports:
- 5432:5432

# - container: postgres_10
# image: npgsql/postgres:10
# options: '--volume /var/run/postgresql:/var/run/postgresql'
# ports:
# - 5432:5432

# - container: postgres_9_6
# image: npgsql/postgres:9.6
# options: '--volume /var/run/postgresql:/var/run/postgresql'
# ports:
# - 5432:5432

variables:
buildConfiguration: 'Release'
DOTNET_SDK_VERSION: 2.x

jobs:

- job: Linux

pool:
vmImage: 'ubuntu-16.04'

strategy:
matrix:
postgres_11:
postgres_service: postgres_11

# postgres_10:
# postgres_service: postgres_10

# postgres_9_6:
# postgres_service: postgres_9_6

services:
postgres: $[variables['postgres_service']]

steps:
- task: DotNetCoreInstaller@1
displayName: 'Install .NET Core SDK'
inputs:
packageType: 'sdk'
version: '$(DOTNET_SDK_VERSION)'

# - task: DotNetCoreCLI@2
# displayName: 'Test'
# inputs:
# command: 'test'
# configuration: $(buildConfiguration)
# projects: '**/*Test.csproj'
# publishTestResults: true

- job: Windows

pool:
vmImage: 'windows-latest'

steps:
- task: DotNetCoreInstaller@1
displayName: 'Install .NET Core SDK'
inputs:
packageType: 'sdk'
version: '$(DOTNET_SDK_VERSION)'

# - task: DotNetCoreCLI@2
# displayName: 'Test'
# inputs:
# command: 'test'
# configuration: $(buildConfiguration)
# projects: '**/*Test.csproj'
# publishTestResults: true

0 comments on commit 7c67a80

Please sign in to comment.