14 files changed, 7 insertions, 66 deletions

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.Tools.Core/ToolsCommon.cs b/src/WixToolset.BuildTasks/Common.cs
index 37d89f3c..c5b709c2 100644
--- a/src/Wixtoolset.Tools.Core/ToolsCommon.cs
+++ b/src/WixToolset.BuildTasks/Common.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.Tools.Core
+namespace WixToolset.BuildTasks
 {
     using System;
     using System.Text.RegularExpressions;
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
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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net461;net472</TargetFrameworks>
-    <Description>Tools Core</Description>
-    <Title>WiX Toolset Tools Core</Title>
-    <DebugType>embedded</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Core" Version="4.0.*" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
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 @@
-<ProjectConfiguration>
-  <Settings>
-    <HiddenComponentWarnings />
-  </Settings>
-</ProjectConfiguration>
\ No newline at end of file
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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
+    <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
   </ItemGroup>
 
   <ItemGroup>
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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
+    <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
   </ItemGroup>
 
   <ItemGroup>
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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WixToolset.Tools.Core\WixToolset.Tools.Core.csproj" />
+    <Compile Include="..\WixToolset.Tools.Core\ConsoleMessageListener.cs" Link="ConsoleMessageListener.cs" />
   </ItemGroup>
 
   <ItemGroup>