@@ -142,7 +142,7 @@ public void Initilaize(Dictionary<string, List<string>> result)
142
142
paths = result . ContainsKey ( "ValidDllPaths" ) ? result [ "ValidDllPaths" ] : result [ "ValidPaths" ] ;
143
143
foreach ( string path in paths )
144
144
{
145
- if ( Path . GetExtension ( path ) . ToLower ( CultureInfo . CurrentCulture ) == ".dll" )
145
+ if ( String . Equals ( Path . GetExtension ( path ) , ".dll" , StringComparison . OrdinalIgnoreCase ) )
146
146
{
147
147
catalog . Catalogs . Add ( new AssemblyCatalog ( path ) ) ;
148
148
}
@@ -241,8 +241,8 @@ public List<ExternalRule> GetExternalRule(string[] moduleNames)
241
241
242
242
FunctionInfo funcInfo = ( FunctionInfo ) psobject . ImmediateBaseObject ;
243
243
ParameterMetadata param = funcInfo . Parameters . Values
244
- . First < ParameterMetadata > ( item => item . Name . ToLower ( CultureInfo . CurrentCulture ) . EndsWith ( "ast" , StringComparison . CurrentCulture ) ||
245
- item . Name . ToLower ( CultureInfo . CurrentCulture ) . EndsWith ( "token" , StringComparison . CurrentCulture ) ) ;
244
+ . First < ParameterMetadata > ( item => item . Name . EndsWith ( "ast" , StringComparison . OrdinalIgnoreCase ) ||
245
+ item . Name . EndsWith ( "token" , StringComparison . CurrentCulture ) ) ;
246
246
247
247
//Only add functions that are defined as rules.
248
248
if ( param != null )
@@ -251,7 +251,7 @@ public List<ExternalRule> GetExternalRule(string[] moduleNames)
251
251
string desc = posh . AddScript ( script ) . Invoke ( ) [ 0 ] . ImmediateBaseObject . ToString ( )
252
252
. Replace ( "\r \n " , " " ) . Trim ( ) ;
253
253
254
- rules . Add ( new ExternalRule ( funcInfo . Name , funcInfo . Name , desc , param . Name ,
254
+ rules . Add ( new ExternalRule ( funcInfo . Name , funcInfo . Name , desc , param . ParameterType . Name ,
255
255
funcInfo . ModuleName , funcInfo . Module . Path ) ) ;
256
256
}
257
257
}
@@ -381,30 +381,33 @@ public IEnumerable<DiagnosticRecord> GetExternalRecord(Ast ast, Token[] token, E
381
381
string message = string . Empty ;
382
382
string ruleName = string . Empty ;
383
383
384
- // Because error stream is merged to output stream,
385
- // we need to handle the error records.
386
- if ( psobject . ImmediateBaseObject is ErrorRecord )
384
+ if ( psobject != null && psobject . ImmediateBaseObject != null )
387
385
{
388
- ErrorRecord record = ( ErrorRecord ) psobject . ImmediateBaseObject ;
389
- command . WriteError ( record ) ;
390
- continue ;
391
- }
392
-
393
- // DiagnosticRecord may not be correctly returned from external rule.
394
- try
395
- {
396
- Enum . TryParse < DiagnosticSeverity > ( psobject . Properties [ "Severity" ] . Value . ToString ( ) . ToUpper ( ) , out severity ) ;
397
- message = psobject . Properties [ "Message" ] . Value . ToString ( ) ;
398
- extent = ( IScriptExtent ) psobject . Properties [ "Extent" ] . Value ;
399
- ruleName = psobject . Properties [ "RuleName" ] . Value . ToString ( ) ;
386
+ // Because error stream is merged to output stream,
387
+ // we need to handle the error records.
388
+ if ( psobject . ImmediateBaseObject is ErrorRecord )
389
+ {
390
+ ErrorRecord record = ( ErrorRecord ) psobject . ImmediateBaseObject ;
391
+ command . WriteError ( record ) ;
392
+ continue ;
393
+ }
394
+
395
+ // DiagnosticRecord may not be correctly returned from external rule.
396
+ try
397
+ {
398
+ Enum . TryParse < DiagnosticSeverity > ( psobject . Properties [ "Severity" ] . Value . ToString ( ) . ToUpper ( ) , out severity ) ;
399
+ message = psobject . Properties [ "Message" ] . Value . ToString ( ) ;
400
+ extent = ( IScriptExtent ) psobject . Properties [ "Extent" ] . Value ;
401
+ ruleName = psobject . Properties [ "RuleName" ] . Value . ToString ( ) ;
402
+ }
403
+ catch ( Exception ex )
404
+ {
405
+ command . WriteError ( new ErrorRecord ( ex , ex . HResult . ToString ( "X" ) , ErrorCategory . NotSpecified , this ) ) ;
406
+ continue ;
407
+ }
408
+
409
+ if ( ! string . IsNullOrEmpty ( message ) ) yield return new DiagnosticRecord ( message , extent , ruleName , severity , null ) ;
400
410
}
401
- catch ( Exception ex )
402
- {
403
- command . WriteError ( new ErrorRecord ( ex , ex . HResult . ToString ( "X" ) , ErrorCategory . NotSpecified , this ) ) ;
404
- continue ;
405
- }
406
-
407
- if ( ! string . IsNullOrEmpty ( message ) ) yield return new DiagnosticRecord ( message , extent , ruleName , severity , null ) ;
408
411
}
409
412
}
410
413
@@ -478,7 +481,7 @@ public Dictionary<string, List<string>> CheckRuleExtension(string[] path, PSCmdl
478
481
479
482
cmdlet . WriteDebug ( string . Format ( CultureInfo . CurrentCulture , Strings . CheckAssemblyFile , resolvedPath ) ) ;
480
483
481
- if ( Path . GetExtension ( resolvedPath ) . ToLower ( CultureInfo . CurrentCulture ) == ".dll" )
484
+ if ( String . Equals ( Path . GetExtension ( resolvedPath ) , ".dll" ) )
482
485
{
483
486
if ( ! File . Exists ( resolvedPath ) )
484
487
{
0 commit comments