Minor code cleanup/reorganization

7 files changed, 19 insertions, 20 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Decompiler.cs b/src/WixToolset.Core.WindowsInstaller/Decompiler.cs
index 8136bf00..c5d68db3 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompiler.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompiler.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset
+namespace WixToolset.Core.WindowsInstaller
 {
     using System;
     using System.Collections;
diff --git a/src/WixToolset.Core/CommandLine/ParseCommandLine.cs b/src/WixToolset.Core/CommandLine/ParseCommandLine.cs
index 7d0dcbd8..3cf6e032 100644
--- a/src/WixToolset.Core/CommandLine/ParseCommandLine.cs
+++ b/src/WixToolset.Core/CommandLine/ParseCommandLine.cs
@@ -25,11 +25,14 @@ namespace WixToolset.Core.CommandLine
             this.ErrorArgument = errorArgument;
         }
 
-        public bool IsSwitch(string arg) => !String.IsNullOrEmpty(arg) && ('/' == arg[0] || '-' == arg[0]);
+        public bool IsSwitch(string arg)
+        {
+            return !String.IsNullOrEmpty(arg) && ('/' == arg[0] || '-' == arg[0]);
+        }
 
         public void GetArgumentAsFilePathOrError(string argument, string fileType, IList<string> paths)
         {
-            foreach (var path in GetFiles(argument, fileType))
+            foreach (var path in this.GetFiles(argument, fileType))
             {
                 paths.Add(path);
             }
@@ -60,7 +63,7 @@ namespace WixToolset.Core.CommandLine
 
         public string GetNextArgumentAsDirectoryOrError(string commandLineSwitch)
         {
-            if (this.TryGetNextNonSwitchArgumentOrError(out var arg) && TryGetDirectory(commandLineSwitch, this.Messaging, arg, out var directory))
+            if (this.TryGetNextNonSwitchArgumentOrError(out var arg) && this.TryGetDirectory(commandLineSwitch, this.Messaging, arg, out var directory))
             {
                 return directory;
             }
@@ -71,7 +74,7 @@ namespace WixToolset.Core.CommandLine
 
         public bool GetNextArgumentAsDirectoryOrError(string commandLineSwitch, IList<string> directories)
         {
-            if (this.TryGetNextNonSwitchArgumentOrError(out var arg) && TryGetDirectory(commandLineSwitch, this.Messaging, arg, out var directory))
+            if (this.TryGetNextNonSwitchArgumentOrError(out var arg) && this.TryGetDirectory(commandLineSwitch, this.Messaging, arg, out var directory))
             {
                 directories.Add(directory);
                 return true;
@@ -96,7 +99,7 @@ namespace WixToolset.Core.CommandLine
         {
             if (this.TryGetNextNonSwitchArgumentOrError(out var arg))
             {
-                foreach (var path in GetFiles(arg, fileType))
+                foreach (var path in this.GetFiles(arg, fileType))
                 {
                     paths.Add(path);
                 }
@@ -125,7 +128,10 @@ namespace WixToolset.Core.CommandLine
             return result;
         }
 
-        private static bool IsValidArg(string arg) => !(String.IsNullOrEmpty(arg) || '/' == arg[0] || '-' == arg[0]);
+        private static bool IsValidArg(string arg)
+        {
+            return !(String.IsNullOrEmpty(arg) || '/' == arg[0] || '-' == arg[0]);
+        }
 
         private static bool TryDequeue(Queue<string> q, out string arg)
         {
@@ -194,8 +200,8 @@ namespace WixToolset.Core.CommandLine
             }
 
             // Convert alternate directory separators to the standard one.
-            string filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
-            int lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar);
+            var filePath = searchPath.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            var lastSeparator = filePath.LastIndexOf(Path.DirectorySeparatorChar);
             var files = new string[0];
 
             try
diff --git a/src/WixToolset.Core/Decompiler.cs b/src/WixToolset.Core/Decompiler.cs
index 5f14dfca..45cfbea0 100644
--- a/src/WixToolset.Core/Decompiler.cs
+++ b/src/WixToolset.Core/Decompiler.cs
@@ -3,7 +3,6 @@
 namespace WixToolset.Core
 {
     using System;
-    using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -18,12 +17,6 @@ namespace WixToolset.Core
             this.ServiceProvider = serviceProvider;
         }
 
-        public OutputType DecompileType { get; set; }
-
-        public string IntermediateFolder { get; set; }
-
-        public string OutputPath { get; set; }
-
         public IServiceProvider ServiceProvider { get; }
 
         public BindResult Decompile(IDecompileContext context)
diff --git a/src/WixToolset.Core/FileTransfer.cs b/src/WixToolset.Core/ExtensibilityServices/FileTransfer.cs
index 7f9ed0f3..2cad7cce 100644
--- a/src/WixToolset.Core/FileTransfer.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/FileTransfer.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Core
+namespace WixToolset.Core.ExtensibilityServices
 {
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core/TrackedFile.cs b/src/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
index 312b09f4..028cddbf 100644
--- a/src/WixToolset.Core/TrackedFile.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/TrackedFile.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Core
+namespace WixToolset.Core.ExtensibilityServices
 {
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core/Uuid.cs b/src/WixToolset.Core/ExtensibilityServices/Uuid.cs
index c93d134d..a5692b71 100644
--- a/src/WixToolset.Core/Uuid.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/Uuid.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset
+namespace WixToolset.Core.ExtensibilityServices
 {
     using System;
     using System.Net;
diff --git a/src/WixToolset.Core/WixToolsetServiceProvider.cs b/src/WixToolset.Core/WixToolsetServiceProvider.cs
index 83b9356d..0337f771 100644
--- a/src/WixToolset.Core/WixToolsetServiceProvider.cs
+++ b/src/WixToolset.Core/WixToolsetServiceProvider.cs
@@ -92,7 +92,7 @@ namespace WixToolset.Core
         public void AddService<T>(Func<IServiceProvider, Dictionary<Type, object>, T> creationFunction)
             where T : class
         {
-            AddService(typeof(T), creationFunction);
+            this.AddService(typeof(T), creationFunction);
         }
 
         private static T AddSingleton<T>(Dictionary<Type, object> singletons, T service)