Updating to NetStandardPolyfills v1.2, removing dependency on System.Reflection.TypeExtensions

SteveWilkes · SteveWilkes · commit 2013f67a8e28 · 2017-12-02T14:52:41.000Z
diff --git a/ReadableExpressions.UnitTests/ReadableExpressions.UnitTests.csproj b/ReadableExpressions.UnitTests/ReadableExpressions.UnitTests.csproj
@@ -35,8 +35,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AgileObjects.NetStandardPolyfills, Version=1.0.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
-      <HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.0.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
+    <Reference Include="AgileObjects.NetStandardPolyfills, Version=1.2.0.0, Culture=neutral, PublicKeyToken=06131ac1c008ad4e, processorArchitecture=MSIL">
+      <HintPath>..\packages\AgileObjects.NetStandardPolyfills.1.2.0\lib\net40\AgileObjects.NetStandardPolyfills.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
diff --git a/ReadableExpressions.UnitTests/packages.config b/ReadableExpressions.UnitTests/packages.config
@@ -1,4 +1,4 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AgileObjects.NetStandardPolyfills" version="1.0.0" targetFramework="net45" />
+  <package id="AgileObjects.NetStandardPolyfills" version="1.2.0" targetFramework="net45" />
 </packages>
diff --git a/ReadableExpressions/Extensions/PublicTypeExtensions.cs b/ReadableExpressions/Extensions/PublicTypeExtensions.cs
@@ -3,9 +3,6 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-#if NET_STANDARD
-    using System.Reflection;
-#endif
     using NetStandardPolyfills;
 
     /// <summary>
@@ -55,7 +52,7 @@ public static string GetFriendlyName(this Type type)
 
         private static string GetGenericTypeName(Type genericType)
         {
-            var typeGenericTypeArguments = genericType.GetGenericArguments();
+            var typeGenericTypeArguments = genericType.GetGenericTypeArguments();
 
             if (!genericType.IsNested)
             {
diff --git a/ReadableExpressions/ReadableExpressions.csproj b/ReadableExpressions/ReadableExpressions.csproj
@@ -24,19 +24,14 @@
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <RootNamespace>AgileObjects.ReadableExpressions</RootNamespace>
-    <AssemblyVersion>1.9.5.0</AssemblyVersion>
-    <FileVersion>1.9.5.0</FileVersion>
-    <Version>1.9.5</Version>
+    <AssemblyVersion>1.9.6.0</AssemblyVersion>
+    <FileVersion>1.9.6.0</FileVersion>
+    <Version>1.9.6</Version>
     <Company>AgileObjects Ltd</Company>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
@@ -48,4 +43,8 @@
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.2.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/ReadableExpressions/Translators/ConstantExpressionTranslator.cs b/ReadableExpressions/Translators/ConstantExpressionTranslator.cs
@@ -3,9 +3,6 @@ namespace AgileObjects.ReadableExpressions.Translators
     using System;
     using System.Globalization;
     using System.Linq.Expressions;
-#if NET_STANDARD
-    using System.Reflection;
-#endif
     using System.Text.RegularExpressions;
     using Extensions;
     using NetStandardPolyfills;
@@ -230,7 +227,7 @@ private static string FormatNumeric(float value)
 
         private static bool IsType(ConstantExpression constant, out string translation)
         {
-            if (typeof(Type).IsAssignableFrom(constant.Type))
+            if (constant.Type.IsAssignableTo(typeof(Type)))
             {
                 translation = $"typeof({((Type)constant.Value).GetFriendlyName()})";
                 return true;
diff --git a/ReadableExpressions/Translators/DynamicExpressionTranslator.cs b/ReadableExpressions/Translators/DynamicExpressionTranslator.cs
@@ -6,6 +6,7 @@ namespace AgileObjects.ReadableExpressions.Translators
     using System.Linq.Expressions;
     using System.Reflection;
     using System.Text.RegularExpressions;
+    using NetStandardPolyfills;
 
     internal class DynamicExpressionTranslator : ExpressionTranslatorBase
     {
@@ -164,7 +165,7 @@ protected override bool DoTranslate(
                 var subjectObject = dynamicExpression.Arguments.First();
                 var subject = context.Translate(subjectObject);
                 var methodName = match.Groups["MethodName"].Value;
-                var method = subjectObject.Type.GetMethod(methodName);
+                var method = subjectObject.Type.GetPublicMethod(methodName);
                 var methodArguments = dynamicExpression.Arguments.Skip(1).ToArray();
 
                 var methodInfo = GetMethodInfo(
diff --git a/ReadableExpressions/Translators/MethodCallExpressionTranslator.cs b/ReadableExpressions/Translators/MethodCallExpressionTranslator.cs
@@ -167,7 +167,7 @@ private static void RemoveSuppliedGenericTypeParameters(
 
                 if (type.IsGenericType())
                 {
-                    RemoveSuppliedGenericTypeParameters(type.GetGenericArguments(), genericParameterTypes);
+                    RemoveSuppliedGenericTypeParameters(type.GetGenericTypeArguments(), genericParameterTypes);
                 }
             }
         }
@@ -242,7 +242,7 @@ public override string Translate(Expression expression, TranslationContext conte
                     invocationSubject = invocationSubject.WithSurroundingParentheses();
                 }
 
-                var invocationMethod = invocation.Expression.Type.GetMethod("Invoke");
+                var invocationMethod = invocation.Expression.Type.GetPublicInstanceMethod("Invoke");
 
                 return _methodCallTranslator.Invoke(
                     invocationSubject,
@@ -270,8 +270,8 @@ private static bool IsIndexedPropertyAccess(Expression expression)
                 var property = methodCall
                     .Object?
                     .Type
-                    .GetProperties()
-                    .FirstOrDefault(p => p.GetAccessors().Contains(methodCall.Method));
+                    .GetPublicInstanceProperties()
+                    .FirstOrDefault(p => p.IsIndexer() && p.GetAccessors().Contains(methodCall.Method));
 
                 if (property == null)
                 {

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private static void RemoveSuppliedGenericTypeParameters(`
`167`	`167`
`168`	`168`	`if (type.IsGenericType())`
`169`	`169`	`{`
`170`		`- RemoveSuppliedGenericTypeParameters(type.GetGenericArguments(), genericParameterTypes);`
	`170`	`+ RemoveSuppliedGenericTypeParameters(type.GetGenericTypeArguments(), genericParameterTypes);`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -242,7 +242,7 @@ public override string Translate(Expression expression, TranslationContext conte`
`242`	`242`	`invocationSubject = invocationSubject.WithSurroundingParentheses();`
`243`	`243`	`}`
`244`	`244`
`245`		`- var invocationMethod = invocation.Expression.Type.GetMethod("Invoke");`
	`245`	`+ var invocationMethod = invocation.Expression.Type.GetPublicInstanceMethod("Invoke");`
`246`	`246`
`247`	`247`	`return _methodCallTranslator.Invoke(`
`248`	`248`	`invocationSubject,`
`@@ -270,8 +270,8 @@ private static bool IsIndexedPropertyAccess(Expression expression)`
`270`	`270`	`var property = methodCall`
`271`	`271`	`.Object?`
`272`	`272`	`.Type`
`273`		`- .GetProperties()`
`274`		`- .FirstOrDefault(p => p.GetAccessors().Contains(methodCall.Method));`
	`273`	`+ .GetPublicInstanceProperties()`
	`274`	`+ .FirstOrDefault(p => p.IsIndexer() && p.GetAccessors().Contains(methodCall.Method));`
`275`	`275`
`276`	`276`	`if (property == null)`
`277`	`277`	`{`