Skip to content
Permalink
Browse files

Merge branch 'hotfix/4.1.1'

  • Loading branch information...
roji committed Oct 2, 2019
2 parents 9c1a1d5 + 6577dce commit ea70865ac6c3d5312af8acc80e2fd04121586290
Showing 394 changed files with 13,545 additions and 21,028 deletions.
@@ -1,13 +1,13 @@
image: Visual Studio 2017
version: 4.0.8-{build}
image: Visual Studio 2019 Preview
version: 4.1.1-{build}
environment:
global:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: 1
NPGSQL_TEST_DB: Host=localhost;Database=postgres;Username=postgres;Password=Password12!
PGUSER: postgres
PGPASSWORD: Password12!
POSTGIS_EXE: postgis-bundle-pg10x64-setup-2.5.1-1.exe
POSTGIS_EXE: postgis-bundle-pg11x64-setup-2.5.3-1.exe
NoPackageAnalysis: true # Suppresses warning about SemVer 2.0.0 version suffixes when packing
cache:
- '%USERPROFILE%\.nuget\packages -> **\*.csproj'
@@ -16,29 +16,39 @@ cache:
clone_depth: 10
install:
- powershell .build\setup_appveyor.ps1
# The following can be used to install a custom version of .NET Core
- ps: Invoke-WebRequest -Uri "https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1" -OutFile "install-dotnet.ps1"
- ps: .\install-dotnet.ps1 -Version 3.0.100 -InstallDir "dotnetcli"
services:
- postgresql101
- postgresql111
before_build:
- '"C:\Program Files\PostgreSQL\10\bin\psql" -c "CREATE EXTENSION citext"'
- '"C:\Program Files\PostgreSQL\10\bin\psql" -c "CREATE EXTENSION postgis"'
- '"C:\Program Files\PostgreSQL\11\bin\psql" -c "CREATE EXTENSION citext"'
- '"C:\Program Files\PostgreSQL\11\bin\psql" -c "CREATE EXTENSION postgis"'
- appveyor-retry dotnet restore -v Minimal Npgsql.sln
- appveyor-retry nuget restore src\VSIX\packages.config -SolutionDirectory . -Verbosity quiet -NonInteractive
build_script:
- dotnet build "test\Npgsql.Tests" -c Debug -f net451
- dotnet build "test\Npgsql.PluginTests" -c Debug -f net451
- dotnet build "test\Npgsql.Tests" -c Debug
- dotnet build "test\Npgsql.PluginTests" -c Debug
- dotnet build "test\Npgsql.Specification.Tests" -c Debug
- dotnet build "src\Npgsql" -c Release
- msbuild src\VSIX\VSIX.csproj /p:Configuration=Release /v:Minimal
- msbuild src\MSI\MSI.wixproj /p:Configuration=Release /v:Minimal
# WIX hasn't been released yet for VS 2019
# - msbuild src\MSI\MSI.wixproj /p:Configuration=Release /v:Minimal
after_build:
- dotnet pack src\Npgsql\Npgsql.csproj -c ReleaseOptimizedCryptography
- dotnet pack src\Npgsql\Npgsql.csproj -c Release
- dotnet pack src\Npgsql.Json.NET\Npgsql.Json.NET.csproj -c Release
- dotnet pack src\Npgsql.NodaTime\Npgsql.NodaTime.csproj -c Release
- dotnet pack src\Npgsql.LegacyPostgis\Npgsql.LegacyPostgis.csproj -c Release
- dotnet pack src\Npgsql.RawPostgis\Npgsql.RawPostgis.csproj -c Release
- dotnet pack src\Npgsql.NetTopologySuite\Npgsql.NetTopologySuite.csproj -c Release
test:
assemblies:
- test\Npgsql.Tests\bin\Debug\net451\Npgsql.Tests.dll
- test\Npgsql.PluginTests\bin\Debug\net451\Npgsql.PluginTests.dll
- test\Npgsql.Tests\bin\Debug\net461\Npgsql.Tests.dll
- test\Npgsql.PluginTests\bin\Debug\net461\Npgsql.PluginTests.dll
- test\Npgsql.Specification.Tests\bin\Debug\net461\Npgsql.Specification.Tests.dll
- test\Npgsql.Tests\bin\Debug\netcoreapp3.0\Npgsql.Tests.dll
- test\Npgsql.PluginTests\bin\Debug\netcoreapp3.0\Npgsql.PluginTests.dll
- test\Npgsql.Specification.Tests\bin\Debug\netcoreapp3.0\Npgsql.Specification.Tests.dll
artifacts:
- path: 'src\**\*.nupkg'
name: Nuget
@@ -4,28 +4,35 @@
###################

