From 2702dc9dffa341b444944af5bd69fd064356b932 Mon Sep 17 00:00:00 2001
From: Joe Amenta <airbreather@linux.com>
Date: Tue, 12 Dec 2017 20:35:30 -0500
Subject: [PATCH] Add .NET Standard 2.0 Target

---
 ProjNET.nuspec         |  2 +-
 ProjNet/ProjNET.csproj | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ProjNET.nuspec b/ProjNET.nuspec
index 5389aab..6e41dfd 100644
--- a/ProjNET.nuspec
+++ b/ProjNET.nuspec
@@ -15,7 +15,7 @@ Proj.NET performs point-to-point coordinate conversions between geodetic coordin
 		<copyright>Copyright 2006-2015</copyright>
 		<tags>OGC SFS Projection</tags>
 		<dependencies>
-			<dependency id="GeoAPI" version="[1.7.4,1.8)" />
+			<dependency id="GeoAPI" version="[1.7.5-pre009, )" />
 		</dependencies>
 	</metadata>
 	<files>
diff --git a/ProjNet/ProjNET.csproj b/ProjNet/ProjNET.csproj
index ef89f58..47123e8 100644
--- a/ProjNet/ProjNET.csproj
+++ b/ProjNet/ProjNET.csproj
@@ -4,11 +4,11 @@
   <PropertyGroup>
     <SolutionDir Condition=" '$(SolutionDir)' == '' ">$(ProjectDir)..\</SolutionDir>
     <RootNamespace>ProjNet</RootNamespace>
-    <TargetFrameworks>net35-client;net40-client;net403-client;net45;netstandard1.0</TargetFrameworks>
+    <TargetFrameworks>net35-client;net40-client;net403-client;net45;netstandard1.0;netstandard2.0</TargetFrameworks>
     <OutputPath>$(SolutionDir)$(Configuration)\$(Platform)</OutputPath>
     <DocumentationFile>$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <GeoAPIPackageReferenceVersion>1.7.5-pre4</GeoAPIPackageReferenceVersion>
+    <GeoAPIPackageReferenceVersion>1.7.5-pre009</GeoAPIPackageReferenceVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(SolutionDir)scskey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -52,11 +52,21 @@
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+  </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' Or '$(TargetFramework)' == 'netstandard2.0' ">
     <DefineConstants>$(DefineConstants);HAS_SYSTEM_REFLECTION_TYPEINFO</DefineConstants>
     <DefineConstants>$(DefineConstants);HAS_SYSTEM_THREADING_TASKS_TASK_RUN</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>$(DefineConstants);FEATURE_DESERIALIZATION_CONSTRUCTOR</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_SYSTEM_SERIALIZABLEATTRIBUTE</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_SYSTEM_THREADING_THREADPOOL</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_SYSTEM_TYPE_GETCONSTRUCTORS</DefineConstants>
+    <DefineConstants>$(DefineConstants);HAS_SYSTEM_TYPE_ISASSIGNABLEFROM</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="GeoAPI" Version="$(GeoAPIPackageReferenceVersion)" />
   </ItemGroup>