Merge pull request #532 from PowerShell/FixPSv3Build

Fix PowerShell v3 build

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -189,6 +189,7 @@ public object Settings
 
         private bool stopProcessing;
 
+#if !PSV3
         /// <summary>
         /// Resolve DSC resource dependency
         /// </summary>
@@ -199,9 +200,10 @@ public SwitchParameter SaveDscResourceDependency
             set { saveDscResourceDependency = value; }
         }
         private bool saveDscResourceDependency;
-        #endregion Parameters
+#endif // !PSV3
+#endregion Parameters
 
-        #region Overrides
+#region Overrides
 
         /// <summary>
         /// Imports all known rules and loggers.
@@ -238,6 +240,7 @@ protected override void ProcessRecord()
                 return;
             }
 
+#if !PSV3
             // TODO Support dependency resolution for analyzing script definitions
             if (saveDscResourceDependency)
             {
@@ -250,11 +253,10 @@ protected override void ProcessRecord()
                         ProcessInput();
                     }
                 }
+                return;
             }
-            else
-            {
-                ProcessInput();
-            }
+#endif
+            ProcessInput();
         }
 
         protected override void EndProcessing()
@@ -269,9 +271,9 @@ protected override void StopProcessing()
             base.StopProcessing();
         }
 
-        #endregion
+#endregion
 
-        #region Methods
+#region Methods
         private void ProcessInput()
         {
             IEnumerable<DiagnosticRecord> diagnosticsList = Enumerable.Empty<DiagnosticRecord>();
@@ -304,6 +306,6 @@ private void WriteToOutput(IEnumerable<DiagnosticRecord> diagnosticRecords)
                 }
             }
         }
-        #endregion
+#endregion
     }
 }

Engine/Generic/ModuleDependencyHandler.cs

@@ -1,4 +1,5 @@
-using System;
+#if !PSV3
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.IO;
@@ -13,7 +14,7 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
     // TODO Support for verbose mode    
     public class ModuleDependencyHandler : IDisposable
     {
-        #region Private Variables
+#region Private Variables
         private Runspace runspace;
         private string moduleRepository;
         private string tempPath; // path to the user temporary directory 
@@ -26,9 +27,9 @@ public class ModuleDependencyHandler : IDisposable
         private string symLinkPath;
         private string oldPSModulePath;
         private string curPSModulePath;
-        #endregion Private Variables
+#endregion Private Variables
 
-        #region Properties
+#region Properties
         /// <summary>
         /// Path where the object stores the modules
         /// </summary>
@@ -123,9 +124,9 @@ public Runspace Runspace
         }
 
 
-        #endregion Properties
+#endregion Properties
 
-        #region Private Methods
+#region Private Methods
         private static void ThrowIfNull<T>(T obj, string name)
         {
             if (obj == null)
@@ -226,9 +227,9 @@ private void RestorePSModulePath()
         {
             Environment.SetEnvironmentVariable("PSModulePath", oldPSModulePath, EnvironmentVariableTarget.Process);
         }
-        #endregion Private Methods
+#endregion Private Methods
 
-        #region Public Methods
+#region Public Methods
 
         /// <summary>
         /// Creates an instance of the ModuleDependencyHandler class
@@ -371,6 +372,7 @@ public bool IsModuleAvailable(string moduleName)
             return availableModules != null ? availableModules.Any() : false;
         }
 
+
         /// <summary>
         /// Extracts out the module names from the error extent that are not available
         /// 
@@ -502,6 +504,7 @@ public void Dispose()
             RestorePSModulePath();
         }
 
-        #endregion Public Methods
+#endregion Public Methods
     }
-}
+}
+#endif // !PSV3