3
3
4
4
using System ;
5
5
using System . ComponentModel . Composition ;
6
- using Microsoft . CodeAnalysis . Razor ;
6
+ using Microsoft . CodeAnalysis . Razor . Logging ;
7
7
using Microsoft . VisualStudio . Shell ;
8
8
using Microsoft . VisualStudio . Shell . Interop ;
9
9
10
10
namespace Microsoft . VisualStudio . Razor ;
11
11
12
12
[ Export ( typeof ( ProjectCapabilityResolver ) ) ]
13
- internal class VisualStudioProjectCapabilityResolver : ProjectCapabilityResolver
13
+ [ method: ImportingConstructor ]
14
+ internal class VisualStudioProjectCapabilityResolver ( ILoggerFactory loggerFactory ) : ProjectCapabilityResolver
14
15
{
15
- private readonly RazorLogger _razorLogger ;
16
-
17
- [ ImportingConstructor ]
18
- public VisualStudioProjectCapabilityResolver ( RazorLogger razorLogger )
19
- {
20
- if ( razorLogger is null )
21
- {
22
- throw new ArgumentNullException ( nameof ( razorLogger ) ) ;
23
- }
24
-
25
- _razorLogger = razorLogger ;
26
- }
16
+ private readonly ILogger _logger = loggerFactory . GetOrCreateLogger < VisualStudioProjectCapabilityResolver > ( ) ;
27
17
28
18
public override bool HasCapability ( object project , string capability )
29
19
{
@@ -49,13 +39,13 @@ private bool LocalHasCapability(IVsHierarchy hierarchy, string capability)
49
39
{
50
40
// IsCapabilityMatch throws a NotSupportedException if it can't create a
51
41
// BooleanSymbolExpressionEvaluator COM object
52
- _razorLogger . LogWarning ( "Could not resolve project capability for hierarchy due to NotSupportedException." ) ;
42
+ _logger . LogWarning ( $ "Could not resolve project capability for hierarchy due to NotSupportedException.") ;
53
43
return false ;
54
44
}
55
45
catch ( ObjectDisposedException )
56
46
{
57
47
// IsCapabilityMatch throws an ObjectDisposedException if the underlying hierarchy has been disposed
58
- _razorLogger . LogWarning ( "Could not resolve project capability for hierarchy due to hierarchy being disposed." ) ;
48
+ _logger . LogWarning ( $ "Could not resolve project capability for hierarchy due to hierarchy being disposed.") ;
59
49
return false ;
60
50
}
61
51
}
0 commit comments