Delete WixToolset.Tools.Core project.

8 files changed, 42 insertions, 26 deletions

diff --git a/src/WixToolset.BuildTasks/Common.cs b/src/WixToolset.BuildTasks/Common.cs
new file mode 100644
index 00000000..c5b709c2
--- /dev/null
+++ b/src/WixToolset.BuildTasks/Common.cs
@@ -0,0 +1,39 @@
+// 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.BuildTasks
+{
+    using System;
+    using System.Text.RegularExpressions;
+
+    /// <summary>
+    /// Common WixTasks utility methods and types.
+    /// </summary>
+    public static class ToolsCommon
+    {
+        /// <summary>Metadata key name to turn off harvesting of project references.</summary>
+        public const string DoNotHarvest = "DoNotHarvest";
+
+        private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
+        private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
+
+        /// <summary>
+        /// Return an identifier based on passed file/directory name
+        /// </summary>
+        /// <param name="name">File/directory name to generate identifer from</param>
+        /// <returns>A version of the name that is a legal identifier.</returns>
+        /// <remarks>This is duplicated from WiX's Common class.</remarks>
+        public static string GetIdentifierFromName(string name)
+        {
+            string result = IllegalIdentifierCharacters.Replace(name, "_"); // replace illegal characters with "_".
+
+            // MSI identifiers must begin with an alphabetic character or an
+            // underscore. Prefix all other values with an underscore.
+            if (AddPrefix.IsMatch(name))
+            {
+                result = String.Concat("_", result);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/WixToolset.BuildTasks/ConvertReferences.cs b/src/WixToolset.BuildTasks/ConvertReferences.cs
index ef50c918..3fdc78d1 100644
--- a/src/WixToolset.BuildTasks/ConvertReferences.cs
+++ b/src/WixToolset.BuildTasks/ConvertReferences.cs
@@ -6,7 +6,6 @@ namespace WixToolset.BuildTasks
     using System.Collections.Generic;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
-    using WixToolset.Tools.Core;
 
     /// <summary>
     /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
diff --git a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs b/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
index c4a5cefe..a5f76618 100644
--- a/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
+++ b/src/WixToolset.BuildTasks/GenerateCompileWithObjectPath.cs
@@ -3,7 +3,6 @@
 namespace WixToolset.BuildTasks
 {
     using System;
-    using System.Collections.Generic;
     using System.Diagnostics.CodeAnalysis;
     using System.Globalization;
     using System.IO;
@@ -136,7 +135,7 @@ namespace WixToolset.BuildTasks
                 // Do not overwrite the ObjectPath metadata if it already was set.
                 if (string.IsNullOrEmpty(this.CompileWithObjectPath[i].GetMetadata("ObjectPath")))
                 {
-                    SetObjectPath(this.CompileWithObjectPath[i]);
+                    this.SetObjectPath(this.CompileWithObjectPath[i]);
                 }
             }
 
diff --git a/src/WixToolset.BuildTasks/GetCabList.cs b/src/WixToolset.BuildTasks/GetCabList.cs
index e97538af..33fa5b37 100644
--- a/src/WixToolset.BuildTasks/GetCabList.cs
+++ b/src/WixToolset.BuildTasks/GetCabList.cs
@@ -3,16 +3,10 @@
 namespace WixToolset.BuildTasks
 {
     using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
-    using System.Reflection;
-    using System.Xml;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
     using WixToolset.Dtf.WindowsInstaller;
-    using Microsoft.Win32;
 
     /// <summary>
     /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
diff --git a/src/WixToolset.BuildTasks/GetLooseFileList.cs b/src/WixToolset.BuildTasks/GetLooseFileList.cs
index bd403426..d1eb62c1 100644
--- a/src/WixToolset.BuildTasks/GetLooseFileList.cs
+++ b/src/WixToolset.BuildTasks/GetLooseFileList.cs
@@ -3,16 +3,11 @@
 namespace WixToolset.BuildTasks
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
-    using System.Reflection;
-    using System.Xml;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
     using WixToolset.Dtf.WindowsInstaller;
-    using Microsoft.Win32;
 
     /// <summary>
     /// This task assigns Culture metadata to files based on the value of the Culture attribute on the
@@ -154,7 +149,7 @@ namespace WixToolset.BuildTasks
                         string directoryParent = (string)(directoryRecords[i + 1]);
                         string defaultDir = (string)(directoryRecords[i + 2]);
 
-                        string sourceDir = SourceDirFromDefaultDir(defaultDir);
+                        string sourceDir = this.SourceDirFromDefaultDir(defaultDir);
 
                         DirectoryIdDefaultDir[directoryId] = sourceDir;
                         DirectoryIdParent[directoryId] = directoryParent;
@@ -206,7 +201,7 @@ namespace WixToolset.BuildTasks
                 for (i = 0; i < fileRecords.Count; i += 3)
                 {
                     string componentId = (string)(fileRecords[i]);
-                    string fileName = SourceFileFromFileName((string)(fileRecords[i + 1]));
+                    string fileName = this.SourceFileFromFileName((string)(fileRecords[i + 1]));
                     int attributes = (int)(fileRecords[i + 2]);
 
                     // If the whole database is marked uncompressed, use the directory layout made above
diff --git a/src/WixToolset.BuildTasks/GlobalSuppressions.cs b/src/WixToolset.BuildTasks/GlobalSuppressions.cs
deleted file mode 100644
index 65c34c13..00000000
--- a/src/WixToolset.BuildTasks/GlobalSuppressions.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-// 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.
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "WixToolset")]
-
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Msi", Scope = "namespace", Target = "WixToolset.BuildTasks")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "wix")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Wix")]
-[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "wix")]
diff --git a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
index 80305f59..7663e6df 100644
--- a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ b/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
@@ -9,7 +9,6 @@ namespace WixToolset.BuildTasks
     using System.Xml;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
-    using WixToolset.Tools.Core;
 
     /// <summary>
     /// This task refreshes the generated file for bundle projects.
diff --git a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
index 101b5363..c57e3f0f 100644
--- a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
+++ b/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
@@ -9,7 +9,6 @@ namespace WixToolset.BuildTasks
     using System.Xml;
     using Microsoft.Build.Framework;
     using Microsoft.Build.Utilities;
-    using WixToolset.Tools.Core;
 
     /// <summary>
     /// This task refreshes the generated file that contains ComponentGroupRefs