@@ -52,81 +52,111 @@ internal AssemblyInfo(AssemblyName name, string filePath, bool isLoaded)
5252 /// <remarks>Used in the logs</remarks>
5353 public string Name { get ; }
5454
55+ private readonly string [ ] m_FilterDirs ;
56+
5557 /// <summary>
5658 /// Default constructor
5759 /// </summary>
5860 /// <param name="name">Name of the resolver</param>
59- public AssemblyNameReferenceResolver ( string name )
61+ /// <param name="filterDirs">Only resolve the assembly if requesting assembly is in the specified directories</param>
62+ public AssemblyNameReferenceResolver ( string name , string [ ] filterDirs = null )
6063 {
6164 if ( string . IsNullOrEmpty ( name ) )
6265 {
6366 name = this . GetType ( ) . FullName ;
6467 }
6568
6669 Name = name ;
70+
71+ m_FilterDirs = filterDirs ;
6772 }
6873
6974 /// <inheritdoc/>>
7075 public virtual Assembly Resolve ( AppDomain appDomain , AssemblyName assmName , Assembly requestingAssembly )
7176 {
72- var searchAssmName = GetReplacementAssemblyName ( assmName , requestingAssembly , out string searchDir , out bool recursiveSearch ) ;
73-
74- if ( searchAssmName != null )
77+ if ( ShouldResolve ( appDomain , assmName , requestingAssembly ) )
7578 {
76- var matchedAssmNames = new List < AssemblyInfo > ( ) ;
77-
78- var replacementAssms = appDomain . GetAssemblies ( ) . Where (
79- a => Match ( a . GetName ( ) , searchAssmName ) ) ;
80-
81- var exactMatch = replacementAssms . FirstOrDefault ( a => CompareAssemblyNames ( a . GetName ( ) , searchAssmName ) ) ;
79+ var searchAssmName = GetReplacementAssemblyName ( assmName , requestingAssembly , out string searchDir , out bool recursiveSearch ) ;
8280
83- if ( exactMatch != null )
81+ if ( searchAssmName != null )
8482 {
85- Trace . WriteLine ( $ "Assembly ' { searchAssmName } ' is resolved to ' { exactMatch . Location } ' as exact match via ' { Name } ' resolver" , Name ) ;
83+ var matchedAssmNames = new List < AssemblyInfo > ( ) ;
8684
87- return exactMatch ;
88- }
89- else
90- {
91- matchedAssmNames . AddRange ( replacementAssms . Select ( a => new AssemblyInfo ( a . GetName ( ) , a . Location , true ) ) ) ;
92- }
85+ var replacementAssms = appDomain . GetAssemblies ( ) . Where (
86+ a => Match ( a . GetName ( ) , searchAssmName ) ) ;
9387
94- foreach ( var name in EnumerateAssemblyByName ( searchDir , recursiveSearch , searchAssmName ) )
95- {
96- if ( CompareAssemblyNames ( name . Name , searchAssmName ) )
88+ var exactMatch = replacementAssms . FirstOrDefault ( a => CompareAssemblyNames ( a . GetName ( ) , searchAssmName ) ) ;
89+
90+ if ( exactMatch != null )
9791 {
98- Trace . WriteLine ( $ "Loading '{ searchAssmName } ' from ' { name . FilePath } ' as exact match via '{ Name } ' resolver", Name ) ;
92+ Trace . WriteLine ( $ "Assembly '{ searchAssmName } ' is resolved to ' { exactMatch . Location } ' as exact match via '{ Name } ' resolver", Name ) ;
9993
100- return Assembly . LoadFrom ( name . FilePath ) ;
94+ return exactMatch ;
10195 }
102- else
96+ else
10397 {
104- matchedAssmNames . Add ( name ) ;
98+ matchedAssmNames . AddRange ( replacementAssms . Select ( a => new AssemblyInfo ( a . GetName ( ) , a . Location , true ) ) ) ;
10599 }
106- }
107100
108- var assmInfo = ResolveAmbiguity ( matchedAssmNames , searchAssmName ) ;
109-
110- if ( assmInfo != null )
111- {
112- if ( assmInfo . IsLoaded )
101+ foreach ( var name in EnumerateAssemblyByName ( searchDir , recursiveSearch , searchAssmName ) )
113102 {
114- Trace . WriteLine ( $ "Loading '{ assmInfo . Name } ' from assembly name via '{ Name } ' resolver", Name ) ;
115-
116- return Assembly . Load ( assmInfo . Name ) ;
103+ if ( CompareAssemblyNames ( name . Name , searchAssmName ) )
104+ {
105+ Trace . WriteLine ( $ "Loading '{ searchAssmName } ' from '{ name . FilePath } ' as exact match via '{ Name } ' resolver", Name ) ;
106+
107+ return LoadAssembly ( new AssemblyInfo ( AssemblyName . GetAssemblyName ( name . FilePath ) , name . FilePath , false ) ) ;
108+ }
109+ else
110+ {
111+ matchedAssmNames . Add ( name ) ;
112+ }
117113 }
118- else
119- {
120- Trace . WriteLine ( $ "Loading '{ assmInfo . Name } ' from file '{ assmInfo . FilePath } ' via '{ Name } ' resolver", Name ) ;
121114
122- return Assembly . LoadFrom ( assmInfo . FilePath ) ;
115+ var assmInfo = ResolveAmbiguity ( matchedAssmNames , searchAssmName ) ;
116+
117+ if ( assmInfo != null )
118+ {
119+ return LoadAssembly ( assmInfo ) ;
123120 }
124121 }
125122 }
126123
127124 return null ;
128125 }
129126
127+ /// <summary>
128+ /// Checks if assembly should be resolved by this resolver
129+ /// </summary>
130+ /// <param name="appDomain">App Domain</param>
131+ /// <param name="assmName">Assembly to resolve</param>
132+ /// <param name="requestingAssembly">Requesting assembly</param>
133+ /// <returns></returns>
134+ protected virtual bool ShouldResolve ( AppDomain appDomain , AssemblyName assmName , Assembly requestingAssembly )
135+ {
136+ if ( m_FilterDirs ? . Any ( ) == true && requestingAssembly != null )
137+ {
138+ var reqAssmFilePath = requestingAssembly . Location ;
139+
140+ return m_FilterDirs . Any ( f => FileSystemUtils . IsInDirectory ( reqAssmFilePath , f ) ) ;
141+ }
142+ else
143+ {
144+ return true ;
145+ }
146+ }
147+
148+ /// <summary>
149+ /// Load the assembly
150+ /// </summary>
151+ /// <param name="assmInfo">Assembly information</param>
152+ /// <returns>Loaded assembly</returns>
153+ protected Assembly LoadAssembly ( AssemblyInfo assmInfo )
154+ {
155+ Trace . WriteLine ( $ "Loading '{ assmInfo . Name } ' from file '{ assmInfo . FilePath } ' [Loaded={ assmInfo . IsLoaded } ] via '{ Name } ' resolver", Name ) ;
156+
157+ return Assembly . Load ( assmInfo . Name ) ;
158+ }
159+
130160 /// <summary>
131161 /// Gets the culture of the assembly name
132162 /// </summary>
0 commit comments