From 244b46cf7f3252d6dc3884ce184be901d1d173e5 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 2 Sep 2018 16:12:29 -0500 Subject: Migrate WixCop into Tools from wix4. --- src/WixToolset.BuildTasks/RefreshGeneratedFile.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/WixToolset.BuildTasks/RefreshGeneratedFile.cs') 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; /// /// This task refreshes the generated file that contains ComponentGroupRefs @@ -17,9 +17,6 @@ namespace WixToolset.BuildTasks /// 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) -- cgit v1.2.3-55-g6feb