Merge pull request #818 from neuecc/fix-unity-netstandard20-union

Fix compiler error on Unity + .NET Standard 2.0 + generated Union code

Author: DotDeveloper95

sandbox/DynamicCodeDumper/DynamicCodeDumper.csproj

@@ -39,6 +39,9 @@
     <Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\CodeGenHelpers.cs">
       <Link>Code\CodeGenHelpers.cs</Link>
     </Compile>
+    <Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\RuntimeTypeHandleEqualityComparer.cs">
+      <Link>Code\RuntimeTypeHandleEqualityComparer.cs</Link>
+    </Compile>
     <Compile Include="..\..\src\MessagePack.UnityClient\Assets\Scripts\MessagePack\Internal\DynamicAssembly.cs">
       <Link>Code\DynamicAssembly.cs</Link>
     </Compile>

src/MessagePack.GeneratorCore/Utils/PseudoCompilation.cs

@@ -401,8 +401,13 @@ private static string NormalizeDirectorySeparators(string path)
 
         private static IEnumerable<string> GetCompileFullPaths(XElement compile, string includeOrRemovePattern, string csProjRoot)
         {
+            if (string.IsNullOrEmpty(csProjRoot))
+            {
+                csProjRoot = "./";
+            }
+
             // solve macro
-            includeOrRemovePattern = includeOrRemovePattern.Replace("$(ProjectDir)", csProjRoot);
+            includeOrRemovePattern = includeOrRemovePattern.Replace("$(ProjectDir)", csProjRoot).Replace("$(MSBuildProjectDirectory)", csProjRoot);
 
             var matcher = new Matcher(StringComparison.OrdinalIgnoreCase);
             matcher.AddIncludePatterns(includeOrRemovePattern.Split(';'));

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Internal/RuntimeTypeHandleEqualityComparer.cs

@@ -0,0 +1,31 @@
+// Copyright (c) All contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+
+namespace MessagePack.Internal
+{
+    // This code is used in generated code so must be public.
+
+    // RuntimeTypeHandle can embed directly by OpCodes.Ldtoken
+    // It does not implements IEquatable<T>(but GetHashCode and Equals is implemented) so needs this to avoid boxing.
+    public class RuntimeTypeHandleEqualityComparer : IEqualityComparer<RuntimeTypeHandle>
+    {
+        public static readonly IEqualityComparer<RuntimeTypeHandle> Default = new RuntimeTypeHandleEqualityComparer();
+
+        private RuntimeTypeHandleEqualityComparer()
+        {
+        }
+
+        public bool Equals(RuntimeTypeHandle x, RuntimeTypeHandle y)
+        {
+            return x.Equals(y);
+        }
+
+        public int GetHashCode(RuntimeTypeHandle obj)
+        {
+            return obj.GetHashCode();
+        }
+    }
+}

src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicUnionResolver.cs

@@ -480,30 +480,6 @@ private static class MessagePackWriterTypeInfo
             internal static readonly MethodInfo WriteNil = typeof(MessagePackWriter).GetRuntimeMethod(nameof(MessagePackWriter.WriteNil), Type.EmptyTypes);
         }
     }
-}
-
-namespace MessagePack.Internal
-{
-    // RuntimeTypeHandle can embed directly by OpCodes.Ldtoken
-    // It does not implements IEquatable<T>(but GetHashCode and Equals is implemented) so needs this to avoid boxing.
-    public class RuntimeTypeHandleEqualityComparer : IEqualityComparer<RuntimeTypeHandle>
-    {
-        public static readonly IEqualityComparer<RuntimeTypeHandle> Default = new RuntimeTypeHandleEqualityComparer();
-
-        private RuntimeTypeHandleEqualityComparer()
-        {
-        }
-
-        public bool Equals(RuntimeTypeHandle x, RuntimeTypeHandle y)
-        {
-            return x.Equals(y);
-        }
-
-        public int GetHashCode(RuntimeTypeHandle obj)
-        {
-            return obj.GetHashCode();
-        }
-    }
 
     internal class MessagePackDynamicUnionResolverException : MessagePackSerializationException
     {