Fix root module, fix type names, powershell version may be string

Author: rjmholt

CrossCompatibility/CrossCompatibility.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Script module or binary module file associated with this manifest.
-RootModule = '.\CrossCompatibility.psm1'
+RootModule = 'CrossCompatibility.psm1'
 
 # Version number of this module.
 ModuleVersion = '0.0.1'

CrossCompatibility/CrossCompatibility/Data/Platform/PowerShellData.cs

@@ -16,7 +16,7 @@ public class PowerShellData : ICloneable
         /// From $PSVersionTable.PSVersion.
         /// </summary>
         [DataMember]
-        public Version Version { get; set; }
+        public string Version { get; set; }
 
         /// <summary>
         /// The edition of PowerShell, from

CrossCompatibility/CrossCompatibility/Query/Platform/PowerShellData.cs

@@ -13,7 +13,7 @@ public PowerShellData(PowerShellDataMut powerShellData)
             _powerShellData = powerShellData;
         }
 
-        public Version Version => _powerShellData.Version;
+        public string Version => _powerShellData.Version;
 
         public string Edition => _powerShellData.Edition;
 

CrossCompatibility/CrossCompatibility/Utility/CompatibilityProfileConversion.cs

@@ -486,102 +486,7 @@ private static bool HasSpecialMethodPrefix(MemberInfo member)
 
         public static string GetFullTypeName(Type type)
         {
-            if (TryGetGenericParameterTypeName(type, out string genericTypeParamName))
-            {
-                return genericTypeParamName;
-            }
-
-            if (!type.IsGenericType)
-            {
-                return type.FullName;
-            }
-
-            var sb = new StringBuilder(type.Namespace).Append('.');
-
-            if (!type.IsNested)
-            {
-                int backtickIdx = type.Name.IndexOf('`');
-                sb.Append(type.Name.Substring(0, backtickIdx));
-            }
-            else
-            {
-                // Run up to the outermost type
-                Type currType = type;
-                var typePath = new Stack<Type>();
-                do
-                {
-                    typePath.Push(currType);
-                    currType = currType.DeclaringType;
-                }
-                while (currType != null);
-
-                // Now unspool back down to the base type
-                while (typePath.Any())
-                {
-                    Type innerType = typePath.Pop();
-
-                    int backtickIdx = innerType.Name.IndexOf('`');
-                    if (backtickIdx > 0)
-                    {
-                        sb.Append(innerType.Name.Substring(0, backtickIdx));
-                    }
-                    else
-                    {
-                        sb.Append(innerType.Name);
-                    }
-
-                    if (typePath.Any())
-                    {
-                        sb.Append('+');
-                    }
-                }
-            }
-
-            sb.Append('[');
-
-            Type[] typeParameters = type.GetGenericArguments();
-            for (int i = 0; i < typeParameters.Length; i++)
-            {
-                sb.Append(GetFullTypeName(typeParameters[i]));
-
-                if (i < typeParameters.Length - 1)
-                {
-                    sb.Append(',');
-                }
-            }
-
-            sb.Append(']');
-
-            return sb.ToString();
-        }
-        
-        private static bool TryGetGenericParameterTypeName(Type t, out string name)
-        {
-            if (t.IsGenericParameter)
-            {
-                string typeParamName = t.Name;
-                name = new StringBuilder(typeParamName.Length + 2)
-                    .Append('<')
-                    .Append(typeParamName)
-                    .Append('>')
-                    .ToString();
-                return true;
-            }
-
-            if (t.IsByRef && TryGetGenericParameterTypeName(t.GetElementType(), out string refElementName))
-            {
-                name = refElementName + '&';
-                return true;
-            }
-
-            if (t.IsArray && TryGetGenericParameterTypeName(t.GetElementType(), out string arrElementName))
-            {
-                name = arrElementName + "[]";
-                return true;
-            }
-
-            name = null;
-            return false;
+            return type?.ToString();
         }
     }
 }

CrossCompatibility/Tests/UtilityApi.Tests.ps1

@@ -0,0 +1,30 @@
+Import-Module "$PSScriptRoot/../out/CrossCompatibility" -Force -ErrorAction Stop
+
+Describe "Type name transformation" {
+    BeforeAll {
+        $typeNameTestCases = @(
+            @{ InputType = [System.Reflection.Assembly]; ExpectedName = "System.Reflection.Assembly" }
+            @{ InputType = [string]; ExpectedName = "System.String" }
+            @{ InputType = [datetime]; ExpectedName = "System.DateTime" }
+            @{ InputType = [string[]]; ExpectedName = "System.String[]" }
+            @{ InputType = [System.Collections.Generic.List[object]]; ExpectedName = "System.Collections.Generic.List``1[System.Object]" }
+            @{ InputType = [System.Collections.Generic.Dictionary[string, object]]; ExpectedName = "System.Collections.Generic.Dictionary``2[System.String,System.Object]" }
+            @{ InputType = [System.Func`1]; ExpectedName = "System.Func``1[TResult]" }
+            @{ InputType = [System.Collections.Generic.Dictionary`2]; ExpectedName = "System.Collections.Generic.Dictionary``2[TKey,TValue]" }
+            @{ InputType = [System.Collections.Generic.Dictionary`2+Enumerator]; ExpectedName = "System.Collections.Generic.Dictionary``2+Enumerator[TKey,TValue]" }
+            @{ InputType = [System.Collections.Generic.Dictionary[string,object]].GetNestedType('Enumerator'); ExpectedName = "System.Collections.Generic.Dictionary``2+Enumerator[TKey,TValue]" }
+            @{ InputType = [System.Collections.Concurrent.ConcurrentDictionary`2].GetMethod('ToArray').ReturnType; ExpectedName = "System.Collections.Generic.KeyValuePair``2[TKey,TValue][]"}
+        )
+    }
+
+    It "Serializes the name of type <InputType> to <ExpectedName>" -TestCases $typeNameTestCases {
+        param([type]$InputType, [string]$ExpectedName)
+
+        $name = [Microsoft.PowerShell.CrossCompatibility.Utility.TypeDataConversion]::GetFullTypeName($InputType)
+        $name | Should -BeExactly $ExpectedName
+    }
+
+    It "Null type gives null type name" {
+        [Microsoft.PowerShell.CrossCompatibility.Utility.TypeDataConversion]::GetFullTypeName($null) | Should -Be $null
+    }
+}