Merge pull request #8 from grandchamp/master

Enabling .NET Standard 2 support.
matgr1 · Aug 22, 2017 · 917a84b · 917a84b
2 parents b2e049d + 516c540
commit 917a84b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj b/src/FreeImage-dotnet-core/FreeImage-dotnet-core.csproj
@@ -3,9 +3,9 @@
   <PropertyGroup>
     <Copyright></Copyright>
     <AssemblyTitle>FreeImage dotnet core</AssemblyTitle>
-    <VersionPrefix>4.3.1</VersionPrefix>
+    <VersionPrefix>4.3.2</VersionPrefix>
     <Authors></Authors>
-    <TargetFrameworks>netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net461;net46;net452;net451;net45</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;net461;net46;net452;net451;net45</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>FreeImage-dotnet-core</AssemblyName>
     <PackageId>FreeImage-dotnet-core</PackageId>
@@ -15,9 +15,9 @@
     <PackageLicenseUrl>http://freeimage.sourceforge.net/license.html</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/matgr1/FreeImage-dotnet-core</RepositoryUrl>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>4.3.1</Version>
+    <Version>4.3.2</Version>
     <Description>This is a clone of the FreeImage .NET project (http://freeimage.sourceforge.net/) modified to work with dotnet core. Note that all functions that use System.Drawing.Bitmap have been removed from the netstandard framework versions as there is no implementation for this class.
 
 FreeImage native binaries are included in the nuget package for Windows x86/x64, Ubuntu x64 (^16.04), and OSX x64 (^10.10).
@@ -52,6 +52,10 @@ This is for FreeImage version 3.17.0 (The version number of this package no long
 
 	</ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Drawing-dotnet-core" Version="1.2.2" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
     <PackageReference Include="System.Drawing-dotnet-core" Version="1.2.1" />
   </ItemGroup>