From a627ca9b720047e633a8fe72003ab9bee31006c5 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 26 Jul 2022 17:20:39 -0700
Subject: 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
---
 .../EarliestCoreBundleSCD.wixproj                     |  4 ++++
 .../EarliestCoreBundleTrimmedSCD.wixproj              |  4 ++++
 .../LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj   |  4 ++++
 .../LatestCoreBundleTrimmedSCD.wixproj                |  4 ++++
 src/ext/Bal/test/examples/examples.proj               | 19 +++++++------------
 5 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'src/ext/Bal/test/examples')

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">  
-  <Import Project="..\..\Directory.Build.props" />
+<Project Sdk="Microsoft.Build.Traversal">
 
   <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">
-    <MSBuild Projects="%(ExampleBundleProject.Identity)" />
-  </Target>
-  
-  <Import Project="..\..\..\..\Directory.Build.targets" />
-</Project>
\ No newline at end of file
+  <ItemGroup>
+    <ProjectReference Include="**\*.wixproj" />
+  </ItemGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb