Merge branch 'master' of https://github.com/PowerShell/PSScriptAnalyzer into aggregate-settings-file-exceptions

Take changes from upstream/master and use VS to rehydrate Designer.cs file

Author: travisclagrone

Engine/Commands/InvokeScriptAnalyzerCommand.cs

@@ -326,12 +326,12 @@ protected override void BeginProcessing()
                                                     ? rulePaths
                                                     : rulePaths.Concat(settingsCustomRulePath).ToArray();
             }
-            catch (Exception e)
+            catch (Exception exception)
             {
                 this.ThrowTerminatingError(new ErrorRecord(
-                        e,
-                        "SettingsNotProcessable",
-                        ErrorCategory.NotSpecified,
+                        exception,
+                        "SETTINGS_ERROR",
+                        ErrorCategory.InvalidData,
                         this.settings));
             }
 

Engine/Strings.Designer.cs

@@ -238,7 +238,7 @@
     <value>Key {0} in the settings is not a string.</value>
   </data>
   <data name="WrongKeyHashTable" xml:space="preserve">
-    <value>{0} is not a valid key in the settings hashtable. Valid keys are ExcludeRules, IncludeRules and Severity.</value>
+    <value>{0} is not a valid key in the settings hashtable. Valid keys are CustomRulePath, ExcludeRules, IncludeRules, IncludeDefaultRules, RecurseCustomRulePath, Rules and Severity.</value>
   </data>
   <data name="WrongValueHashTable" xml:space="preserve">
     <value>Value {0} for key {1} has the wrong data type.</value>

Engine/Strings.resx

@@ -437,12 +437,14 @@ If the path, the file's or hashtable's content are invalid, it is ignored.
 The parameters and values in the profile take precedence over the same parameter and values specified at the command line.
 
 A Script Analyzer profile file is a text file that contains a hash table with one or more of the following keys:
--- Severity
--- IncludeRules
--- ExcludeRules
--- Rules
+
 -- CustomRulePath
+-- ExcludeRules
 -- IncludeDefaultRules
+-- IncludeRules
+-- RecurseCustomRulePath
+-- Rules
+-- Severity
 
 The keys and values in the profile are interpreted as if they were standard parameters and parameter values of Invoke-ScriptAnalyzer.