aboutsummaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2025-04-24 21:32:49 -0400
committerBob Arnson <bob@firegiant.com>2025-06-12 08:54:41 -0400
commit3abf00a71151d1caef6e853a2f330d7691f4abf8 (patch)
tree0e6145c8038905aec81ecccaea4c6968cf73d392 /src/test
parent796fed6b2623ec29b126238d97becfef71badfbc (diff)
downloadwix-bob/HeatCremation.tar.gz
wix-bob/HeatCremation.tar.bz2
wix-bob/HeatCremation.zip
Remove deprecated Heat.bob/HeatCremation
Fixes https://github.com/wixtoolset/issues/issues/9039
Diffstat (limited to '')
-rw-r--r--src/test/wix/TestData/WixprojPackageHarvesting/Package.wxs12
-rw-r--r--src/test/wix/TestData/WixprojPackageHarvesting/WixprojPackageHarvesting.wixproj21
-rw-r--r--src/test/wix/TestData/WixprojPackageHarvesting/_data/a.txt1
-rw-r--r--src/test/wix/TestData/WixprojPackageHarvesting/_data/b.txt1
-rw-r--r--src/test/wix/TestData/WixprojPackageHeatDir/Package.wxs12
-rw-r--r--src/test/wix/TestData/WixprojPackageHeatDir/WixprojPackageHeatDir.wixproj30
-rw-r--r--src/test/wix/TestData/WixprojPackageHeatDir/_data/a.txt1
-rw-r--r--src/test/wix/TestData/WixprojPackageHeatDir/_data/b.txt1
-rw-r--r--src/test/wix/WixE2E/WixE2EFixture.cs26
9 files changed, 0 insertions, 105 deletions
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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
3
4 <StandardDirectory Id='ProgramFiles6432Folder'>
5 <Directory Id='ApplicationFolder' Name='Test App' />
6 </StandardDirectory>
7
8 <Feature Id='Main'>
9 <ComponentGroupRef Id='HarvestedComponents' />
10 </Feature>
11 </Package>
12</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 @@
1<!-- 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. -->
2
3<Project Sdk='WixToolset.Sdk'>
4 <PropertyGroup>
5 <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6 <SuppressValidation>true</SuppressValidation>
7 </PropertyGroup>
8
9 <ItemGroup>
10 <HarvestDirectory Include="_data">
11 <ComponentGroupName>HarvestedComponents</ComponentGroupName>
12 <DirectoryRefId>ApplicationFolder</DirectoryRefId>
13 <SuppressRootDirectory>true</SuppressRootDirectory>
14 </HarvestDirectory>
15 <BindInputPaths Include="_data" />
16 </ItemGroup>
17
18 <ItemGroup>
19 <PackageReference Include="Wixtoolset.Heat" />
20 </ItemGroup>
21</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 @@
1This 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 @@
1This 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 @@
1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 <Package Name='WixprojPackageHarvesting' Manufacturer='WiX Toolset' Version='0.0.1' UpgradeCode='41a2c17e-1976-465b-bcde-eae03516ca68'>
3
4 <StandardDirectory Id='ProgramFiles6432Folder'>
5 <Directory Id='ApplicationFolder' Name='Test App' />
6 </StandardDirectory>
7
8 <Feature Id='Main'>
9 <ComponentGroupRef Id='HarvestedComponents' />
10 </Feature>
11 </Package>
12</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 @@
1<!-- 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. -->
2
3<Project Sdk='WixToolset.Sdk'>
4 <PropertyGroup>
5 <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
6 <SuppressValidation>true</SuppressValidation>
7 </PropertyGroup>
8
9 <ItemGroup>
10 <BindInputPaths Include="_data" />
11 </ItemGroup>
12
13 <ItemGroup>
14 <PackageReference Include="Wixtoolset.Heat" />
15 </ItemGroup>
16
17 <Target Name="ManualHarvest" BeforeTargets="BeforeBuild">
18 <HeatDirectory
19 Directory="_data"
20 AutogenerateGuids="true"
21 ComponentGroupName="HarvestedComponents"
22 DirectoryRefId="ApplicationFolder"
23 OutputFile="obj\_g.wxs"
24 />
25 <ItemGroup>
26 <Compile Include="obj\_g.wxs" />
27 </ItemGroup>
28 </Target>
29
30</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 @@
1This 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 @@
1This 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
133 Assert.NotEqual(firstHashes, secondHashes); 133 Assert.NotEqual(firstHashes, secondHashes);
134 } 134 }
135 135
136 [Theory]
137 [InlineData(false)]
138 [InlineData(true)]
139 public void CanBuildPackageWithHarvesting(bool x64)
140 {
141 var projectPath = TestData.Get("TestData", "WixprojPackageHarvesting", "WixprojPackageHarvesting.wixproj");
142
143 CleanEverything();
144
145 var result = RestoreAndBuild(projectPath, x64);
146 result.AssertSuccess();
147 }
148
149 [Theory]
150 [InlineData(false)]
151 [InlineData(true)]
152 public void CanBuildPackageWithHeatDir(bool x64)
153 {
154 var projectPath = TestData.Get("TestData", "WixprojPackageHeatDir", "WixprojPackageHeatDir.wixproj");
155
156 CleanEverything();
157
158 var result = RestoreAndBuild(projectPath, x64);
159 result.AssertSuccess();
160 }
161
162 [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")] 136 [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
163 public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits() 137 public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
164 { 138 {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-13 06:55:01 +0000