Accommodate mono runtime differences

microsoft · Jan 21, 2021 · 735b83f · 735b83f
1 parent 0a9cc25
commit 735b83f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Microsoft.VisualStudio.Composition/ReflectionHelpers.cs b/src/Microsoft.VisualStudio.Composition/ReflectionHelpers.cs
@@ -110,6 +110,10 @@ internal static Assignability IsAssignableTo(ImportDefinitionBinding import, Exp
                 {
                     return Assignability.DefinitelyNot;
                 }
+                catch (TargetParameterCountException)
+                {
+                    return Assignability.DefinitelyNot;
+                }
             }
             else
             {

diff --git a/src/tests/Microsoft.VisualStudio.Composition.Tests/AssembliesLazyLoadedTests.cs b/src/tests/Microsoft.VisualStudio.Composition.Tests/AssembliesLazyLoadedTests.cs
@@ -82,9 +82,10 @@ public async Task ComposableAssembliesLazyLoadedWhenQueried()
             }
         }
 
-        [Fact]
+        [SkippableFact]
         public async Task CatalogGetInputAssembliesDoesNotLoadLazyExports()
         {
+            SkipOnMono();
             var catalog = TestUtilities.EmptyCatalog.AddParts(
                 await TestUtilities.V2Discovery.CreatePartsAsync(typeof(ExternalExportWithExternalMetadataType), typeof(ExternalExportWithExternalMetadataTypeArray), typeof(ExternalExportWithExternalMetadataEnum32)));
             var catalogCache = await this.SaveCatalogAsync(catalog);