1
-
2
-
3
- using System ;
4
- using System . Collections . Generic ;
5
1
using System . IO ;
6
- using System . Linq ;
7
2
using System . Reflection ;
8
3
using Prism . Properties ;
9
4
@@ -17,7 +12,7 @@ public class AssemblyResolver : IAssemblyResolver, IDisposable
17
12
{
18
13
private readonly List < AssemblyInfo > registeredAssemblies = new List < AssemblyInfo > ( ) ;
19
14
20
- private bool handlesAssemblyResolve ;
15
+ private bool _handlesAssemblyResolve ;
21
16
22
17
/// <summary>
23
18
/// Registers the specified assembly and resolves the types in it when the AppDomain requests for it.
@@ -27,10 +22,10 @@ public class AssemblyResolver : IAssemblyResolver, IDisposable
27
22
/// declared in the assembly.</remarks>
28
23
public void LoadAssemblyFrom ( string assemblyFilePath )
29
24
{
30
- if ( ! this . handlesAssemblyResolve )
25
+ if ( ! _handlesAssemblyResolve )
31
26
{
32
- AppDomain . CurrentDomain . AssemblyResolve += this . CurrentDomain_AssemblyResolve ;
33
- this . handlesAssemblyResolve = true ;
27
+ AppDomain . CurrentDomain . AssemblyResolve += CurrentDomain_AssemblyResolve ;
28
+ _handlesAssemblyResolve = true ;
34
29
}
35
30
36
31
Uri assemblyUri = GetFileUri ( assemblyFilePath ) ;
@@ -46,15 +41,15 @@ public void LoadAssemblyFrom(string assemblyFilePath)
46
41
}
47
42
48
43
AssemblyName assemblyName = AssemblyName . GetAssemblyName ( assemblyUri . LocalPath ) ;
49
- AssemblyInfo assemblyInfo = this . registeredAssemblies . FirstOrDefault ( a => assemblyName == a . AssemblyName ) ;
44
+ AssemblyInfo assemblyInfo = registeredAssemblies . FirstOrDefault ( a => assemblyName == a . AssemblyName ) ;
50
45
51
46
if ( assemblyInfo != null )
52
47
{
53
48
return ;
54
49
}
55
50
56
51
assemblyInfo = new AssemblyInfo ( ) { AssemblyName = assemblyName , AssemblyUri = assemblyUri } ;
57
- this . registeredAssemblies . Add ( assemblyInfo ) ;
52
+ registeredAssemblies . Add ( assemblyInfo ) ;
58
53
}
59
54
60
55
private static Uri GetFileUri ( string filePath )
@@ -83,7 +78,7 @@ private Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs a
83
78
{
84
79
AssemblyName assemblyName = new AssemblyName ( args . Name ) ;
85
80
86
- AssemblyInfo assemblyInfo = this . registeredAssemblies . FirstOrDefault ( a => AssemblyName . ReferenceMatchesDefinition ( assemblyName , a . AssemblyName ) ) ;
81
+ AssemblyInfo assemblyInfo = registeredAssemblies . FirstOrDefault ( a => AssemblyName . ReferenceMatchesDefinition ( assemblyName , a . AssemblyName ) ) ;
87
82
88
83
if ( assemblyInfo != null )
89
84
{
@@ -116,7 +111,7 @@ private class AssemblyInfo
116
111
/// <filterpriority>2</filterpriority>
117
112
public void Dispose ( )
118
113
{
119
- this . Dispose ( true ) ;
114
+ Dispose ( true ) ;
120
115
GC . SuppressFinalize ( this ) ;
121
116
}
122
117
@@ -126,10 +121,10 @@ public void Dispose()
126
121
/// <param name="disposing">When <see langword="true"/>, it is being called from the Dispose method.</param>
127
122
protected virtual void Dispose ( bool disposing )
128
123
{
129
- if ( this . handlesAssemblyResolve )
124
+ if ( _handlesAssemblyResolve )
130
125
{
131
- AppDomain . CurrentDomain . AssemblyResolve -= this . CurrentDomain_AssemblyResolve ;
132
- this . handlesAssemblyResolve = false ;
126
+ AppDomain . CurrentDomain . AssemblyResolve -= CurrentDomain_AssemblyResolve ;
127
+ _handlesAssemblyResolve = false ;
133
128
}
134
129
}
135
130
0 commit comments