Move Settings class to Engine/ from Engine/Generic/

Also changes the namespace from `Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.Settings` to `Microsoft.Windows.PowerShell.ScriptAnalyzer.Settings`.

Author: Kapil Borle

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -238,7 +238,7 @@ protected override void BeginProcessing()
             }
 
             object settingsFound;
-            var settingsMode = Generic.Settings.FindSettingsMode(
+            var settingsMode = PowerShell.ScriptAnalyzer.Settings.FindSettingsMode(
                 this.settings,
                 processedPaths == null || processedPaths.Count == 0 ? null : processedPaths[0],
                 out settingsFound);

Engine/PSScriptAnalyzer.psm1

@@ -34,7 +34,7 @@ if (Get-Command Register-ArgumentCompleter -ErrorAction Ignore)
     Register-ArgumentCompleter -CommandName 'Invoke-ScriptAnalyzer' -ParameterName 'Settings' -ScriptBlock {
         param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParmeter)
 
-        [Microsoft.Windows.PowerShell.ScriptAnalyzer.Helper]::GetSettingPresets() | `
+        [Microsoft.Windows.PowerShell.ScriptAnalyzer.Settings]::GetSettingPresets() | `
             Where-Object {$_ -like "$wordToComplete*"} | `
             ForEach-Object { New-Object System.Management.Automation.CompletionResult $_ }
     }

Engine/ScriptAnalyzerEngine.csproj

@@ -74,7 +74,7 @@
     <Compile Include="Generic\ConfigurableRule.cs" />
     <Compile Include="Generic\ModuleDependencyHandler.cs" />
     <Compile Include="Generic\CorrectionExtent.cs" />
-    <Compile Include="Generic\Settings.cs" />
+    <Compile Include="Settings.cs" />
     <Compile Include="Generic\SuppressedRecord.cs" />
     <Compile Include="Generic\DiagnosticRecord.cs" />
     <Compile Include="Generic\ExternalRule.cs" />

Engine/Generic/Settings.cs renamed to Engine/Settings.cs

@@ -19,7 +19,7 @@
 using System.Management.Automation.Language;
 using System.Reflection;
 
-namespace Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic
+namespace Microsoft.Windows.PowerShell.ScriptAnalyzer
 {
     internal enum SettingsMode { None = 0, Auto, File, Hashtable, Preset };
 
@@ -548,7 +548,7 @@ private static bool IsBuiltinSettingPreset(object settingPreset)
             var preset = settingPreset as string;
             if (preset != null)
             {
-                return Generic.Settings.GetSettingPresets().Contains(preset, StringComparer.OrdinalIgnoreCase);
+                return GetSettingPresets().Contains(preset, StringComparer.OrdinalIgnoreCase);
             }
 
             return false;

Tests/Engine/Settings.tests.ps1

@@ -6,6 +6,7 @@ $directory = Split-Path $MyInvocation.MyCommand.Path
 $settingsTestDirectory = [System.IO.Path]::Combine($directory, "SettingsTest")
 $project1Root = [System.IO.Path]::Combine($settingsTestDirectory, "Project1")
 $project2Root = [System.IO.Path]::Combine($settingsTestDirectory, "Project2")
+$settingsTypeName = 'Microsoft.Windows.PowerShell.ScriptAnalyzer.Settings'
 
 Describe "Settings Precedence" {
     Context "settings object is explicit" {
@@ -33,8 +34,7 @@ Describe "Settings Precedence" {
 Describe "Settings Class" {
     Context "When an empty hashtable is provided" {
         BeforeAll {
-            $settings = New-Object -TypeName 'Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.Settings' `
-                              -ArgumentList @{}
+            $settings = New-Object -TypeName $settingsTypeName -ArgumentList @{}
         }
 
         'IncludeRules', 'ExcludeRules', 'Severity', 'RuleArguments' | ForEach-Object {
@@ -47,8 +47,7 @@ Describe "Settings Class" {
     Context "When a string is provided for IncludeRules in a hashtable" {
         BeforeAll {
             $ruleName = "PSAvoidCmdletAliases"
-            $settings = New-Object -TypeName 'Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.Settings' `
-                              -ArgumentList @{ IncludeRules = $ruleName }
+            $settings = New-Object -TypeName $settingsTypeName -ArgumentList @{ IncludeRules = $ruleName }
         }
 
         It "Should return an IncludeRules array with 1 element" {
@@ -69,8 +68,7 @@ Describe "Settings Class" {
                     }
                 }
             }
-            $settings = New-Object -TypeName 'Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.Settings' `
-                              -ArgumentList $settingsHashtable
+            $settings = New-Object -TypeName $settingsTypeName -ArgumentList $settingsHashtable
         }
 
         It "Should return the rule arguments" {
@@ -88,7 +86,7 @@ Describe "Settings Class" {
 
     Context "When a settings file path is provided" {
         BeforeAll {
-            $settings = New-Object -TypeName 'Microsoft.Windows.PowerShell.ScriptAnalyzer.Generic.Settings' `
+            $settings = New-Object -TypeName $settingsTypeName `
                               -ArgumentList ([System.IO.Path]::Combine($project1Root, "ExplicitSettings.psd1"))
         }