Refactor to use command data file directory instead of settings directory in AvoidOverwritingBuiltInCmdlets and UseCompatibleCmdlets rules

Author: liamjpeters

Rules/AvoidOverwritingBuiltInCmdlets.cs

@@ -90,17 +90,17 @@ public override IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string file
             }
 
             var psVerList = PowerShellVersion;
-            string settingsPath = Settings.GetShippedSettingsDirectory();
+            string commandDataFilesPath = Settings.GetShippedCommandDataFileDirectory();
 
             foreach (string reference in psVerList)
             {
-                if (settingsPath == null || !ContainsReferenceFile(settingsPath, reference))
+                if (commandDataFilesPath == null || !ContainsReferenceFile(commandDataFilesPath, reference))
                 {
                     throw new ArgumentException(nameof(PowerShellVersion));
                 }
             }
 
-            ProcessDirectory(settingsPath, psVerList);
+            ProcessDirectory(commandDataFilesPath, psVerList);
 
             if (_cmdletMap.Keys.Count != psVerList.Count())
             {

Rules/UseCompatibleCmdlets.cs

@@ -306,7 +306,7 @@ private void SetupCmdletsDictionary()
                 return;
             }
 
-            string settingsPath = Settings.GetShippedSettingsDirectory();
+            string commandDataFilesPath = Settings.GetShippedCommandDataFileDirectory();
 #if DEBUG
             object modeObject;
             if (ruleArgs.TryGetValue("mode", out modeObject))
@@ -317,7 +317,7 @@ private void SetupCmdletsDictionary()
                 switch (mode)
                 {
                     case "offline":
-                        settingsPath = GetStringArgFromListStringArg(ruleArgs["uri"]);
+                        commandDataFilesPath = GetStringArgFromListStringArg(ruleArgs["uri"]);
                         break;
 
                     case "online": // not implemented yet.
@@ -328,8 +328,8 @@ private void SetupCmdletsDictionary()
 
             }
 #endif
-            if (settingsPath == null
-                || !ContainsReferenceFile(settingsPath))
+            if (commandDataFilesPath == null
+                || !ContainsReferenceFile(commandDataFilesPath))
             {
                 return;
             }
@@ -348,7 +348,7 @@ private void SetupCmdletsDictionary()
             }
 
             ProcessDirectory(
-                settingsPath,
+                commandDataFilesPath,
                 extentedCompatibilityList);
             if (psCmdletMap.Keys.Count != extentedCompatibilityList.Count())
             {