Write-Host Enabling PostgreSQL prepared transactions...
Add-Content 'C:\Program Files\PostgreSQL\10\data\postgresql.conf' "`nmax_prepared_transactions = 10"
Add-Content 'C:\Program Files\PostgreSQL\11\data\postgresql.conf' "`nmax_prepared_transactions = 10"

Write-Host Enabling PostgreSQL SSL...
Add-Content 'C:\Program Files\PostgreSQL\10\data\postgresql.conf' "`nssl = true"
Copy-Item .build\server.* "C:\Program Files\PostgreSQL\10\data"
Add-Content 'C:\Program Files\PostgreSQL\11\data\postgresql.conf' "`nssl = true"
Copy-Item .build\server.* "C:\Program Files\PostgreSQL\11\data"

Write-Host Enabling PostGIS...
If (!(Test-Path $env:POSTGIS_EXE)) {
Write-Host Downloading PostGIS...
(New-Object Net.WebClient).DownloadFile("http://download.osgeo.org/postgis/windows/pg10/$env:POSTGIS_EXE", "$env:POSTGIS_EXE")
(New-Object Net.WebClient).DownloadFile("http://download.osgeo.org/postgis/windows/pg11/$env:POSTGIS_EXE", "$env:POSTGIS_EXE")
}
iex ".\$env:POSTGIS_EXE /S /D='C:\Program Files\PostgreSQL\10'"
ls '/Program Files/PostgreSQL'
net start postgresql-x64-11;
iex ".\$env:POSTGIS_EXE /S /D='C:\Program Files\PostgreSQL\11'"

########################
## Set version variables
########################

Set-Variable -Name TruncatedSha1 -Value $env:APPVEYOR_REPO_COMMIT.subString(0, 9)

if ($env:APPVEYOR_REPO_TAG -eq 'true' -and $env:APPVEYOR_REPO_TAG_NAME -match '^v\d+\.\d+\.\d+')
if ($env:APPVEYOR_REPO_TAG -eq 'true' -and $env:APPVEYOR_REPO_TAG_NAME -match '^v\d+\.\d+\.\d+(-(\w+))?')
{
Write-Host "Release tag detected ($env:APPVEYOR_REPO_TAG_NAME), no version suffix is set."
if ($matches[2]) {
Write-Host "Prerelease tag detected ($env:APPVEYOR_REPO_TAG_NAME), version suffix set to $($matches[2])."
Set-AppveyorBuildVariable -Name VersionSuffix -Value $matches[2]
} else {
Write-Host "Release tag detected ($env:APPVEYOR_REPO_TAG_NAME), no version suffix will be set."
}
Set-AppveyorBuildVariable -Name deploy_github_release -Value true
}
#elseif (Test-Path env:APPVEYOR_PULL_REQUEST_NUMBER)
@@ -37,3 +37,4 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
csharp_indent_case_contents_when_block = false
@@ -0,0 +1 @@
* @roji @austindrenski @YohDeadfall

This file was deleted.

@@ -0,0 +1,42 @@
<Project>
<!-- Package configuration -->
<PropertyGroup>
<Copyright>Copyright 2019 © The Npgsql Development Team</Copyright>
<Company>Npgsql</Company>
<VersionPrefix>4.1.1</VersionPrefix>

<RepositoryType>git</RepositoryType>
<RepositoryUrl>git://github.com/npgsql/npgsql</RepositoryUrl>

<PackageLicenseExpression>PostgreSQL</PackageLicenseExpression>
<PackageProjectUrl>https://www.npgsql.org</PackageProjectUrl>
<PackageIcon>postgresql.png</PackageIcon>

<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
<NoWarn>NU5105</NoWarn>
</PropertyGroup>

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)postgresql.png" Pack="true" PackagePath="" />
</ItemGroup>

<!-- Language configuration -->
<PropertyGroup>
<LangVersion>8.0</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Nullable>enable</Nullable>
</PropertyGroup>

<!-- Siging configuration -->
<PropertyGroup>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Npgsql.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>

<!-- Reference .NET Framework reference assemblies, allows building on environments without .NET Framework installed
(e.g. Linux). Gets ignored on non-framework TFMs. -->
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" />
</ItemGroup>

</Project>
@@ -0,0 +1,32 @@
<Project>
<ItemGroup>
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.6.0" />
<PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.3" />
<PackageReference Update="System.Memory" Version="4.5.3" />
<PackageReference Update="System.ValueTuple" Version="4.5.0" />
<PackageReference Update="System.Text.Json" Version="4.6.0" />
<PackageReference Update="SourceLink.Create.CommandLine" Version="2.8.3" />
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" />

<!-- Plugins -->
<PackageReference Update="NetTopologySuite.IO.PostGIS" Version="2.0.0" />
<PackageReference Update="NodaTime" Version="2.4.7" />
<PackageReference Update="GeoJSON.Net" Version="1.1.73" />
<PackageReference Update="Newtonsoft.Json" Version="11.0.2" />

