Improved BAML connection id analysis when dependencies are missing

dnSpyEx · Sep 19, 2023 · cac9f42 · cac9f42
1 parent 8355a6a
commit cac9f42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Extensions/dnSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs b/Extensions/dnSpy.BamlDecompiler/Rewrite/ConnectionIdRewritePass.cs
@@ -131,7 +131,7 @@ public void Callback(XamlContext ctx, XElement elem) {
 		}
 
 		struct EventAttachment {
-			public TypeDef AttachedType;
+			public ITypeDefOrRef AttachedType;
 			public string EventName;
 			public string MethodName;
 
@@ -216,7 +216,7 @@ Dictionary<int, Action<XamlContext, XElement>> ExtractConnectionId(XamlContext c
 								evName = evName.Substring(0, evName.Length - 5);
 
 							cb += new EventAttachment {
-								AttachedType = reField.DeclaringType.ResolveTypeDefThrow(),
+								AttachedType = reField.DeclaringType.ResolveTypeDef() ?? reField.DeclaringType,
 								EventName = evName,
 								MethodName = IdentifierEscaper.Escape(handler.Name)
 							}.Callback;