Remove deprecated Heat.

src/api/wix/WixToolset.Data/ErrorMessages.cs

@@ -248,11 +248,6 @@ public static Message DuplicateCabinetName2(SourceLineNumber sourceLineNumbers,
             return Message(sourceLineNumbers, Ids.DuplicateCabinetName2, "Duplicate cabinet name '{0}' error related to previous error.", cabinetName);
         }
 
-        public static Message DuplicateCommandLineOptionInExtension(string arg)
-        {
-            return Message(null, Ids.DuplicateCommandLineOptionInExtension, "The command line option '{0}' has already been loaded by another Heat extension.", arg);
-        }
-
         public static Message DuplicateComponentGuids(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
         {
             return Message(sourceLineNumbers, Ids.DuplicateComponentGuids, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
@@ -705,16 +700,6 @@ public static Message HarvestSourceNotSpecified()
             return Message(null, Ids.HarvestSourceNotSpecified, "A harvest source must be specified after the harvest type and can be followed by harvester arguments.");
         }
 
-        public static Message HarvestTypeNotFound()
-        {
-            return Message(null, Ids.HarvestTypeNotFound, "The harvest type was not found in the list of loaded Heat extensions.");
-        }
-
-        public static Message HarvestTypeNotFound(string harvestType)
-        {
-            return Message(null, Ids.HarvestTypeNotFound, "The harvest type '{0}' was specified. Harvest types cannot start with a '-'. Remove the '-' to specify a valid harvest type.", harvestType);
-        }
-
         public static Message IdentifierNotFound(string type, string identifier)
         {
             return Message(null, Ids.IdentifierNotFound, "An expected identifier ('{1}', of type '{0}') was not found.", type, identifier);
@@ -2588,8 +2573,6 @@ public enum Ids
             SameFileIdDifferentSource = 317,
             HarvestSourceNotSpecified = 318,
             OutputTargetNotSpecified = 319,
-            DuplicateCommandLineOptionInExtension = 320,
-            HarvestTypeNotFound = 321,
             BothUpgradeCodesRequired = 322,
             IllegalBinderClassName = 323,
             SpecifiedBinderNotFound = 324,

src/api/wix/WixToolset.Data/WarningMessages.cs

@@ -357,11 +357,6 @@ public static Message ImplicitMergeModulePrimaryFeature(string componentId)
             return Message(null, Ids.ImplicitMergeModulePrimaryFeature, "The merge module '{0}' does not have an explicit primary feature parent specified. If the source files are linked in a different order, the primary parent feature may change. To prevent accidental changes, the primary feature parent should be set to 'yes' in one of the MergeRef/@Primary or FeatureGroupRef/@Primary locations for this component.", componentId);
         }
 
-        public static Message InsufficientPermissionHarvestTypeLib()
-        {
-            return Message(null, Ids.InsufficientPermissionHarvestTypeLib, "Not enough permissions to harvest type library. On Windows Vista, you must either run Heat elevated, or install Windows Vista SP1 (or higher).");
-        }
-
         public static Message InvalidAttributeCombination(SourceLineNumber sourceLineNumbers, string attrib1, string attrib2, string name, string value)
         {
             return Message(sourceLineNumbers, Ids.InvalidAttributeCombination, "It is invalid to combine attributes {0} and {1}. The decompiled output will set attribute {2} to {3}.", attrib1, attrib2, name, value);
@@ -813,7 +808,6 @@ public enum Ids
             UnexpectedEntrySection = 1109,
             NewComponentAddedToExistingFeature = 1110,
             DeprecatedAttributeValue = 1111,
-            InsufficientPermissionHarvestTypeLib = 1112,
             UnclearShortcut = 1113,
             TooManyProgIds = 1114,
             BadColumnDataIgnored = 1115,

src/clean.cmd

@@ -48,7 +48,6 @@ if exist "%_NUGET_CACHE%\wixtoolset.dtf.windowsinstaller.package" rd /s/q "%_NUG
 if exist "%_NUGET_CACHE%\wixtoolset.dutil" rd /s/q "%_NUGET_CACHE%\wixtoolset.dutil"
 if exist "%_NUGET_CACHE%\wixtoolset.extensibility" rd /s/q "%_NUGET_CACHE%\wixtoolset.extensibility"
 if exist "%_NUGET_CACHE%\wixtoolset.firewall.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.firewall.wixext"
-if exist "%_NUGET_CACHE%\wixtoolset.heat" rd /s/q "%_NUGET_CACHE%\wixtoolset.heat"
 if exist "%_NUGET_CACHE%\wixtoolset.http.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.http.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.iis.wixext" rd /s/q "%_NUGET_CACHE%\wixtoolset.iis.wixext"
 if exist "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi" rd /s/q "%_NUGET_CACHE%\wixtoolset.bootstrapperapplicationapi"

src/internal/SetBuildNumber/Directory.Packages.props.pp

@@ -40,8 +40,6 @@
     <PackageVersion Include="WixInternal.Core.TestPackage" Version="{packageversion}" />
     <PackageVersion Include="WixInternal.Core.MSTestPackage" Version="{packageversion}" />
 
-    <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" />
-
     <PackageVersion Include="WixToolset.Bal.wixext" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.BootstrapperApplications.wixext" Version="{packageversion}" />
     <PackageVersion Include="WixToolset.ComPlus.wixext" Version="{packageversion}" />

src/setup/wix-cli/Package.wxs

@@ -30,9 +30,6 @@
         <Exclude Files="!(bindpath.Files)\**\*.xml" />
         <Exclude Files="!(bindpath.Files)\**\*.targets" />
       </Files>
-
-      <Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
-      <Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
     </ComponentGroup>
   </Fragment>
 

src/setup/wix-cli/wix-cli.wixproj

@@ -9,8 +9,6 @@
 
   <ItemGroup>
     <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
-    <BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
-    <BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
 
     <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
     <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />

src/test/wix/WixE2E/WixE2EFixture.cs

@@ -133,32 +133,6 @@ public void CanIncrementalBuildPackageWithNativeWindowsAppWithEdits()
             Assert.NotEqual(firstHashes, secondHashes);
         }
 
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void CanBuildPackageWithHarvesting(bool x64)
-        {
-            var projectPath = TestData.Get("TestData", "WixprojPackageHarvesting", "WixprojPackageHarvesting.wixproj");
-
-            CleanEverything();
-
-            var result = RestoreAndBuild(projectPath, x64);
-            result.AssertSuccess();
-        }
-
-        [Theory]
-        [InlineData(false)]
-        [InlineData(true)]
-        public void CanBuildPackageWithHeatDir(bool x64)
-        {
-            var projectPath = TestData.Get("TestData", "WixprojPackageHeatDir", "WixprojPackageHeatDir.wixproj");
-
-            CleanEverything();
-
-            var result = RestoreAndBuild(projectPath, x64);
-            result.AssertSuccess();
-        }
-
         [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
         public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
         {