Create WixToolset.Heat.nupkg to distribute heat.exe and Heat targets

Moves Heat functionality to the "tools" layer and packages it all up in WixToolset.Heat.nupkg for distribution in WiX v4. Completes 6838
author: Rob Mensching <rob@firegiant.com> 2022-07-26 17:20:39 -0700
committer: Rob Mensching <rob@firegiant.com> 2022-08-01 20:25:19 -0700
commit: a627ca9b720047e633a8fe72003ab9bee31006c5 (patch)
tree: 2bc8a924bb4141ab718e74d08f6459a0ffe8d573 /src/ext/Bal
parent: 521eb3c9cf38823a2c4019abb85dc0b3200b92cb (diff)
download: wix-a627ca9b720047e633a8fe72003ab9bee31006c5.tar.gz
wix-a627ca9b720047e633a8fe72003ab9bee31006c5.tar.bz2
wix-a627ca9b720047e633a8fe72003ab9bee31006c5.zip
6 files changed, 24 insertions, 13 deletions
diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd
index aedf9b64..060f8ee0 100644
--- a/src/ext/Bal/bal.cmd
+++ b/src/ext/Bal/bal.cmd
@@ -22,7 +22,7 @@ msbuild -p:Configuration=%_C% || exit /b
 dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" || exit /b
-msbuild -p:Configuration=%_C% test\examples\examples.proj || exit /b
+msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl || exit /b
 :: Test
 dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" || exit /b
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
index ebeebff2..3f81710e 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
index a6b56460..f9926550 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
index 30a860ab..048e3c97 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
index 5ce89b64..056bf2bb 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
            <Transforms>ba.xslt</Transforms>
        </HarvestDirectory>
    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="WixToolset.Heat" />
+    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index 82a5e3c1..855f0ef5 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -2,8 +2,7 @@
 <!-- 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 ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">  
+<Project Sdk="Microsoft.Build.Traversal">
-  <Import Project="..\..\Directory.Build.props" />
  <PropertyGroup>
    <EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
@@ -28,14 +27,12 @@
      <SkipFDDx86>true</SkipFDDx86>
      <SkipSCD>true</SkipSCD>
    </CoreMBAProject>
-    
    <FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
    <FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
-    
-    <ExampleBundleProject Include="**\*.wixproj" />
  </ItemGroup>
-  <Target Name="PublishCoreExamples">
+  <Target Name="PublishCoreExamples" BeforeTargets="Build">
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
          Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
@@ -46,9 +43,7 @@
          Condition="'%(CoreMBAProject.TrimMode)'!=''" />
  </Target>
-  <Target Name="Build" DependsOnTargets="PublishCoreExamples">
+  <ItemGroup>
-    <MSBuild Projects="%(ExampleBundleProject.Identity)" />
+    <ProjectReference Include="**\*.wixproj" />
-  </Target>
+  </ItemGroup>
-  
+</Project>
-  <Import Project="..\..\..\..\Directory.Build.targets" />
-</Project>
-\ No newline at end of file
author	Rob Mensching <rob@firegiant.com>	2022-07-26 17:20:39 -0700
committer	Rob Mensching <rob@firegiant.com>	2022-08-01 20:25:19 -0700
commit	a627ca9b720047e633a8fe72003ab9bee31006c5 (patch)
tree	2bc8a924bb4141ab718e74d08f6459a0ffe8d573 /src/ext/Bal
parent	521eb3c9cf38823a2c4019abb85dc0b3200b92cb (diff)
download	wix-a627ca9b720047e633a8fe72003ab9bee31006c5.tar.gz wix-a627ca9b720047e633a8fe72003ab9bee31006c5.tar.bz2 wix-a627ca9b720047e633a8fe72003ab9bee31006c5.zip

diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index aedf9b64..060f8ee0 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd
@@ -22,7 +22,7 @@ msbuild -p:Configuration=%_C% \|\| exit /b
22		22
23	dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" \|\| exit /b	23	dotnet test test\WixToolsetTest.Dnc.HostGenerator -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Dnc.HostGenerator.trx" \|\| exit /b
24		24
25	msbuild -p:Configuration=%_C% test\examples\examples.proj \|\| exit /b	25	msbuild -Restore -p:Configuration=%_C% test\examples\examples.proj -bl \|\| exit /b
26		26
27	:: Test	27	:: Test
28	dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" \|\| exit /b	28	dotnet test test\WixToolsetTest.Bal -c %_C% --no-build -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.Bal.trx" \|\| exit /b


diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj index ebeebff2..3f81710e 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
7	<Transforms>ba.xslt</Transforms>	7	<Transforms>ba.xslt</Transforms>
8	</HarvestDirectory>	8	</HarvestDirectory>
9	</ItemGroup>	9	</ItemGroup>
		10
		11	<ItemGroup>
		12	<PackageReference Include="WixToolset.Heat" />
		13	</ItemGroup>
10	</Project>	14	</Project>


diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj index a6b56460..f9926550 100644 --- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
7	<Transforms>ba.xslt</Transforms>	7	<Transforms>ba.xslt</Transforms>
8	</HarvestDirectory>	8	</HarvestDirectory>
9	</ItemGroup>	9	</ItemGroup>
		10
		11	<ItemGroup>
		12	<PackageReference Include="WixToolset.Heat" />
		13	</ItemGroup>
10	</Project>	14	</Project>


diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj index 30a860ab..048e3c97 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
@@ -7,4 +7,8 @@
7	<Transforms>ba.xslt</Transforms>	7	<Transforms>ba.xslt</Transforms>
8	</HarvestDirectory>	8	</HarvestDirectory>
9	</ItemGroup>	9	</ItemGroup>
		10
		11	<ItemGroup>
		12	<PackageReference Include="WixToolset.Heat" />
		13	</ItemGroup>
10	</Project>	14	</Project>


diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj index 5ce89b64..056bf2bb 100644 --- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
@@ -7,4 +7,8 @@
7	<Transforms>ba.xslt</Transforms>	7	<Transforms>ba.xslt</Transforms>
8	</HarvestDirectory>	8	</HarvestDirectory>
9	</ItemGroup>	9	</ItemGroup>
		10
		11	<ItemGroup>
		12	<PackageReference Include="WixToolset.Heat" />
		13	</ItemGroup>
10	</Project>	14	</Project>


diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj index 82a5e3c1..855f0ef5 100644 --- a/src/ext/Bal/test/examples/examples.proj +++ b/src/ext/Bal/test/examples/examples.proj
@@ -2,8 +2,7 @@
2	<!-- 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	<!-- 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. -->
3		3
4		4
5	<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">	5	<Project Sdk="Microsoft.Build.Traversal">
6	<Import Project="..\..\Directory.Build.props" />
7		6
8	<PropertyGroup>	7	<PropertyGroup>
9	<EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>	8	<EarliestCoreMBAProjectPath>EarliestCoreMBA\Example.EarliestCoreMBA.csproj</EarliestCoreMBAProjectPath>
@@ -28,14 +27,12 @@
28	<SkipFDDx86>true</SkipFDDx86>	27	<SkipFDDx86>true</SkipFDDx86>
29	<SkipSCD>true</SkipSCD>	28	<SkipSCD>true</SkipSCD>
30	</CoreMBAProject>	29	</CoreMBAProject>
31		30
32	<FullMBAProject Include="$(FullFramework2MBAProjectPath)" />	31	<FullMBAProject Include="$(FullFramework2MBAProjectPath)" />
33	<FullMBAProject Include="$(FullFramework4MBAProjectPath)" />	32	<FullMBAProject Include="$(FullFramework4MBAProjectPath)" />
34
35	<ExampleBundleProject Include="*\.wixproj" />
36	</ItemGroup>	33	</ItemGroup>
37		34
38	<Target Name="PublishCoreExamples">	35	<Target Name="PublishCoreExamples" BeforeTargets="Build">
39	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'	36	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd-x86" -r win-x86 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
40	Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />	37	Condition="'%(CoreMBAProject.SkipFDDx86)'==''" />
41	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'	38	<Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\fdd" -r win-x64 -c $(Configuration) --self-contained false "%(CoreMBAProject.Identity)"'
@@ -46,9 +43,7 @@
46	Condition="'%(CoreMBAProject.TrimMode)'!=''" />	43	Condition="'%(CoreMBAProject.TrimMode)'!=''" />
47	</Target>	44	</Target>
48		45
49	<Target Name="Build" DependsOnTargets="PublishCoreExamples">	46	<ItemGroup>
50	<MSBuild Projects="%(ExampleBundleProject.Identity)" />	47	<ProjectReference Include="*\.wixproj" />
51	</Target>	48	</ItemGroup>
52		49	</Project>
53	<Import Project="..\..\..\..\Directory.Build.targets" />
54	</Project> \ No newline at end of file