Fixed #209 - Resolving all transitive references from declared CodeMo…

…dules
lkosson · Jan 29, 2025 · 791832e · 791832e
1 parent 1b83691
commit 791832e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/...t.ReportViewer.Common/Microsoft.ReportingServices.Diagnostics/AssemblyLocationResolver.cs b/...t.ReportViewer.Common/Microsoft.ReportingServices.Diagnostics/AssemblyLocationResolver.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 
 namespace Microsoft.ReportingServices.Diagnostics
@@ -21,9 +22,22 @@ public static AssemblyLocationResolver CreateResolver(AppDomain tempAppDomain)
 #endif
 		}
 
-		public string LoadAssemblyAndResolveLocation(string name)
+		public string[] LoadAssemblyAndResolveLocation(string name)
 		{
-			return Assembly.Load(name).Location;
+			var locations = new List<string>();
+			LoadAssemblyAndResolveLocation(new AssemblyName(name), locations);
+			return locations.ToArray();
+		}
+
+		private void LoadAssemblyAndResolveLocation(AssemblyName name, List<string> locations)
+		{
+			var assembly = Assembly.Load(name);
+			if (locations.Contains(assembly.Location)) return;
+			locations.Add(assembly.Location);
+			foreach (var referencedAssembly in assembly.GetReferencedAssemblies())
+			{
+				LoadAssemblyAndResolveLocation(referencedAssembly, locations);
+			}
 		}
 
 		public AssemblyLocationResolver()

diff --git a/Microsoft.ReportViewer.Common/Microsoft.ReportingServices.RdlExpressions/ExprHostCompiler.cs b/Microsoft.ReportViewer.Common/Microsoft.ReportingServices.RdlExpressions/ExprHostCompiler.cs
@@ -328,7 +328,7 @@ private void ResolveAssemblylocations(List<string> codeModules, CompilerParamete
 			{
 				try
 				{
-					options.ReferencedAssemblies.Add(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
+					options.ReferencedAssemblies.AddRange(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
 				}
 				catch (Exception ex)
 				{

diff --git a/...oft.ReportViewer.Common/Microsoft.ReportingServices.ReportProcessing/ReportCompileTime.cs b/...oft.ReportViewer.Common/Microsoft.ReportingServices.ReportProcessing/ReportCompileTime.cs
@@ -291,7 +291,7 @@ private void ResolveAssemblylocations(StringList codeModules, CompilerParameters
 			{
 				try
 				{
-					options.ReferencedAssemblies.Add(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
+					options.ReferencedAssemblies.AddRange(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
 				}
 				catch (Exception ex)
 				{
-Original file line number
+Diff line change
@@ Expand Up @@
     			{
     				try
     				{
-    					options.ReferencedAssemblies.Add(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
+    					options.ReferencedAssemblies.AddRange(assemblyLocationResolver.LoadAssemblyAndResolveLocation(codeModules[num]));
     				}
     				catch (Exception ex)
     				{
@@ Expand Down @@