Merge branch 'dev' (3.0.0)

.appveyor.yml

@@ -1,15 +1,15 @@
-image: Visual Studio 2017
-version: 2.2.4-{build}
+image: Visual Studio 2019
+version: 3.0.0-{build}
 services:
-  - postgresql101
+  - postgresql111
 environment:
   global:
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
     DOTNET_CLI_TELEMETRY_OPTOUT: 1
     Test__Npgsql__DefaultConnection: 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'
@@ -18,8 +18,8 @@ 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 2.1.300-rc1-008673
+  - 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"
   #
   # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 before_build:
@@ -34,16 +34,3 @@ test_script:
   - dotnet test test\EFCore.PG.FunctionalTests\EFCore.PG.FunctionalTests.csproj
 artifacts:
   - path: 'src\**\*.nupkg'
-deploy:
-  - provider: Environment
-    name: MyGet Unstable
-    on:
-      deploy_myget_unstable: true
-  - provider: Environment
-    name: MyGet Stable
-    on:
-      deploy_myget_stable: true
-  - provider: Environment
-    name: EFCore.PG Github
-    on:
-      deploy_github_release: true

.build/build-docker.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+CONTEXT_DIR=$(dirname $0)/docker
+
+sudo docker build -t npgsql/postgres:11  --build-arg PG_VERSION=11  $CONTEXT_DIR
+sudo docker build -t npgsql/postgres:10  --build-arg PG_VERSION=10  $CONTEXT_DIR
+sudo docker build -t npgsql/postgres:9.6 --build-arg PG_VERSION=9.6 $CONTEXT_DIR
+
+sudo docker push npgsql/postgres:11
+sudo docker push npgsql/postgres:10
+sudo docker push npgsql/postgres:9.6

.build/docker/Dockerfile

