Cater net 45 and non-compiling solutions

icsharpcode · Feb 24, 2024 · ee21027 · ee21027
1 parent 18e8526
commit ee21027
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CodeConverter/CSharp/BuiltInVisualBasicOperatorSubstitutions.cs b/CodeConverter/CSharp/BuiltInVisualBasicOperatorSubstitutions.cs
@@ -472,7 +472,7 @@ private static bool IsStringType(this ITypeSymbol @this)
 
     private static bool IsObjectType(this ITypeSymbol @this)
     {
-        return @this.SpecialType == SpecialType.System_Object;
+        return @this?.SpecialType == SpecialType.System_Object;
     }
 
     private static bool IsDecimalType(this ITypeSymbol @this)

diff --git a/CodeConverter/CSharp/CommonConversions.cs b/CodeConverter/CSharp/CommonConversions.cs
@@ -756,5 +756,5 @@ public bool IsLinqDelegateExpression(VisualBasicSyntaxNode node)
         return false;
     }
 
-    private bool IsLinqDelegateExpression(ITypeSymbol convertedType) => System_Linq_Expressions_Expression_T.Equals(convertedType?.OriginalDefinition, SymbolEqualityComparer.Default);
+    private bool IsLinqDelegateExpression(ITypeSymbol convertedType) => System_Linq_Expressions_Expression_T?.Equals(convertedType?.OriginalDefinition, SymbolEqualityComparer.Default) == true;
 }
diff --git a/CodeConverter/CSharp/MethodInfoExtensions.cs b/CodeConverter/CSharp/MethodInfoExtensions.cs
@@ -42,7 +42,9 @@ private static TDesiredFunc CreateOpenInstanceDelegateForcingType<TDesiredFunc>(
     public static MethodInfo ReflectedPropertyGetter<TInstance>(this TInstance instance,
         string propertyToAccess)
     {
-        var propertyInfo = instance.GetType().GetProperty(propertyToAccess, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
+        var type = instance.GetType();
+        var propertyInfo = type.GetProperty(propertyToAccess, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
+        propertyInfo ??= type.ReflectedType?.GetProperty(propertyToAccess, BindingFlags.NonPublic | BindingFlags.Static | BindingFlags.Instance);
         return propertyInfo?.GetMethod.GetRuntimeBaseDefinition();
     }
 }