Updates based on testing on WS2012R2 with PSv4

raghushantha · raghushantha · commit 0f5bf4ea4754 · 2015-12-21T16:04:16.000-08:00
diff --git a/Engine/Helper.cs b/Engine/Helper.cs
@@ -248,6 +248,8 @@ public bool IsDscResourceClassBased(ScriptBlockAst ast)
                 return false;
             }
 
+            #if !PSV3
+
             List<string> dscResourceFunctionNames = new List<string>(new string[] { "Test", "Get", "Set" });
 
             IEnumerable<Ast> dscClasses = ast.FindAll(item =>
@@ -262,6 +264,8 @@ item is TypeDefinitionAst
                 return true;
             }
 
+            #endif
+
             return false;
         }
 
@@ -934,13 +938,21 @@ internal List<RuleSuppression> GetSuppressionsClass(TypeDefinitionAst typeAst)
 
             if (typeAst.Members == null)
             {
-                return result;
-            }
+                return result;            
+            }            
 
             foreach (var member in typeAst.Members)
             {
+                #if PSv3
+
+                FunctionDefinitionAst funcMemb = member as FunctionDefinitionAst;
+
+                #else
+
                 FunctionMemberAst funcMemb = member as FunctionMemberAst;
 
+                #endif
+
                 if (funcMemb == null)
                 {
                     continue;
diff --git a/PSScriptAnalyzer.sln b/PSScriptAnalyzer.sln
@@ -15,16 +15,16 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
+		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Release|Any CPU.ActiveCfg = PSV3 Release|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.PSV3 Release|Any CPU.Build.0 = PSV3 Release|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4BDE3D0-3EEF-4157-8A3E-722DF7ADEF60}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.ActiveCfg = Release|Any CPU
-		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.Build.0 = Release|Any CPU
+		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.ActiveCfg = PSV3 Debug|Any CPU
+		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.Debug|Any CPU.Build.0 = PSV3 Debug|Any CPU
 		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C33B6B9D-E61C-45A3-9103-895FD82A5C1E}.PSV3 Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/Rules/PossibleIncorrectComparisonWithNull.cs b/Rules/PossibleIncorrectComparisonWithNull.cs
@@ -48,7 +48,16 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {
                 }
             }
 
+            #if PSV3
+
+            IEnumerable<Ast> funcAsts = ast.FindAll(item => item is FunctionDefinitionAst, true);
+
+            #else
+
             IEnumerable<Ast> funcAsts = ast.FindAll(item => item is FunctionDefinitionAst, true).Union(ast.FindAll(item => item is FunctionMemberAst, true));
+
+            #endif
+
             foreach (Ast funcAst in funcAsts)
             {
                 IEnumerable<Ast> binAsts = funcAst.FindAll(item => item is BinaryExpressionAst, true);

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,8 @@ public bool IsDscResourceClassBased(ScriptBlockAst ast)`
`248`	`248`	`return false;`
`249`	`249`	`}`
`250`	`250`
	`251`	`+ #if !PSV3`
	`252`	`+`
`251`	`253`	`List<string> dscResourceFunctionNames = new List<string>(new string[] { "Test", "Get", "Set" });`
`252`	`254`
`253`	`255`	`IEnumerable<Ast> dscClasses = ast.FindAll(item =>`
`@@ -262,6 +264,8 @@ item is TypeDefinitionAst`
`262`	`264`	`return true;`
`263`	`265`	`}`
`264`	`266`
	`267`	`+ #endif`
	`268`	`+`
`265`	`269`	`return false;`
`266`	`270`	`}`
`267`	`271`
`@@ -934,13 +938,21 @@ internal List<RuleSuppression> GetSuppressionsClass(TypeDefinitionAst typeAst)`
`934`	`938`
`935`	`939`	`if (typeAst.Members == null)`
`936`	`940`	`{`
`937`		`- return result;`
`938`		`- }`
	`941`	`+ return result;`
	`942`	`+ }`
`939`	`943`
`940`	`944`	`foreach (var member in typeAst.Members)`
`941`	`945`	`{`
	`946`	`+ #if PSv3`
	`947`	`+`
	`948`	`+ FunctionDefinitionAst funcMemb = member as FunctionDefinitionAst;`
	`949`	`+`
	`950`	`+ #else`
	`951`	`+`
`942`	`952`	`FunctionMemberAst funcMemb = member as FunctionMemberAst;`
`943`	`953`
	`954`	`+ #endif`
	`955`	`+`
`944`	`956`	`if (funcMemb == null)`
`945`	`957`	`{`
`946`	`958`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,16 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName) {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
	`51`	`+ #if PSV3`
	`52`	`+`
	`53`	`+ IEnumerable<Ast> funcAsts = ast.FindAll(item => item is FunctionDefinitionAst, true);`
	`54`	`+`
	`55`	`+ #else`
	`56`	`+`
`51`	`57`	`IEnumerable<Ast> funcAsts = ast.FindAll(item => item is FunctionDefinitionAst, true).Union(ast.FindAll(item => item is FunctionMemberAst, true));`
	`58`	`+`
	`59`	`+ #endif`
	`60`	`+`
`52`	`61`	`foreach (Ast funcAst in funcAsts)`
`53`	`62`	`{`
`54`	`63`	`IEnumerable<Ast> binAsts = funcAst.FindAll(item => item is BinaryExpressionAst, true);`