Merge pull request #2 from grandchamp/master

Enabling .NET Standard 2.0 support
matgr1 · Aug 22, 2017 · 013a277 · 013a277
2 parents 3c18d15 + 9cecb91
commit 013a277
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/src/System.Drawing/Color.cs b/src/System.Drawing/Color.cs
@@ -1,4 +1,5 @@
-namespace System.Drawing
+#if !NETSTANDARD2_0
+namespace System.Drawing
 {
 	//
 	// Summary:
@@ -285,3 +286,4 @@ private static byte ConvertToByte(int value)
 		}
 	}
 }
+#endif
diff --git a/src/System.Drawing/System.Drawing.csproj b/src/System.Drawing/System.Drawing.csproj
@@ -3,29 +3,23 @@
   <PropertyGroup>
     <Copyright></Copyright>
     <AssemblyTitle>System.Drawing dotnet core</AssemblyTitle>
-    <VersionPrefix>1.2.1</VersionPrefix>
+    <VersionPrefix>1.2.2</VersionPrefix>
     <Authors></Authors>
-    <TargetFrameworks>netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;netstandard1.2;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.6;netstandard1.5;netstandard1.4;netstandard1.3;netstandard1.2;netstandard1.1</TargetFrameworks>
     <AssemblyName>System.Drawing-dotnet-core</AssemblyName>
     <PackageId>System.Drawing-dotnet-core</PackageId>
     <PackageProjectUrl>https://github.com/matgr1/System.Drawing-dotnet-core</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/matgr1/System.Drawing-dotnet-core/blob/master/LICENSE.md</PackageLicenseUrl>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/matgr1/System.Drawing-dotnet-core</RepositoryUrl>
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.5' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.4' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.2' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.1' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion>2.0.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <AssemblyVersion>1.2.1.0</AssemblyVersion>
-    <FileVersion>1.2.1.0</FileVersion>
-    <Version>1.2.1</Version>
+    <AssemblyVersion>1.2.2.0</AssemblyVersion>
+    <FileVersion>1.2.2.0</FileVersion>
+    <Version>1.2.2</Version>
     <Description>This is ONLY interfaces/enums/data objects - NO IMPLEMENTATION. It is used by https://github.com/matgr1/FreeImage-dotnet-core which provides a bitmap implementation and various image codecs based on FreeImage (http://freeimage.sourceforge.net/)</Description>
   </PropertyGroup>