<!-- Tests -->
<PackageReference Update="NUnit" Version="3.12.0" />
<PackageReference Update="NLog" Version="4.6.7" />
<PackageReference Update="Microsoft.CSharp" Version="4.6.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Update="AdoNet.Specification.Tests" Version="2.0.0-alpha3" />

<!-- Benchmarks -->
<PackageReference Update="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Update="Microsoft.Data.SqlClient" Version="1.0.19249.1" />
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.11.5" />
</ItemGroup>
</Project>
17 LICENSE
@@ -0,0 +1,17 @@
Copyright (c) 2002-2019, Npgsql

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose, without fee, and without a written agreement
is hereby granted, provided that the above copyright notice and this
paragraph and the following two paragraphs appear in all copies.

IN NO EVENT SHALL NPGSQL BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
Npgsql HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

NPGSQL SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND Npgsql
HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS,
OR MODIFICATIONS.

This file was deleted.

@@ -1,14 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26621.2
# Visual Studio Version 16
VisualStudioVersion = 16.0.28822.285
MinimumVisualStudioVersion = 10.0.40219.1
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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
@@ -40,6 +34,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.NetTopologySuite", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.GeoJSON", "src\Npgsql.GeoJSON\Npgsql.GeoJSON.csproj", "{04052CCF-CABC-4B37-B89D-F95721D95407}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.Specification.Tests", "test\Npgsql.Specification.Tests\Npgsql.Specification.Tests.csproj", "{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -144,6 +140,14 @@ Global
{04052CCF-CABC-4B37-B89D-F95721D95407}.Release|Any CPU.Build.0 = Release|Any CPU
{04052CCF-CABC-4B37-B89D-F95721D95407}.Release|x86.ActiveCfg = Release|Any CPU
{04052CCF-CABC-4B37-B89D-F95721D95407}.Release|x86.Build.0 = Release|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Debug|x86.ActiveCfg = Debug|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Debug|x86.Build.0 = Debug|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Release|Any CPU.Build.0 = Release|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Release|x86.ActiveCfg = Release|Any CPU
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -161,6 +165,7 @@ Global
{B7E92398-DD4E-410E-923C-E256992F6687} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{20D889AA-82DC-4AA0-B508-7CE68B83BB27} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{04052CCF-CABC-4B37-B89D-F95721D95407} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{F0DD1CE7-D753-41AB-A30F-1CC7CDE9B8EF} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C90AEECD-DB4C-4BE6-B506-16A449852FB8}
@@ -0,0 +1,5 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=AFF9A679F982964AA929D8E3E485E3CF/RelativePath/@EntryValue">..\Npgsql.sln.DotSettings</s:String>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=AFF9A679F982964AA929D8E3E485E3CF/@KeyIndexDefined">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileAFF9A679F982964AA929D8E3E485E3CF/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileAFF9A679F982964AA929D8E3E485E3CF/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
@@ -1,14 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2036
# Visual Studio Version 16
VisualStudioVersion = 16.0.28822.285
MinimumVisualStudioVersion = 10.0.40219.1
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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
@@ -33,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.NetTopologySuite", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.GeoJSON", "src\Npgsql.GeoJSON\Npgsql.GeoJSON.csproj", "{F7C53EBD-0075-474F-A083-419257D04080}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Npgsql.Specification.Tests", "test\Npgsql.Specification.Tests\Npgsql.Specification.Tests.csproj", "{A77E5FAF-D775-4AB4-8846-8965C2104E60}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -121,6 +117,14 @@ Global
{F7C53EBD-0075-474F-A083-419257D04080}.Release|Any CPU.Build.0 = Release|Any CPU
{F7C53EBD-0075-474F-A083-419257D04080}.Release|x86.ActiveCfg = Release|Any CPU
{F7C53EBD-0075-474F-A083-419257D04080}.Release|x86.Build.0 = Release|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Debug|x86.ActiveCfg = Debug|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Debug|x86.Build.0 = Debug|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Release|Any CPU.Build.0 = Release|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Release|x86.ActiveCfg = Release|Any CPU
{A77E5FAF-D775-4AB4-8846-8965C2104E60}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -136,6 +140,7 @@ Global
{5BF3516D-5559-46A8-8362-0F4D931EEAB9} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{6CB12050-DC9B-4155-BADD-BFDD54CDD70F} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{F7C53EBD-0075-474F-A083-419257D04080} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
{A77E5FAF-D775-4AB4-8846-8965C2104E60} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C90AEECD-DB4C-4BE6-B506-16A449852FB8}

0 comments on commit ea70865

Please sign in to comment.
You can’t perform that action at this time.