From 2d806ff82e8b661114e736cb69e852b6ebbf3658 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Tue, 21 May 2019 21:51:30 -0700 Subject: [PATCH] using netcoreapp2.1 version if colorUtil (dotnet/corefx#37854) Commit migrated from https://github.com/dotnet/corefx/commit/ee35d4f56f8509267fe56086394966f2804d8557 --- src/libraries/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs | 4 +--- src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libraries/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs b/src/libraries/Common/src/System/Drawing/ColorUtil.netcoreapp21.cs index e65f14c..3b4cfca 100644 --- 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; } } \ No newline at end of file diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 776b14a..ad577ba 100644 --- 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 @@ System\Drawing\ColorTable.cs - + System\Drawing\ColorUtil.netcoreapp20.cs + + System\Drawing\ColorUtil.netcoreapp21.cs + System\Drawing\KnownColorTable.cs -- 2.7.4