Merge remote-tracking branch 'upstream/master'

13 files changed, 54 insertions, 390 deletions

diff --git a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
index 0404b31543..a846aea85d 100644
--- a/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
+++ b/src/System.Drawing.Primitives/System.Drawing.Primitives.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{297A9116-1005-499D-A895-2063D03E4C94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Drawing.Primitives.Tests", "tests\System.Drawing.Primitives.Tests.csproj", "{CF54638C-A382-4A78-9AD6-2304CEEFEB01}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {8F472B93-574C-4AEC-9D28-6C2360A55BBF}
 	EndProjectSection
@@ -26,14 +26,14 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-		{297A9116-1005-499D-A895-2063D03E4C94}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
-		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
+		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
+		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
+		{CF54638C-A382-4A78-9AD6-2304CEEFEB01}.Release|Any CPU.Build.0 = netcoreapp-Release|Any CPU
+		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Debug|Any CPU
+		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Debug|Any CPU.Build.0 = netcoreapp-Windows_NT-Debug|Any CPU
+		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.ActiveCfg = netcoreapp-Windows_NT-Release|Any CPU
+		{8F472B93-574C-4AEC-9D28-6C2360A55BBF}.Release|Any CPU.Build.0 = netcoreapp-Windows_NT-Release|Any CPU
 		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU
 		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU
 		{10F74537-6423-48F5-A7F3-4DE94E42AF8F}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU
@@ -43,7 +43,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{297A9116-1005-499D-A895-2063D03E4C94} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
+		{CF54638C-A382-4A78-9AD6-2304CEEFEB01} = {1A2F9F4A-A032-433E-B914-ADD5992BB178}
 		{8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {E107E9C1-E893-4E87-987E-04EF0DCEAEFD}
 		{10F74537-6423-48F5-A7F3-4DE94E42AF8F} = {2E666815-2EDB-464B-9DF6-380BF4789AD4}
 	EndGlobalSection
diff --git a/src/System.Drawing.Primitives/src/Configurations.props b/src/System.Drawing.Primitives/src/Configurations.props
index a8910ef718..bbb5be814e 100644
--- a/src/System.Drawing.Primitives/src/Configurations.props
+++ b/src/System.Drawing.Primitives/src/Configurations.props
@@ -3,7 +3,8 @@
   <PropertyGroup>
     <BuildConfigurations>
       uap-Windows_NT;
-      netcoreapp;
+      netcoreapp-Windows_NT;
+      netcoreapp-Unix;
     </BuildConfigurations>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
index 0cd290b3b9..2b49c5a61a 100644
--- a/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
+++ b/src/System.Drawing.Primitives/src/System.Drawing.Primitives.csproj
@@ -6,9 +6,14 @@
     <RootNamespace>System.Drawing</RootNamespace>
     <AssemblyName>System.Drawing.Primitives</AssemblyName>
     <ProjectGuid>{8F472B93-574C-4AEC-9D28-6C2360A55BBF}</ProjectGuid>
+    <DefineConstants Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'uap'">$(DefineConstants);FEATURE_WINDOWS_SYSTEM_COLORS</DefineConstants>
+    <!-- This library contains PInvokes that cannot be used on OneCore. -->
+    <EnablePInvokeAnalyzer>false</EnablePInvokeAnalyzer>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
   <ItemGroup>
@@ -19,6 +24,7 @@
     <Reference Include="System.Resources.ResourceManager" />
     <Reference Include="System.Runtime" />
     <Reference Include="System.Runtime.Extensions" />
+    <Reference Include="System.Runtime.InteropServices" />
     <Reference Include="System.ComponentModel.Primitives" />
   </ItemGroup>
   <ItemGroup>
@@ -32,11 +38,25 @@
     <Compile Include="$(CommonPath)\System\Drawing\ColorTable.cs">
       <Link>System\Drawing\ColorTable.cs</Link>
     </Compile>
+    <Compile Include="$(CommonPath)\System\Drawing\KnownColorTable.cs">
+      <Link>System\Drawing\KnownColorTable.cs</Link>
+    </Compile>
     <Compile Include="$(CommonPath)\System\Numerics\Hashing\HashHelpers.cs">
       <Link>Common\System\Numerics\Hashing\HashHelpers.cs</Link>
     </Compile>
     <Compile Include="System\Drawing\KnownColor.cs" />
-    <Compile Include="System\Drawing\KnownColorTable.cs" />
+  </ItemGroup>
+  <!-- System color features require Win32 PInvoke's which are disallowed in UAP. -->
+  <ItemGroup Condition="'$(TargetsWindows)' == 'true' And '$(TargetGroup)' != 'uap'">
+    <Compile Include="$(CommonPath)\Interop\Windows\Interop.Libraries.cs">
+      <Link>Common\Interop\Windows\Interop.Libraries.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.GetSysColor.cs">
+      <Link>Common\Interop\Windows\user32\Interop.GetSysColor.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)\Interop\Windows\user32\Interop.Win32SystemColors.cs">
+      <Link>Common\Interop\Windows\user32\Interop.Win32SystemColors.cs</Link>
+    </Compile>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/Color.cs b/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
index 6bfe096c01..e5fd831d7f 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/Color.cs
@@ -11,7 +11,7 @@ namespace System.Drawing
     [DebuggerDisplay("{NameAndARGBValue}")]
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct Color : IEquatable<Color>
     {
@@ -327,19 +327,19 @@ namespace System.Drawing
         // user supplied name of color. Will not be filled in if
         // we map to a "knowncolor"
         //
-        private readonly string name;
+        private readonly string name; // Do not rename (binary serialization)
 
         // will contain standard 32bit sRGB (ARGB)
         //
-        private readonly long value;
+        private readonly long value; // Do not rename (binary serialization)
 
         // ignored, unless "state" says it is valid
         //
-        private readonly short knownColor;
+        private readonly short knownColor; // Do not rename (binary serialization)
 
         // implementation specific information
         //
-        private readonly short state;
+        private readonly short state; // Do not rename (binary serialization)
 
 
         internal Color(KnownColor knownColor)
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/KnownColorTable.cs b/src/System.Drawing.Primitives/src/System/Drawing/KnownColorTable.cs
deleted file mode 100644
index 390e695844..0000000000
--- a/src/System.Drawing.Primitives/src/System/Drawing/KnownColorTable.cs
+++ /dev/null
@@ -1,358 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Drawing
-{
-    internal static class KnownColorTable
-    {
-        private static int[] s_colorTable;
-        private static string[] s_colorNameTable;
-
-        private static void EnsureColorTable()
-        {
-            // no need to lock... worse case is a double create of the table...
-            //
-            if (s_colorTable == null)
-            {
-                InitColorTable();
-            }
-        }
-
-        private static void InitColorTable()
-        {
-            int[] values = new int[KnownColor.LastColor - KnownColor.FirstColor + 1];
-
-            // just consts...
-            //
-            values[(int)KnownColor.Transparent] = 0x00FFFFFF;
-            values[(int)KnownColor.AliceBlue] = unchecked((int)0xFFF0F8FF);
-            values[(int)KnownColor.AntiqueWhite] = unchecked((int)0xFFFAEBD7);
-            values[(int)KnownColor.Aqua] = unchecked((int)0xFF00FFFF);
-            values[(int)KnownColor.Aquamarine] = unchecked((int)0xFF7FFFD4);
-            values[(int)KnownColor.Azure] = unchecked((int)0xFFF0FFFF);
-            values[(int)KnownColor.Beige] = unchecked((int)0xFFF5F5DC);
-            values[(int)KnownColor.Bisque] = unchecked((int)0xFFFFE4C4);
-            values[(int)KnownColor.Black] = unchecked((int)0xFF000000);
-            values[(int)KnownColor.BlanchedAlmond] = unchecked((int)0xFFFFEBCD);
-            values[(int)KnownColor.Blue] = unchecked((int)0xFF0000FF);
-            values[(int)KnownColor.BlueViolet] = unchecked((int)0xFF8A2BE2);
-            values[(int)KnownColor.Brown] = unchecked((int)0xFFA52A2A);
-            values[(int)KnownColor.BurlyWood] = unchecked((int)0xFFDEB887);
-            values[(int)KnownColor.CadetBlue] = unchecked((int)0xFF5F9EA0);
-            values[(int)KnownColor.Chartreuse] = unchecked((int)0xFF7FFF00);
-            values[(int)KnownColor.Chocolate] = unchecked((int)0xFFD2691E);
-            values[(int)KnownColor.Coral] = unchecked((int)0xFFFF7F50);
-            values[(int)KnownColor.CornflowerBlue] = unchecked((int)0xFF6495ED);
-            values[(int)KnownColor.Cornsilk] = unchecked((int)0xFFFFF8DC);
-            values[(int)KnownColor.Crimson] = unchecked((int)0xFFDC143C);
-            values[(int)KnownColor.Cyan] = unchecked((int)0xFF00FFFF);
-            values[(int)KnownColor.DarkBlue] = unchecked((int)0xFF00008B);
-            values[(int)KnownColor.DarkCyan] = unchecked((int)0xFF008B8B);
-            values[(int)KnownColor.DarkGoldenrod] = unchecked((int)0xFFB8860B);
-            values[(int)KnownColor.DarkGray] = unchecked((int)0xFFA9A9A9);
-            values[(int)KnownColor.DarkGreen] = unchecked((int)0xFF006400);
-            values[(int)KnownColor.DarkKhaki] = unchecked((int)0xFFBDB76B);
-            values[(int)KnownColor.DarkMagenta] = unchecked((int)0xFF8B008B);
-            values[(int)KnownColor.DarkOliveGreen] = unchecked((int)0xFF556B2F);
-            values[(int)KnownColor.DarkOrange] = unchecked((int)0xFFFF8C00);
-            values[(int)KnownColor.DarkOrchid] = unchecked((int)0xFF9932CC);
-            values[(int)KnownColor.DarkRed] = unchecked((int)0xFF8B0000);
-            values[(int)KnownColor.DarkSalmon] = unchecked((int)0xFFE9967A);
-            values[(int)KnownColor.DarkSeaGreen] = unchecked((int)0xFF8FBC8B);
-            values[(int)KnownColor.DarkSlateBlue] = unchecked((int)0xFF483D8B);
-            values[(int)KnownColor.DarkSlateGray] = unchecked((int)0xFF2F4F4F);
-            values[(int)KnownColor.DarkTurquoise] = unchecked((int)0xFF00CED1);
-            values[(int)KnownColor.DarkViolet] = unchecked((int)0xFF9400D3);
-            values[(int)KnownColor.DeepPink] = unchecked((int)0xFFFF1493);
-            values[(int)KnownColor.DeepSkyBlue] = unchecked((int)0xFF00BFFF);
-            values[(int)KnownColor.DimGray] = unchecked((int)0xFF696969);
-            values[(int)KnownColor.DodgerBlue] = unchecked((int)0xFF1E90FF);
-            values[(int)KnownColor.Firebrick] = unchecked((int)0xFFB22222);
-            values[(int)KnownColor.FloralWhite] = unchecked((int)0xFFFFFAF0);
-            values[(int)KnownColor.ForestGreen] = unchecked((int)0xFF228B22);
-            values[(int)KnownColor.Fuchsia] = unchecked((int)0xFFFF00FF);
-            values[(int)KnownColor.Gainsboro] = unchecked((int)0xFFDCDCDC);
-            values[(int)KnownColor.GhostWhite] = unchecked((int)0xFFF8F8FF);
-            values[(int)KnownColor.Gold] = unchecked((int)0xFFFFD700);
-            values[(int)KnownColor.Goldenrod] = unchecked((int)0xFFDAA520);
-            values[(int)KnownColor.Gray] = unchecked((int)0xFF808080);
-            values[(int)KnownColor.Green] = unchecked((int)0xFF008000);
-            values[(int)KnownColor.GreenYellow] = unchecked((int)0xFFADFF2F);
-            values[(int)KnownColor.Honeydew] = unchecked((int)0xFFF0FFF0);
-            values[(int)KnownColor.HotPink] = unchecked((int)0xFFFF69B4);
-            values[(int)KnownColor.IndianRed] = unchecked((int)0xFFCD5C5C);
-            values[(int)KnownColor.Indigo] = unchecked((int)0xFF4B0082);
-            values[(int)KnownColor.Ivory] = unchecked((int)0xFFFFFFF0);
-            values[(int)KnownColor.Khaki] = unchecked((int)0xFFF0E68C);
-            values[(int)KnownColor.Lavender] = unchecked((int)0xFFE6E6FA);
-            values[(int)KnownColor.LavenderBlush] = unchecked((int)0xFFFFF0F5);
-            values[(int)KnownColor.LawnGreen] = unchecked((int)0xFF7CFC00);
-            values[(int)KnownColor.LemonChiffon] = unchecked((int)0xFFFFFACD);
-            values[(int)KnownColor.LightBlue] = unchecked((int)0xFFADD8E6);
-            values[(int)KnownColor.LightCoral] = unchecked((int)0xFFF08080);
-            values[(int)KnownColor.LightCyan] = unchecked((int)0xFFE0FFFF);
-            values[(int)KnownColor.LightGoldenrodYellow] = unchecked((int)0xFFFAFAD2);
-            values[(int)KnownColor.LightGray] = unchecked((int)0xFFD3D3D3);
-            values[(int)KnownColor.LightGreen] = unchecked((int)0xFF90EE90);
-            values[(int)KnownColor.LightPink] = unchecked((int)0xFFFFB6C1);
-            values[(int)KnownColor.LightSalmon] = unchecked((int)0xFFFFA07A);
-            values[(int)KnownColor.LightSeaGreen] = unchecked((int)0xFF20B2AA);
-            values[(int)KnownColor.LightSkyBlue] = unchecked((int)0xFF87CEFA);
-            values[(int)KnownColor.LightSlateGray] = unchecked((int)0xFF778899);
-            values[(int)KnownColor.LightSteelBlue] = unchecked((int)0xFFB0C4DE);
-            values[(int)KnownColor.LightYellow] = unchecked((int)0xFFFFFFE0);
-            values[(int)KnownColor.Lime] = unchecked((int)0xFF00FF00);
-            values[(int)KnownColor.LimeGreen] = unchecked((int)0xFF32CD32);
-            values[(int)KnownColor.Linen] = unchecked((int)0xFFFAF0E6);
-            values[(int)KnownColor.Magenta] = unchecked((int)0xFFFF00FF);
-            values[(int)KnownColor.Maroon] = unchecked((int)0xFF800000);
-            values[(int)KnownColor.MediumAquamarine] = unchecked((int)0xFF66CDAA);
-            values[(int)KnownColor.MediumBlue] = unchecked((int)0xFF0000CD);
-            values[(int)KnownColor.MediumOrchid] = unchecked((int)0xFFBA55D3);
-            values[(int)KnownColor.MediumPurple] = unchecked((int)0xFF9370DB);
-            values[(int)KnownColor.MediumSeaGreen] = unchecked((int)0xFF3CB371);
-            values[(int)KnownColor.MediumSlateBlue] = unchecked((int)0xFF7B68EE);
-            values[(int)KnownColor.MediumSpringGreen] = unchecked((int)0xFF00FA9A);
-            values[(int)KnownColor.MediumTurquoise] = unchecked((int)0xFF48D1CC);
-            values[(int)KnownColor.MediumVioletRed] = unchecked((int)0xFFC71585);
-            values[(int)KnownColor.MidnightBlue] = unchecked((int)0xFF191970);
-            values[(int)KnownColor.MintCream] = unchecked((int)0xFFF5FFFA);
-            values[(int)KnownColor.MistyRose] = unchecked((int)0xFFFFE4E1);
-            values[(int)KnownColor.Moccasin] = unchecked((int)0xFFFFE4B5);
-            values[(int)KnownColor.NavajoWhite] = unchecked((int)0xFFFFDEAD);
-            values[(int)KnownColor.Navy] = unchecked((int)0xFF000080);
-            values[(int)KnownColor.OldLace] = unchecked((int)0xFFFDF5E6);
-            values[(int)KnownColor.Olive] = unchecked((int)0xFF808000);
-            values[(int)KnownColor.OliveDrab] = unchecked((int)0xFF6B8E23);
-            values[(int)KnownColor.Orange] = unchecked((int)0xFFFFA500);
-            values[(int)KnownColor.OrangeRed] = unchecked((int)0xFFFF4500);
-            values[(int)KnownColor.Orchid] = unchecked((int)0xFFDA70D6);
-            values[(int)KnownColor.PaleGoldenrod] = unchecked((int)0xFFEEE8AA);
-            values[(int)KnownColor.PaleGreen] = unchecked((int)0xFF98FB98);
-            values[(int)KnownColor.PaleTurquoise] = unchecked((int)0xFFAFEEEE);
-            values[(int)KnownColor.PaleVioletRed] = unchecked((int)0xFFDB7093);
-            values[(int)KnownColor.PapayaWhip] = unchecked((int)0xFFFFEFD5);
-            values[(int)KnownColor.PeachPuff] = unchecked((int)0xFFFFDAB9);
-            values[(int)KnownColor.Peru] = unchecked((int)0xFFCD853F);
-            values[(int)KnownColor.Pink] = unchecked((int)0xFFFFC0CB);
-            values[(int)KnownColor.Plum] = unchecked((int)0xFFDDA0DD);
-            values[(int)KnownColor.PowderBlue] = unchecked((int)0xFFB0E0E6);
-            values[(int)KnownColor.Purple] = unchecked((int)0xFF800080);
-            values[(int)KnownColor.Red] = unchecked((int)0xFFFF0000);
-            values[(int)KnownColor.RosyBrown] = unchecked((int)0xFFBC8F8F);
-            values[(int)KnownColor.RoyalBlue] = unchecked((int)0xFF4169E1);
-            values[(int)KnownColor.SaddleBrown] = unchecked((int)0xFF8B4513);
-            values[(int)KnownColor.Salmon] = unchecked((int)0xFFFA8072);
-            values[(int)KnownColor.SandyBrown] = unchecked((int)0xFFF4A460);
-            values[(int)KnownColor.SeaGreen] = unchecked((int)0xFF2E8B57);
-            values[(int)KnownColor.SeaShell] = unchecked((int)0xFFFFF5EE);
-            values[(int)KnownColor.Sienna] = unchecked((int)0xFFA0522D);
-            values[(int)KnownColor.Silver] = unchecked((int)0xFFC0C0C0);
-            values[(int)KnownColor.SkyBlue] = unchecked((int)0xFF87CEEB);
-            values[(int)KnownColor.SlateBlue] = unchecked((int)0xFF6A5ACD);
-            values[(int)KnownColor.SlateGray] = unchecked((int)0xFF708090);
-            values[(int)KnownColor.Snow] = unchecked((int)0xFFFFFAFA);
-            values[(int)KnownColor.SpringGreen] = unchecked((int)0xFF00FF7F);
-            values[(int)KnownColor.SteelBlue] = unchecked((int)0xFF4682B4);
-            values[(int)KnownColor.Tan] = unchecked((int)0xFFD2B48C);
-            values[(int)KnownColor.Teal] = unchecked((int)0xFF008080);
-            values[(int)KnownColor.Thistle] = unchecked((int)0xFFD8BFD8);
-            values[(int)KnownColor.Tomato] = unchecked((int)0xFFFF6347);
-            values[(int)KnownColor.Turquoise] = unchecked((int)0xFF40E0D0);
-            values[(int)KnownColor.Violet] = unchecked((int)0xFFEE82EE);
-            values[(int)KnownColor.Wheat] = unchecked((int)0xFFF5DEB3);
-            values[(int)KnownColor.White] = unchecked((int)0xFFFFFFFF);
-            values[(int)KnownColor.WhiteSmoke] = unchecked((int)0xFFF5F5F5);
-            values[(int)KnownColor.Yellow] = unchecked((int)0xFFFFFF00);
-            values[(int)KnownColor.YellowGreen] = unchecked((int)0xFF9ACD32);
-            s_colorTable = values;
-        }
-
-        private static void EnsureColorNameTable()
-        {
-            // no need to lock... worse case is a double create of the table...
-            //
-            if (s_colorNameTable == null)
-            {
-                InitColorNameTable();
-            }
-        }
-
-        private static void InitColorNameTable()
-        {
-            string[] values = new string[KnownColor.LastColor - KnownColor.FirstColor + 1];
-
-            // just consts...
-            //
-            values[(int)KnownColor.Transparent] = "Transparent";
-            values[(int)KnownColor.AliceBlue] = "AliceBlue";
-            values[(int)KnownColor.AntiqueWhite] = "AntiqueWhite";
-            values[(int)KnownColor.Aqua] = "Aqua";
-            values[(int)KnownColor.Aquamarine] = "Aquamarine";
-            values[(int)KnownColor.Azure] = "Azure";
-            values[(int)KnownColor.Beige] = "Beige";
-            values[(int)KnownColor.Bisque] = "Bisque";
-            values[(int)KnownColor.Black] = "Black";
-            values[(int)KnownColor.BlanchedAlmond] = "BlanchedAlmond";
-            values[(int)KnownColor.Blue] = "Blue";
-            values[(int)KnownColor.BlueViolet] = "BlueViolet";
-            values[(int)KnownColor.Brown] = "Brown";
-            values[(int)KnownColor.BurlyWood] = "BurlyWood";
-            values[(int)KnownColor.CadetBlue] = "CadetBlue";
-            values[(int)KnownColor.Chartreuse] = "Chartreuse";
-            values[(int)KnownColor.Chocolate] = "Chocolate";
-            values[(int)KnownColor.Coral] = "Coral";
-            values[(int)KnownColor.CornflowerBlue] = "CornflowerBlue";
-            values[(int)KnownColor.Cornsilk] = "Cornsilk";
-            values[(int)KnownColor.Crimson] = "Crimson";
-            values[(int)KnownColor.Cyan] = "Cyan";
-            values[(int)KnownColor.DarkBlue] = "DarkBlue";
-            values[(int)KnownColor.DarkCyan] = "DarkCyan";
-            values[(int)KnownColor.DarkGoldenrod] = "DarkGoldenrod";
-            values[(int)KnownColor.DarkGray] = "DarkGray";
-            values[(int)KnownColor.DarkGreen] = "DarkGreen";
-            values[(int)KnownColor.DarkKhaki] = "DarkKhaki";
-            values[(int)KnownColor.DarkMagenta] = "DarkMagenta";
-            values[(int)KnownColor.DarkOliveGreen] = "DarkOliveGreen";
-            values[(int)KnownColor.DarkOrange] = "DarkOrange";
-            values[(int)KnownColor.DarkOrchid] = "DarkOrchid";
-            values[(int)KnownColor.DarkRed] = "DarkRed";
-            values[(int)KnownColor.DarkSalmon] = "DarkSalmon";
-            values[(int)KnownColor.DarkSeaGreen] = "DarkSeaGreen";
-            values[(int)KnownColor.DarkSlateBlue] = "DarkSlateBlue";
-            values[(int)KnownColor.DarkSlateGray] = "DarkSlateGray";
-            values[(int)KnownColor.DarkTurquoise] = "DarkTurquoise";
-            values[(int)KnownColor.DarkViolet] = "DarkViolet";
-            values[(int)KnownColor.DeepPink] = "DeepPink";
-            values[(int)KnownColor.DeepSkyBlue] = "DeepSkyBlue";
-            values[(int)KnownColor.DimGray] = "DimGray";
-            values[(int)KnownColor.DodgerBlue] = "DodgerBlue";
-            values[(int)KnownColor.Firebrick] = "Firebrick";
-            values[(int)KnownColor.FloralWhite] = "FloralWhite";
-            values[(int)KnownColor.ForestGreen] = "ForestGreen";
-            values[(int)KnownColor.Fuchsia] = "Fuchsia";
-            values[(int)KnownColor.Gainsboro] = "Gainsboro";
-            values[(int)KnownColor.GhostWhite] = "GhostWhite";
-            values[(int)KnownColor.Gold] = "Gold";
-            values[(int)KnownColor.Goldenrod] = "Goldenrod";
-            values[(int)KnownColor.Gray] = "Gray";
-            values[(int)KnownColor.Green] = "Green";
-            values[(int)KnownColor.GreenYellow] = "GreenYellow";
-            values[(int)KnownColor.Honeydew] = "Honeydew";
-            values[(int)KnownColor.HotPink] = "HotPink";
-            values[(int)KnownColor.IndianRed] = "IndianRed";
-            values[(int)KnownColor.Indigo] = "Indigo";
-            values[(int)KnownColor.Ivory] = "Ivory";
-            values[(int)KnownColor.Khaki] = "Khaki";
-            values[(int)KnownColor.Lavender] = "Lavender";
-            values[(int)KnownColor.LavenderBlush] = "LavenderBlush";
-            values[(int)KnownColor.LawnGreen] = "LawnGreen";
-            values[(int)KnownColor.LemonChiffon] = "LemonChiffon";
-            values[(int)KnownColor.LightBlue] = "LightBlue";
-            values[(int)KnownColor.LightCoral] = "LightCoral";
-            values[(int)KnownColor.LightCyan] = "LightCyan";
-            values[(int)KnownColor.LightGoldenrodYellow] = "LightGoldenrodYellow";
-            values[(int)KnownColor.LightGray] = "LightGray";
-            values[(int)KnownColor.LightGreen] = "LightGreen";
-            values[(int)KnownColor.LightPink] = "LightPink";
-            values[(int)KnownColor.LightSalmon] = "LightSalmon";
-            values[(int)KnownColor.LightSeaGreen] = "LightSeaGreen";
-            values[(int)KnownColor.LightSkyBlue] = "LightSkyBlue";
-            values[(int)KnownColor.LightSlateGray] = "LightSlateGray";
-            values[(int)KnownColor.LightSteelBlue] = "LightSteelBlue";
-            values[(int)KnownColor.LightYellow] = "LightYellow";
-            values[(int)KnownColor.Lime] = "Lime";
-            values[(int)KnownColor.LimeGreen] = "LimeGreen";
-            values[(int)KnownColor.Linen] = "Linen";
-            values[(int)KnownColor.Magenta] = "Magenta";
-            values[(int)KnownColor.Maroon] = "Maroon";
-            values[(int)KnownColor.MediumAquamarine] = "MediumAquamarine";
-            values[(int)KnownColor.MediumBlue] = "MediumBlue";
-            values[(int)KnownColor.MediumOrchid] = "MediumOrchid";
-            values[(int)KnownColor.MediumPurple] = "MediumPurple";
-            values[(int)KnownColor.MediumSeaGreen] = "MediumSeaGreen";
-            values[(int)KnownColor.MediumSlateBlue] = "MediumSlateBlue";
-            values[(int)KnownColor.MediumSpringGreen] = "MediumSpringGreen";
-            values[(int)KnownColor.MediumTurquoise] = "MediumTurquoise";
-            values[(int)KnownColor.MediumVioletRed] = "MediumVioletRed";
-            values[(int)KnownColor.MidnightBlue] = "MidnightBlue";
-            values[(int)KnownColor.MintCream] = "MintCream";
-            values[(int)KnownColor.MistyRose] = "MistyRose";
-            values[(int)KnownColor.Moccasin] = "Moccasin";
-            values[(int)KnownColor.NavajoWhite] = "NavajoWhite";
-            values[(int)KnownColor.Navy] = "Navy";
-            values[(int)KnownColor.OldLace] = "OldLace";
-            values[(int)KnownColor.Olive] = "Olive";
-            values[(int)KnownColor.OliveDrab] = "OliveDrab";
-            values[(int)KnownColor.Orange] = "Orange";
-            values[(int)KnownColor.OrangeRed] = "OrangeRed";
-            values[(int)KnownColor.Orchid] = "Orchid";
-            values[(int)KnownColor.PaleGoldenrod] = "PaleGoldenrod";
-            values[(int)KnownColor.PaleGreen] = "PaleGreen";
-            values[(int)KnownColor.PaleTurquoise] = "PaleTurquoise";
-            values[(int)KnownColor.PaleVioletRed] = "PaleVioletRed";
-            values[(int)KnownColor.PapayaWhip] = "PapayaWhip";
-            values[(int)KnownColor.PeachPuff] = "PeachPuff";
-            values[(int)KnownColor.Peru] = "Peru";
-            values[(int)KnownColor.Pink] = "Pink";
-            values[(int)KnownColor.Plum] = "Plum";
-            values[(int)KnownColor.PowderBlue] = "PowderBlue";
-            values[(int)KnownColor.Purple] = "Purple";
-            values[(int)KnownColor.Red] = "Red";
-            values[(int)KnownColor.RosyBrown] = "RosyBrown";
-            values[(int)KnownColor.RoyalBlue] = "RoyalBlue";
-            values[(int)KnownColor.SaddleBrown] = "SaddleBrown";
-            values[(int)KnownColor.Salmon] = "Salmon";
-            values[(int)KnownColor.SandyBrown] = "SandyBrown";
-            values[(int)KnownColor.SeaGreen] = "SeaGreen";
-            values[(int)KnownColor.SeaShell] = "SeaShell";
-            values[(int)KnownColor.Sienna] = "Sienna";
-            values[(int)KnownColor.Silver] = "Silver";
-            values[(int)KnownColor.SkyBlue] = "SkyBlue";
-            values[(int)KnownColor.SlateBlue] = "SlateBlue";
-            values[(int)KnownColor.SlateGray] = "SlateGray";
-            values[(int)KnownColor.Snow] = "Snow";
-            values[(int)KnownColor.SpringGreen] = "SpringGreen";
-            values[(int)KnownColor.SteelBlue] = "SteelBlue";
-            values[(int)KnownColor.Tan] = "Tan";
-            values[(int)KnownColor.Teal] = "Teal";
-            values[(int)KnownColor.Thistle] = "Thistle";
-            values[(int)KnownColor.Tomato] = "Tomato";
-            values[(int)KnownColor.Turquoise] = "Turquoise";
-            values[(int)KnownColor.Violet] = "Violet";
-            values[(int)KnownColor.Wheat] = "Wheat";
-            values[(int)KnownColor.White] = "White";
-            values[(int)KnownColor.WhiteSmoke] = "WhiteSmoke";
-            values[(int)KnownColor.Yellow] = "Yellow";
-            values[(int)KnownColor.YellowGreen] = "YellowGreen";
-            s_colorNameTable = values;
-        }
-
-        public static int KnownColorToArgb(KnownColor color)
-        {
-            EnsureColorTable();
-            if (color >= KnownColor.FirstColor && color <= KnownColor.LastColor)
-            {
-                return s_colorTable[(int)color];
-            }
-            else
-            {
-                return 0;
-            }
-        }
-
-        public static string KnownColorToName(KnownColor color)
-        {
-            EnsureColorNameTable();
-            if (color >= KnownColor.FirstColor && color <= KnownColor.LastColor)
-            {
-                return s_colorNameTable[(int)color];
-            }
-            else
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/Point.cs b/src/System.Drawing.Primitives/src/System/Drawing/Point.cs
index e01ac07ab3..825bc4101e 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/Point.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/Point.cs
@@ -13,7 +13,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct Point : IEquatable<Point>
     {
@@ -23,8 +23,8 @@ namespace System.Drawing
         /// </summary>
         public static readonly Point Empty = new Point();
 
-        private int x; // Do not rename (binary serialization) 
-        private int y; // Do not rename (binary serialization) 
+        private int x; // Do not rename (binary serialization)
+        private int y; // Do not rename (binary serialization)
 
         /// <summary>
         ///    Initializes a new instance of the <see cref='System.Drawing.Point'/> class
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs b/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs
index 473991ab2f..1608ff2f54 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/PointF.cs
@@ -13,7 +13,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct PointF : IEquatable<PointF>
     {
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs b/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs
index 758f636a48..14558dcf50 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/Rectangle.cs
@@ -15,7 +15,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct Rectangle : IEquatable<Rectangle>
     {
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs b/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs
index 47844683f3..135db559de 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/RectangleF.cs
@@ -15,7 +15,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct RectangleF : IEquatable<RectangleF>
     {
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/Size.cs b/src/System.Drawing.Primitives/src/System/Drawing/Size.cs
index f8e6d4ae1b..9de74ffb07 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/Size.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/Size.cs
@@ -16,7 +16,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b03f5f7f11d50a3a")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
 #endif
     public struct Size : IEquatable<Size>
     {
diff --git a/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs b/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
index 6f600ac036..bf05c482a5 100644
--- a/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
+++ b/src/System.Drawing.Primitives/src/System/Drawing/SizeF.cs
@@ -18,7 +18,7 @@ namespace System.Drawing
     /// </summary>
     [Serializable]
 #if !MONO
-    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, PublicKeyToken=b77a5c561934e089")]
+    [System.Runtime.CompilerServices.TypeForwardedFrom("System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 #endif
     public struct SizeF : IEquatable<SizeF>
     {
diff --git a/src/System.Drawing.Primitives/tests/ColorTests.cs b/src/System.Drawing.Primitives/tests/ColorTests.cs
index 4dd98ae113..cb80989bdd 100644
--- a/src/System.Drawing.Primitives/tests/ColorTests.cs
+++ b/src/System.Drawing.Primitives/tests/ColorTests.cs
@@ -11,7 +11,7 @@ namespace System.Drawing.Primitives.Tests
 {
     public partial class ColorTests
     {
-        public static IEnumerable<object[]> NamedArgbValues =>
+        public static readonly IEnumerable<object[]> NamedArgbValues =
             new[]
             {
                 new object[] {"Transparent", 0, 255, 255, 255},
@@ -157,9 +157,10 @@ namespace System.Drawing.Primitives.Tests
                 new object[] {"YellowGreen", 255, 154, 205, 50},
             };
 
-        public static IEnumerable<object[]> ColorNames => typeof(Color).GetProperties()
+        public static readonly IEnumerable<object[]> ColorNames = typeof(Color).GetProperties()
                 .Where(p => p.PropertyType == typeof(Color))
-                .Select(p => new object[] { p.Name} );
+                .Select(p => new object[] { p.Name })
+                .ToArray();
 
         private Color? GetColorByProperty(string name)
         {
diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
index bc7c3a767d..6201723711 100644
--- a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
+++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <PropertyGroup>
-    <ProjectGuid>{297A9116-1005-499D-A895-2063D03E4C94}</ProjectGuid>
+    <ProjectGuid>{CF54638C-A382-4A78-9AD6-2304CEEFEB01}</ProjectGuid>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" />
@@ -37,4 +37,4 @@
     <Compile Include="SizeTests.netcoreapp.cs" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file