From d5d5e87acf7eadacd757083a4d0272a04962ae9b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 3 Jun 2020 12:28:49 +1000 Subject: Delete WixToolset.Tools.Core project. --- Tools.sln | 10 ------ src/WixToolset.BuildTasks/Common.cs | 39 ++++++++++++++++++++++ src/WixToolset.BuildTasks/ConvertReferences.cs | 1 - .../GenerateCompileWithObjectPath.cs | 3 +- src/WixToolset.BuildTasks/GetCabList.cs | 6 ---- src/WixToolset.BuildTasks/GetLooseFileList.cs | 9 ++--- src/WixToolset.BuildTasks/GlobalSuppressions.cs | 8 ----- .../RefreshBundleGeneratedFile.cs | 1 - src/WixToolset.BuildTasks/RefreshGeneratedFile.cs | 1 - .../WixToolset.Tools.Core.csproj | 21 ------------ .../WixToolset.Tools.Core.v3.ncrunchproject | 5 --- src/Wixtoolset.Tools.Core/ToolsCommon.cs | 39 ---------------------- src/heat/heat.csproj | 2 +- src/wix/wix.csproj | 2 +- src/wixcop/WixCop.csproj | 2 +- 15 files changed, 45 insertions(+), 104 deletions(-) create mode 100644 src/WixToolset.BuildTasks/Common.cs delete mode 100644 src/WixToolset.BuildTasks/GlobalSuppressions.cs delete mode 100644 src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj delete mode 100644 src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject delete mode 100644 src/Wixtoolset.Tools.Core/ToolsCommon.cs diff --git a/Tools.sln b/Tools.sln index c9bf5a38..d250d0fb 100644 --- a/Tools.sln +++ b/Tools.sln @@ -20,8 +20,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixCop", "src\wixcop\WixCop.csproj", "{2E54120B-8958-40B1-A7FC-851446994CD8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Tools.Core", "src\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj", "{9C3B486F-AE0E-43BA-823A-30808B73C6B4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.WixCop", "src\test\WixToolsetTest.WixCop\WixToolsetTest.WixCop.csproj", "{F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "thmviewer", "src\thmviewer\thmviewer.vcxproj", "{95228C13-97F5-484A-B4A2-ECF4618B0881}" @@ -86,14 +84,6 @@ Global {2E54120B-8958-40B1-A7FC-851446994CD8}.Release|Any CPU.Build.0 = Release|Any CPU {2E54120B-8958-40B1-A7FC-851446994CD8}.Release|x86.ActiveCfg = Release|Any CPU {2E54120B-8958-40B1-A7FC-851446994CD8}.Release|x86.Build.0 = Release|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|x86.ActiveCfg = Debug|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Debug|x86.Build.0 = Debug|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|Any CPU.Build.0 = Release|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|x86.ActiveCfg = Release|Any CPU - {9C3B486F-AE0E-43BA-823A-30808B73C6B4}.Release|x86.Build.0 = Release|Any CPU {F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F1A8112B-95A1-4AF7-81CB-523BE7DB8E5C}.Debug|x86.ActiveCfg = Debug|Any CPU 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; + + /// + /// Common WixTasks utility methods and types. + /// + public static class ToolsCommon + { + /// Metadata key name to turn off harvesting of project references. + 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 + + /// + /// Return an identifier based on passed file/directory name + /// + /// File/directory name to generate identifer from + /// A version of the name that is a legal identifier. + /// This is duplicated from WiX's Common class. + 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; /// /// 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; /// /// 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; /// /// 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; /// /// 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; /// /// This task refreshes the generated file that contains ComponentGroupRefs diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj deleted file mode 100644 index eb091635..00000000 --- a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - netstandard2.0;net461;net472 - Tools Core - WiX Toolset Tools Core - embedded - true - - - - - - - - - - - diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject deleted file mode 100644 index cf22dfa9..00000000 --- a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/Wixtoolset.Tools.Core/ToolsCommon.cs b/src/Wixtoolset.Tools.Core/ToolsCommon.cs deleted file mode 100644 index 37d89f3c..00000000 --- a/src/Wixtoolset.Tools.Core/ToolsCommon.cs +++ /dev/null @@ -1,39 +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.Tools.Core -{ - using System; - using System.Text.RegularExpressions; - - /// - /// Common WixTasks utility methods and types. - /// - public static class ToolsCommon - { - /// Metadata key name to turn off harvesting of project references. - 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 - - /// - /// Return an identifier based on passed file/directory name - /// - /// File/directory name to generate identifer from - /// A version of the name that is a legal identifier. - /// This is duplicated from WiX's Common class. - 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/heat/heat.csproj b/src/heat/heat.csproj index c2dc5116..b5018b67 100644 --- a/src/heat/heat.csproj +++ b/src/heat/heat.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj index f1b85752..2b053196 100644 --- a/src/wix/wix.csproj +++ b/src/wix/wix.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/wixcop/WixCop.csproj b/src/wixcop/WixCop.csproj index ac5af52e..c7c04f55 100644 --- a/src/wixcop/WixCop.csproj +++ b/src/wixcop/WixCop.csproj @@ -20,7 +20,7 @@ - + -- cgit v1.2.3-55-g6feb