Fix up namespaces

Author: Robert Holt

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Collection/CompatibilityProfileCollector.cs

@@ -9,8 +9,6 @@
 using System.Reflection;
 using Microsoft.PowerShell.Commands;
 using Microsoft.PowerShell.CrossCompatibility.Data;
-using Microsoft.PowerShell.CrossCompatibility.Data.Modules;
-using Microsoft.PowerShell.CrossCompatibility.Data.Platform;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using SMA = System.Management.Automation;
 
@@ -144,7 +142,7 @@ public RuntimeData GetRuntimeData(out IEnumerable<Exception> errors)
         {
             // Need to ensure modules are imported before types are collected
             JsonCaseInsensitiveStringDictionary<JsonDictionary<Version, ModuleData>> modules = _pwshDataCollector.AssembleModulesData(_pwshDataCollector.GetModulesData(out IEnumerable<Exception> moduleErrors));
-            Data.Types.AvailableTypeData availableTypeData = _typeDataCollector.GetAvailableTypeData(out IEnumerable<CompatibilityAnalysisException> typeErrors);
+            Data.AvailableTypeData availableTypeData = _typeDataCollector.GetAvailableTypeData(out IEnumerable<CompatibilityAnalysisException> typeErrors);
 
             var runtimeData = new RuntimeData()
             {

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Collection/PlatformInformationCollector.cs

@@ -10,8 +10,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using Microsoft.Management.Infrastructure;
-using Microsoft.PowerShell.CrossCompatibility.Data.Platform;
-using Microsoft.PowerShell.CrossCompatibility.Query;
+using Microsoft.PowerShell.CrossCompatibility.Data;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using Microsoft.Win32;
 using SMA = System.Management.Automation;

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Collection/PowerShellDataCollector.cs

@@ -11,7 +11,7 @@
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using Microsoft.PowerShell.Commands;
-using Microsoft.PowerShell.CrossCompatibility.Data.Modules;
+using Microsoft.PowerShell.CrossCompatibility.Data;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using SMA = System.Management.Automation;
 

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Utility/ProfileValidator.cs renamed to PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Collection/ProfileValidator.cs

@@ -4,12 +4,10 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.PowerShell.CrossCompatibility.Query;
-using Microsoft.PowerShell.CrossCompatibility.Query.Platform;
 using System.Linq;
 using Data = Microsoft.PowerShell.CrossCompatibility.Data;
-using Microsoft.PowerShell.CrossCompatibility.Query.Types;
 
-namespace Microsoft.PowerShell.CrossCompatibility.Utility
+namespace Microsoft.PowerShell.CrossCompatibility.Collection
 {
     /// <summary>
     /// Object that takes a PowerShell compatibility profile and validates it.
@@ -183,7 +181,7 @@ internal class QuickCheckValidator : ProfileValidator
 
         private int _psVersionMajor;
 
-        private Data.Platform.DotnetRuntime _dotNetEdition;
+        private Data.DotnetRuntime _dotNetEdition;
 
         /// <summary>
         /// Create a new quick check validator.
@@ -192,7 +190,7 @@ public QuickCheckValidator()
         {
             _errAcc = new ValidationErrorAccumulator();
             _psVersionMajor = -1;
-            _dotNetEdition = Data.Platform.DotnetRuntime.Other;
+            _dotNetEdition = Data.DotnetRuntime.Other;
         }
 
         /// <inheritdoc/>
@@ -243,7 +241,7 @@ public override void Reset()
         {
             _errAcc.Clear();
             _psVersionMajor = -1;
-            _dotNetEdition = Data.Platform.DotnetRuntime.Other;
+            _dotNetEdition = Data.DotnetRuntime.Other;
         }
 
         private void ValidatePlatformData(string platformId, PlatformData platformData)
@@ -472,11 +470,11 @@ private void ValidateAvailableTypes(AvailableTypeData types)
 
                 switch (_dotNetEdition)
                 {
-                    case Data.Platform.DotnetRuntime.Core:
+                    case Data.DotnetRuntime.Core:
                         ValidateAssemblies(types.Assemblies, s_coreTypes);
                         break;
 
-                    case Data.Platform.DotnetRuntime.Framework:
+                    case Data.DotnetRuntime.Framework:
                         ValidateAssemblies(types.Assemblies, s_fxTypes);
                         break;
 

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Collection/TypeDataCollector.cs

@@ -9,9 +9,6 @@
 using System.Text;
 using System.Threading;
 using Microsoft.PowerShell.CrossCompatibility.Data;
-using Microsoft.PowerShell.CrossCompatibility.Data.Modules;
-using Microsoft.PowerShell.CrossCompatibility.Data.Types;
-using Microsoft.PowerShell.CrossCompatibility.Data.Platform;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 
 using SMA = System.Management.Automation;

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Commands/AssertPSCompatibilityProfileIsValidCommand.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
+using Microsoft.PowerShell.CrossCompatibility.Collection;
 using Microsoft.PowerShell.CrossCompatibility.Data;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Commands/ConvertJsonCommands.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Management.Automation;
 using Microsoft.PowerShell.CrossCompatibility.Data;
+using Microsoft.PowerShell.CrossCompatibility.Retrieval;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using Newtonsoft.Json;
 

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Commands/GetPSCompatibilityPlatformDataCommand.cs

@@ -3,7 +3,7 @@
 
 using System.Management.Automation;
 using Microsoft.PowerShell.CrossCompatibility.Collection;
-using Microsoft.PowerShell.CrossCompatibility.Data.Platform;
+using Microsoft.PowerShell.CrossCompatibility.Data;
 
 namespace Microsoft.PowerShell.CrossCompatibility.Commands
 {

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Commands/GetPSCompatibilityPlatformNameCommand.cs

@@ -3,7 +3,7 @@
 
 using System.Management.Automation;
 using Microsoft.PowerShell.CrossCompatibility.Collection;
-using Microsoft.PowerShell.CrossCompatibility.Data.Platform;
+using Microsoft.PowerShell.CrossCompatibility.Data;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using SMA = System.Management.Automation;
 

PSCompatibilityCollector/Microsoft.PowerShell.CrossCompatibility/Commands/NewPSCompatibilityProfileCommand.cs

@@ -7,6 +7,7 @@
 using System.Management.Automation;
 using Microsoft.PowerShell.CrossCompatibility.Collection;
 using Microsoft.PowerShell.CrossCompatibility.Data;
+using Microsoft.PowerShell.CrossCompatibility.Retrieval;
 using Microsoft.PowerShell.CrossCompatibility.Utility;
 using Newtonsoft.Json;
 using SMA = System.Management.Automation;