Migrate WixCop into Tools from wix4.

5 files changed, 12 insertions, 58 deletions

diff --git a/src/WixToolset.BuildTasks/Common.cs b/src/WixToolset.BuildTasks/Common.cs
deleted file mode 100644
index 803e9d14..00000000
--- a/src/WixToolset.BuildTasks/Common.cs
+++ /dev/null
@@ -1,41 +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.
-
-namespace WixToolset
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using System.Text.RegularExpressions;
-
-    /// <summary>
-    /// Common WixTasks utility methods and types.
-    /// </summary>
-    internal static class Common
-    {
-        /// <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>
-        internal 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 fe137633..ef50c918 100644
--- a/src/WixToolset.BuildTasks/ConvertReferences.cs
+++ b/src/WixToolset.BuildTasks/ConvertReferences.cs
@@ -3,13 +3,10 @@
 namespace WixToolset.BuildTasks
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
-    using System.Globalization;
-    using System.IO;
-    using System.Xml;
     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
@@ -62,7 +59,7 @@ namespace WixToolset.BuildTasks
             {
                 Dictionary<string, string> newItemMetadeta = new Dictionary<string, string>();
 
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
                 {
                     continue;
                 }
diff --git a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
index 5445e0cd..80305f59 100644
--- a/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ b/src/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
@@ -6,19 +6,16 @@ namespace WixToolset.BuildTasks
     using System.Collections;
     using System.Globalization;
     using System.IO;
-    using System.Text.RegularExpressions;
     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.
     /// </summary>
     public class RefreshBundleGeneratedFile : Task
     {
-        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
-
         private ITaskItem[] generatedFiles;
         private ITaskItem[] projectReferencePaths;
 
@@ -54,14 +51,14 @@ namespace WixToolset.BuildTasks
             {
                 ITaskItem item = this.ProjectReferencePaths[i];
 
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
                 {
                     continue;
                 }
 
                 string projectPath = CreateProjectReferenceDefineConstants.GetProjectPath(this.ProjectReferencePaths, i);
                 string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = Common.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
+                string referenceName = ToolsCommon.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
 
                 string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
                 foreach (string pog in pogs)
diff --git a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs b/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
index fdfc4774..101b5363 100644
--- a/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
+++ b/src/WixToolset.BuildTasks/RefreshGeneratedFile.cs
@@ -6,10 +6,10 @@ namespace WixToolset.BuildTasks
     using System.Collections;
     using System.Globalization;
     using System.IO;
-    using System.Text.RegularExpressions;
     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
@@ -17,9 +17,6 @@ namespace WixToolset.BuildTasks
     /// </summary>
     public class RefreshGeneratedFile : Task
     {
-        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
-
         private ITaskItem[] generatedFiles;
         private ITaskItem[] projectReferencePaths;
 
@@ -54,14 +51,14 @@ namespace WixToolset.BuildTasks
             {
                 ITaskItem item = this.ProjectReferencePaths[i];
 
-                if (!String.IsNullOrEmpty(item.GetMetadata(Common.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
                 {
                     continue;
                 }
 
                 string projectPath = CreateProjectReferenceDefineConstants.GetProjectPath(this.ProjectReferencePaths, i);
                 string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = Common.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
+                string referenceName = ToolsCommon.GetIdentifierFromName(CreateProjectReferenceDefineConstants.GetReferenceName(item, projectName));
 
                 string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
                 foreach (string pog in pogs)
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 8a5c388d..39c8824c 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -28,6 +28,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="$(WixToolsetRootFolder)\Core\src\WixToolset.Core\WixToolset.Core.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Core\README.md') " />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Core\README.md') " />