using netcoreapp2.1 version if colorUtil (dotnet/corefx#37854)

Commit migrated from dotnet/corefx@ee35d4f
temfordump · May 22, 2019 · 2d806ff · 2d806ff
1 parent a83470f
commit 2d806ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/libraries/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs b/src/libraries/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs
@@ -2,14 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics;
-using System.Reflection;
-
 namespace System.Drawing
 {
     internal static class ColorUtil
     {
         public static Color FromKnownColor(KnownColor color) => Color.FromKnownColor(color);
         public static bool IsSystemColor(this Color color) => color.IsSystemColor;
+        public static bool GetIsKnownColor(this Color color) => color.IsKnownColor;
     }
 }
diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj
@@ -160,9 +160,12 @@
     <Compile Include="$(CommonPath)\System\Drawing\ColorTable.cs">
       <Link>System\Drawing\ColorTable.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)\System\Drawing\ColorUtil.netcoreapp20.cs">
+    <Compile Condition="'$(TargetGroup)' == 'netcoreapp2.0'" Include="$(CommonPath)\System\Drawing\ColorUtil.netcoreapp20.cs">
       <Link>System\Drawing\ColorUtil.netcoreapp20.cs</Link>
     </Compile>
+    <Compile Condition="'$(TargetGroup)' != 'netcoreapp2.0'" Include="$(CommonPath)\System\Drawing\ColorUtil.netcoreapp21.cs">
+      <Link>System\Drawing\ColorUtil.netcoreapp21.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\System\Drawing\KnownColorTable.cs">
       <Link>System\Drawing\KnownColorTable.cs</Link>
     </Compile>