From fdb5ec97e22d44c6e18af352fa8c583da5768697 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sat, 27 Feb 2021 21:37:23 +0100 Subject: [PATCH] Fix build. --- ILSpy/Analyzers/AnalyzerScope.cs | 3 ++- ILSpy/TreeNodes/DerivedTypesTreeNode.cs | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ILSpy/Analyzers/AnalyzerScope.cs b/ILSpy/Analyzers/AnalyzerScope.cs index f735be46b..26480a913 100644 --- a/ILSpy/Analyzers/AnalyzerScope.cs +++ b/ILSpy/Analyzers/AnalyzerScope.cs @@ -181,7 +181,8 @@ namespace ICSharpCode.ILSpy.Analyzers if (friendAssemblies.Count > 0) { - IEnumerable assemblies = AssemblyList.GetAssemblies(); + IEnumerable assemblies = AssemblyList.GetAllAssemblies() + .GetAwaiter().GetResult(); foreach (var assembly in assemblies) { diff --git a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs index 7f826b390..3221af947 100644 --- a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs +++ b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs @@ -58,15 +58,16 @@ namespace ICSharpCode.ILSpy.TreeNodes IEnumerable FetchChildren(CancellationToken cancellationToken) { // FetchChildren() runs on the main thread; but the enumerator will be consumed on a background thread - var assemblies = list.GetAssemblies().Select(node => node.GetPEFileOrNull()).Where(asm => asm != null).ToArray(); - return FindDerivedTypes(list, type, assemblies, cancellationToken); + return FindDerivedTypes(list, type, cancellationToken); } internal static IEnumerable FindDerivedTypes(AssemblyList list, ITypeDefinition type, - PEFile[] assemblies, CancellationToken cancellationToken) + CancellationToken cancellationToken) { var definitionMetadata = type.ParentModule.PEFile.Metadata; var metadataToken = (SRM.TypeDefinitionHandle)type.MetadataToken; + var assemblies = list.GetAllAssemblies().GetAwaiter().GetResult() + .Select(node => node.GetPEFileOrNull()).Where(asm => asm != null).ToArray(); foreach (var module in assemblies) { var metadata = module.Metadata;