From 473c24da286da18649b96a38c08478f364a8371c Mon Sep 17 00:00:00 2001
From: "Travis C. LaGrone" <22419287+travis-c-lagrone@users.noreply.github.com>
Date: Sun, 23 Jun 2019 00:38:21 -0500
Subject: [PATCH 1/2] Update engine resource string 'WrongKeyHashTable' to
include all valid settings hashtable keys
---
Engine/Strings.resx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Engine/Strings.resx b/Engine/Strings.resx
index 553443839..e97c134b8 100644
--- a/Engine/Strings.resx
+++ b/Engine/Strings.resx
@@ -238,7 +238,7 @@
Key {0} in the settings is not a string.
- {0} is not a valid key in the settings hashtable. Valid keys are ExcludeRules, IncludeRules and Severity.
+ {0} is not a valid key in the settings hashtable. Valid keys are Severity, IncludeRules, ExcludeRules, Rules, CustomRulePath, RecurseCustomRulePath, and IncludeDefaultRules.
Value {0} for key {1} has the wrong data type.
From 2eabab8f81da683d70c06995914b4b334422ef17 Mon Sep 17 00:00:00 2001
From: Christoph Bergmeister
Date: Sat, 29 Jun 2019 10:55:57 +0100
Subject: [PATCH 2/2] re-order to be alphabetically and update auto generated
comment
---
Engine/Strings.Designer.cs | 4 ++--
Engine/Strings.resx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Engine/Strings.Designer.cs b/Engine/Strings.Designer.cs
index c34570bcd..1fed6e234 100644
--- a/Engine/Strings.Designer.cs
+++ b/Engine/Strings.Designer.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Strings {
@@ -646,7 +646,7 @@ internal static string WrongKeyFormat {
}
///
- /// Looks up a localized string similar to {0} is not a valid key in the settings hashtable. Valid keys are ExcludeRules, IncludeRules and Severity..
+ /// Looks up a localized string similar to {0} is not a valid key in the settings hashtable. Valid keys are CustomRulePath, ExcludeRules, IncludeRules, IncludeDefaultRules, RecurseCustomRulePath, Rules and Severity..
///
internal static string WrongKeyHashTable {
get {
diff --git a/Engine/Strings.resx b/Engine/Strings.resx
index e97c134b8..346a25aa6 100644
--- a/Engine/Strings.resx
+++ b/Engine/Strings.resx
@@ -238,7 +238,7 @@
Key {0} in the settings is not a string.
- {0} is not a valid key in the settings hashtable. Valid keys are Severity, IncludeRules, ExcludeRules, Rules, CustomRulePath, RecurseCustomRulePath, and IncludeDefaultRules.
+ {0} is not a valid key in the settings hashtable. Valid keys are CustomRulePath, ExcludeRules, IncludeRules, IncludeDefaultRules, RecurseCustomRulePath, Rules and Severity.
Value {0} for key {1} has the wrong data type.