Fix cross framework incompatibility for System.Drawing.Color (#208)

* Fix cross framework problem with System.Drawing

* Merge PR #206 test case

* Generalize type package name transformation for cross framework compatibility

* Define compiler directives that are missing in CI/CD

* Change class based configuration to lambda function

Author: Arkatufus

src/Hyperion.Tests/Bugs.cs

@@ -11,6 +11,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -24,7 +25,7 @@
 namespace Hyperion.Tests
 {
 
-    public class Bugs
+    public class Bugs : TestBase
     {
         private readonly ITestOutputHelper _output;
 
@@ -218,6 +219,19 @@ public void CanSerializeUri()
             Assert.Equal(stream.Length, stream.Position);
         }
 
+        #region Issue 117
+
+        [Fact]
+        public void CanSerializeColor()
+        {
+            var expected = Color.Aquamarine;
+            Serialize(expected);
+            Reset();
+            var actual = Deserialize<Color>();
+            Assert.Equal(expected, actual);
+        }
+
+        #endregion
 
         public class SnapshotSelectionCriteria
         {

src/Hyperion.Tests/CrossFrameworkSerializationTests.cs

@@ -1,7 +1,9 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using FluentAssertions;
 using Hyperion.Tests.Generator;
 using Xunit;
@@ -19,9 +21,21 @@ public class CrossFrameworkSerializationTests
         public CrossFrameworkSerializationTests(ITestOutputHelper log)
         {
             _log = log;
-            _serializer = new Serializer();
             _originalObject = CrossFrameworkInitializer.Init();
             _originalMixedObject = CrossFrameworkInitializer.InitMixed();
+
+            // Demonstrating the use of custom dll package name override
+            // to convert netcore System.Drawing.Primitives to netfx 
+            // System.Drawing package.
+            #if NETFX
+            _serializer = new Serializer(new SerializerOptions(
+                packageNameOverrides: new List<Func<string, string>>
+                {
+                    str => str.Contains("System.Drawing.Primitives") ? str.Replace(".Primitives", "") : str
+                }));
+            #elif NETCOREAPP
+            _serializer = new Serializer();
+            #endif
         }
 
         public static IEnumerable<object[]> SerializationFiles()

src/Hyperion.Tests/Generator/CrossFrameworkClass.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Drawing;
 
 namespace Hyperion.Tests.Generator
 {
@@ -144,6 +146,15 @@ public class CrossFrameworkMixedClass : CrossFrameworkBase
         public Type FriendType { get; set; }
         public CrossFrameworkClass Data { get; set; }
 
+        // Test case for (netcore) System.Drawing.Primitives to (net45) System.Drawing
+        public Color Color { get; set; }
+        public Point Point { get; set; }
+        public PointF PointF { get; set; }
+        public Rectangle Rectangle { get; set; }
+        public RectangleF RectangleF { get; set; }
+        public Size Size { get; set; }
+        public SizeF SizeF { get; set; }
+
         public override bool Equals(object obj)
         {
             if (!(obj is CrossFrameworkMixedClass other))

src/Hyperion.Tests/Generator/CrossFrameworkInitializer.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Drawing;
 
 namespace Hyperion.Tests.Generator
 {
@@ -13,6 +15,13 @@ public static CrossFrameworkMixedClass InitMixed()
                 Name = "Cookie",
                 Sound = "Bark",
                 FriendType = typeof(CrossFrameworkClass),
+                Color = Color.Blue,
+                Point = new Point(10, 10),
+                PointF = new PointF(10, 10),
+                Rectangle = new Rectangle(10, 10, 10, 10),
+                RectangleF = new RectangleF(10, 10, 10, 10),
+                Size = new Size(10, 10),
+                SizeF = new SizeF(10, 10),
                 Data = Init()
             };
         }

src/Hyperion.Tests/Hyperion.Tests.csproj

@@ -9,6 +9,14 @@
     <StartupObject>Hyperion.Tests.Generator.Program</StartupObject>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
+    <DefineConstants>$(DefineConstants);NETCOREAPP</DefineConstants>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
+    <DefineConstants>$(DefineConstants);NETFX</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
@@ -22,4 +30,9 @@
     <ProjectReference Include="..\Hyperion\Hyperion.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+      <Reference Include="System.Drawing">
+        <Private>true</Private>
+      </Reference>
+  </ItemGroup>
 </Project>