From 3abf00a71151d1caef6e853a2f330d7691f4abf8 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 24 Apr 2025 21:32:49 -0400
Subject: Remove deprecated Heat.

Fixes https://github.com/wixtoolset/issues/issues/9039
---
 .../TestData/WixprojPackageHarvesting/Package.wxs  | 12 ---------
 .../WixprojPackageHarvesting.wixproj               | 21 ---------------
 .../TestData/WixprojPackageHarvesting/_data/a.txt  |  1 -
 .../TestData/WixprojPackageHarvesting/_data/b.txt  |  1 -
 .../wix/TestData/WixprojPackageHeatDir/Package.wxs | 12 ---------
 .../WixprojPackageHeatDir.wixproj                  | 30 ----------------------
 .../wix/TestData/WixprojPackageHeatDir/_data/a.txt |  1 -
 .../wix/TestData/WixprojPackageHeatDir/_data/b.txt |  1 -
 src/test/wix/WixE2E/WixE2EFixture.cs               | 26 -------------------
 9 files changed, 105 deletions(-)
 delete mode 100644 src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
 delete mode 100644 src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
 delete mode 100644 src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
 delete mode 100644 src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
 delete mode 100644 src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
 delete mode 100644 src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
 delete mode 100644 src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
 delete mode 100644 src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt

(limited to 'src/test')

diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs b/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
deleted file mode 100644
index cea86733..00000000
--- a/src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
-
-    <StandardDirectory Id='ProgramFiles6432Folder'>
-      <Directory Id='ApplicationFolder' Name='Test App' />
-    </StandardDirectory>
-
-    <Feature Id='Main'>
-      <ComponentGroupRef Id='HarvestedComponents' />
-    </Feature>
-  </Package>
-</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj b/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
deleted file mode 100644
index c4255246..00000000
--- a/src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj
+++ /dev/null
@@ -1,21 +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. -->
-
-<Project Sdk='WixToolset.Sdk'> 
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <SuppressValidation>true</SuppressValidation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <HarvestDirectory Include="_data">
-      <ComponentGroupName>HarvestedComponents</ComponentGroupName>
-      <DirectoryRefId>ApplicationFolder</DirectoryRefId>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
-    <BindInputPaths Include="_data" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Wixtoolset.Heat" />
-  </ItemGroup>
-</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
deleted file mode 100644
index 71b864af..00000000
--- a/src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt b/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
deleted file mode 100644
index 78eb1cc6..00000000
--- a/src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is b.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs b/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
deleted file mode 100644
index cea86733..00000000
--- a/src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs
+++ /dev/null
@@ -1,12 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
-
-    <StandardDirectory Id='ProgramFiles6432Folder'>
-      <Directory Id='ApplicationFolder' Name='Test App' />
-    </StandardDirectory>
-
-    <Feature Id='Main'>
-      <ComponentGroupRef Id='HarvestedComponents' />
-    </Feature>
-  </Package>
-</Wix>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj b/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
deleted file mode 100644
index 3df9c9d4..00000000
--- a/src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj
+++ /dev/null
@@ -1,30 +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. -->
-
-<Project Sdk='WixToolset.Sdk'> 
-  <PropertyGroup>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <SuppressValidation>true</SuppressValidation>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="_data" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Wixtoolset.Heat" />
-  </ItemGroup>
-
-  <Target Name="ManualHarvest" BeforeTargets="BeforeBuild">
-    <HeatDirectory
-      Directory="_data"
-      AutogenerateGuids="true"
-      ComponentGroupName="HarvestedComponents"
-      DirectoryRefId="ApplicationFolder"
-      OutputFile="obj\_g.wxs"
-      />
-    <ItemGroup>
-      <Compile Include="obj\_g.wxs" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
deleted file mode 100644
index 71b864af..00000000
--- a/src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is a.txt.
diff --git a/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt b/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
deleted file mode 100644
index 78eb1cc6..00000000
--- a/src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is b.txt.
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index 488d2fe9..f15571e4 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -133,32 +133,6 @@ namespace WixE2E
             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()
         {
-- 
cgit v1.2.3-55-g6feb