@@ -0,0 +1,26 @@
+ARG PG_VERSION=11
+
+FROM postgres:$PG_VERSION
+LABEL description="Npgsql CI build image"
+
+ENV POSTGIS_MAJOR 2.5
+ENV POSTGIS_VERSION 2.5.2+dfsg-1~exp1.pgdg90+1
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
+        postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
+        postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
+        postgis=$POSTGIS_VERSION && \
+    rm -rf /var/lib/apt/lists/*
+
+# Data directory needs to be empty for initialization scripts to run, so stash one level up.
+COPY ./server.crt $PGDATA/../server.crt
+COPY ./server.key $PGDATA/../server.key
+RUN chown root:postgres $PGDATA/../server.key
+RUN chmod 0640 $PGDATA/../server.key
+
+RUN mkdir -p /docker-entrypoint-initdb.d
+COPY ./initdb-npgsql.sh /docker-entrypoint-initdb.d/initdb-npgsql.sh
+
+CMD ["postgres", "-c", "max_prepared_transactions=10", "-c", "ssl=true", "-c", "ssl_cert_file=../server.crt", "-c", "ssl_key_file=../server.key"]

.build/docker/initdb-npgsql.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# Perform all actions as $POSTGRES_USER
+export PGUSER="$POSTGRES_USER"
+
+# Standard test account for Npgsql
+psql -c "CREATE ROLE npgsql_tests SUPERUSER LOGIN PASSWORD 'npgsql_tests';"
+psql -c "CREATE DATABASE npgsql_tests OWNER npgsql_tests;"
+
+# Domain account for Azure Pipelines.
+psql -c "CREATE ROLE vsts SUPERUSER LOGIN;"
+psql -c "CREATE DATABASE vsts OWNER vsts;"

.build/docker/server.crt

@@ -0,0 +1,57 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 12599801177921850358 (0xaedb7c6a2a948bf6)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=localhost
+        Validity
+            Not Before: Mar 13 11:19:37 2015 GMT
+            Not After : Apr 12 11:19:37 2015 GMT
+        Subject: C=AU, ST=Some-State, O=Internet Widgits Pty Ltd, CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c1:df:3f:3b:b8:59:b1:33:ae:9c:ec:6b:44:41:
+                    7b:0a:cd:51:62:98:e2:11:f0:a0:7d:65:67:9b:49:
+                    88:15:91:cf:30:f1:23:dc:3c:00:83:76:be:59:df:
+                    9c:66:8f:eb:f3:a7:73:a0:eb:2a:26:85:d2:48:aa:
+                    4f:88:1b:b8:31:22:df:bd:e3:1b:6f:4f:70:c3:b2:
+                    f4:a8:14:07:0e:77:d7:fe:91:b1:b1:3d:0a:cc:5e:
+                    32:ac:31:06:d3:d7:cf:e5:fc:3c:c0:db:c0:6b:0e:
+                    00:e0:a5:32:4a:2d:90:63:37:7e:c8:e6:5d:ad:df:
+                    30:81:7e:65:4a:6d:71:a5:9b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier:
+                17:4C:64:08:33:71:2A:34:33:CA:15:3E:F3:B8:98:1A:E7:8E:64:F4
+            X509v3 Authority Key Identifier:
+                keyid:17:4C:64:08:33:71:2A:34:33:CA:15:3E:F3:B8:98:1A:E7:8E:64:F4
+
+            X509v3 Basic Constraints:
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         81:f4:69:3e:b1:c0:9f:4b:82:10:8d:3e:7c:98:70:2a:f3:24:
+         ca:33:13:35:1d:9e:84:dc:b4:f1:17:1f:e6:18:d5:86:51:b3:
+         ce:3e:4a:97:39:cc:7e:74:94:01:da:68:43:df:b0:b6:fc:29:
+         0c:86:ce:5f:0c:3d:c6:f0:8c:c0:f5:86:e7:0b:3f:fb:b0:d6:
+         b0:2c:9a:9e:15:be:31:dc:6d:bb:32:92:b7:36:fb:65:5a:f1:
+         d2:44:04:fe:eb:97:f2:8a:31:2e:4c:fd:f9:80:00:8d:91:81:
+         c1:90:97:18:fa:e2:c6:1c:ff:28:d1:58:94:b3:b5:9f:7a:f7:
+         39:b3
+-----BEGIN CERTIFICATE-----
+MIICgDCCAemgAwIBAgIJAK7bfGoqlIv2MA0GCSqGSIb3DQEBBQUAMFkxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xNTAzMTMxMTE5
+MzdaFw0xNTA0MTIxMTE5MzdaMFkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21l
+LVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEjAQBgNV
+BAMMCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwd8/O7hZ
+sTOunOxrREF7Cs1RYpjiEfCgfWVnm0mIFZHPMPEj3DwAg3a+Wd+cZo/r86dzoOsq
+JoXSSKpPiBu4MSLfveMbb09ww7L0qBQHDnfX/pGxsT0KzF4yrDEG09fP5fw8wNvA
+aw4A4KUySi2QYzd+yOZdrd8wgX5lSm1xpZsCAwEAAaNQME4wHQYDVR0OBBYEFBdM
+ZAgzcSo0M8oVPvO4mBrnjmT0MB8GA1UdIwQYMBaAFBdMZAgzcSo0M8oVPvO4mBrn
+jmT0MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAgfRpPrHAn0uCEI0+
+fJhwKvMkyjMTNR2ehNy08Rcf5hjVhlGzzj5KlznMfnSUAdpoQ9+wtvwpDIbOXww9
+xvCMwPWG5ws/+7DWsCyanhW+MdxtuzKStzb7ZVrx0kQE/uuX8ooxLkz9+YAAjZGB
+wZCXGPrixhz/KNFYlLO1n3r3ObM=
+-----END CERTIFICATE-----

.build/docker/server.key

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDB3z87uFmxM66c7GtEQXsKzVFimOIR8KB9ZWebSYgVkc8w8SPc
+PACDdr5Z35xmj+vzp3Og6yomhdJIqk+IG7gxIt+94xtvT3DDsvSoFAcOd9f+kbGx
+PQrMXjKsMQbT18/l/DzA28BrDgDgpTJKLZBjN37I5l2t3zCBfmVKbXGlmwIDAQAB
+AoGBAJnspubCcivXzb33kx7JImisJP60RWFa/AEzPrQzCGGft7Gy8vbLiNjXsT/n
+4uQnRn3YKFzN+VRGkXNyDN0SrQSrRrFST56aLBhqe4BEO3l6JQJQ6h1y5aW7/R+y
+ehV9HIQd+RFgcyejStXJnXYC7lPycOjT4SGG/7mOZkOIbRmJAkEA8NwHvvxsLW77
+UwVto7us0oR0Ey8/vCgbEruZTdr+rVeOKKUvM4K1r4hMunXc2kJ+hhYYMoF2wfIv
+gpPq1F+GLQJBAM4PFV8pL+fLqQqoRh/2dGDBKQU5wlQS+A4sTAPTdy3V1zx3BE8s
+KJeYIk2Z72HqNLAL/LUC/gwKwuVg+3k0v+cCQQC2HZhZxyDAZabwSi1xXMk6z924
+V8R4L1bxHhm3bXudc5NQlj2PVCiuFX/2iIG6IgbqubAIGC3ETauwrskjVSrtAkEA
+gltgddcki0t4IVnbIxVTAnKwdLHZkj591tmHLVR2LPT/OS1B+KRC+cQwz0729cao
+lka/E/RUq2GTcnEsJb2NOQJAOHwXsZJj+qrMQmHmmej6X2Rro4bX7cJmyK99mAtC
+LigiSdiY/uDqJ/p+cHPH9g2RLWeFetUAZID94uNRk1peAg==
+-----END RSA PRIVATE KEY-----

.build/setup_appveyor.ps1

@@ -5,9 +5,11 @@
 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

.build/setup_postgres.ps1

@@ -0,0 +1,28 @@
+# Acquire Postgres Package Manager by BigSQL
+powershell -c "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://s3.amazonaws.com/pgcentral/install.ps1'))";
+
+# Install PostgreSQL
+bigsql/pgc list
+bigsql/pgc install pg11
+
+# Install PostGIS
+bigsql/pgc list --extensions pg11
+bigsql/pgc install postgis25-pg11
+
+# Initialize PostgreSQL
+bigsql/pg11/bin/initdb -D PGDATA -E UTF8 -U postgres
+
+# Configure PostgreSQL
+cp .build/docker/server.crt PGDATA/
+cp .build/docker/server.key PGDATA/
+
+# Start PostgreSQL
+bigsql/pg11/bin/pg_ctl -D PGDATA -l logfile -o '-c max_prepared_transactions=10 -c ssl=true' start
+
+# Configure domain account
+bigsql/pg11/bin/psql -U postgres -c "CREATE ROLE vsts SUPERUSER LOGIN"
+bigsql/pg11/bin/psql -U postgres -c "CREATE DATABASE vsts OWNER vsts"
+
+# Configure test account
+bigsql/pg11/bin/psql -U postgres -c "CREATE ROLE npgsql_tests SUPERUSER LOGIN PASSWORD 'npgsql_tests'"
+bigsql/pg11/bin/psql -U postgres -c "CREATE DATABASE npgsql_tests OWNER npgsql_tests"

.editorconfig

@@ -1,15 +1,18 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = LF
-
-[*.cs]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
 insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{*.DotSettings, *.DotSettings.user}]
+indent_size = 2
+indent_style = tab
 
 [*.cs]
+indent_size = 4
+indent_style = space
 dotnet_style_qualification_for_field = false:error
 dotnet_style_qualification_for_property = false:error
 dotnet_style_qualification_for_method = false:error

.gitignore

@@ -15,3 +15,4 @@ artifacts/
 # Roslyn cache directories
 *.ide/
 TestResult.xml
+

Directory.Build.props

@@ -1,7 +1,8 @@
 <Project>
-  <PropertyGroup Label="Package Versions">
-    <NpgsqlVersion>4.0.7</NpgsqlVersion>
-    <EFCoreVersion>2.2.4</EFCoreVersion>
-    <MicrosoftExtensionsVersion>2.2.0</MicrosoftExtensionsVersion>
+  <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <NoWarn>NU5105</NoWarn>
+    <VersionPrefix>3.0.0</VersionPrefix>
   </PropertyGroup>
 </Project>

Directory.Build.targets

@@ -0,0 +1,22 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Update="Microsoft.EntityFrameworkCore" Version="3.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="3.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="3.0.0" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
+
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="3.0.0" />
+
+    <PackageReference Update="Npgsql" Version="4.1.0" />
+    <PackageReference Update="Npgsql.NodaTime" Version="4.1.0" />
+    <PackageReference Update="Npgsql.NetTopologySuite" Version="4.1.0" />
+
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Update="xunit.core" Version="2.4.1" />
+    <PackageReference Update="xunit.assert" Version="2.4.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
+  </ItemGroup>
+</Project>

EFCore.PG.sln

@@ -1,10 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2026
 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
@@ -18,11 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Tests", "test\EFC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.FunctionalTests", "test\EFCore.PG.FunctionalTests\EFCore.PG.FunctionalTests.csproj", "{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NTS", "src\EFCore.PG.NTS\EFCore.PG.NTS.csproj", "{78E89DB4-233B-4F93-A405-A1849D8B1A85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Plugins.FunctionalTests", "test\EFCore.PG.Plugins.FunctionalTests\EFCore.PG.Plugins.FunctionalTests.csproj", "{B78A7825-BE72-4509-B0AD-01EEC67A9624}"
 EndProject
-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}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.NodaTime", "src\EFCore.PG.NodaTime\EFCore.PG.NodaTime.csproj", "{77F0608F-6D0C-481C-9108-D5176E2EAD69}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NodaTime", "src\EFCore.PG.NodaTime\EFCore.PG.NodaTime.csproj", "{77F0608F-6D0C-481C-9108-D5176E2EAD69}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NTS", "src\EFCore.PG.NTS\EFCore.PG.NTS.csproj", "{D7106D61-C7CA-4005-B31F-43281BB397AD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -58,18 +57,6 @@ Global
 		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x64.ActiveCfg = Release|Any CPU
 		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x86.ActiveCfg = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x64.Build.0 = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Debug|x86.Build.0 = Debug|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|Any CPU.Build.0 = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x64.ActiveCfg = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x64.Build.0 = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x86.ActiveCfg = Release|Any CPU
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85}.Release|x86.Build.0 = Release|Any CPU
 		{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B78A7825-BE72-4509-B0AD-01EEC67A9624}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -94,6 +81,18 @@ Global
 		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x64.Build.0 = Release|Any CPU
 		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.ActiveCfg = Release|Any CPU
 		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.Build.0 = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x64.Build.0 = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x86.Build.0 = Debug|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x64.ActiveCfg = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x64.Build.0 = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x86.ActiveCfg = Release|Any CPU
+		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -102,9 +101,9 @@ Global
 		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
 		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
 		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
-		{78E89DB4-233B-4F93-A405-A1849D8B1A85} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
 		{B78A7825-BE72-4509-B0AD-01EEC67A9624} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
 		{77F0608F-6D0C-481C-9108-D5176E2EAD69} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
+		{D7106D61-C7CA-4005-B31F-43281BB397AD} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F4EAAE6D-758C-4184-9D8C-7113384B61A8}