From 126e8827de2fe7bdb881703584d5b4416a0fb549 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 9 Sep 2021 10:51:18 -0700
Subject: [PATCH] Move WixToolset to separate folder now that it supports .NET
 Standard

---
 .gitmodules                                    |  2 +-
 BurnOutSharp/BurnOutSharp.csproj               | 17 +++++++++++------
 BurnOutSharp/External/WixToolset => WixToolset |  0
 3 files changed, 12 insertions(+), 7 deletions(-)
 rename BurnOutSharp/External/WixToolset => WixToolset (100%)

diff --git a/.gitmodules b/.gitmodules
index 42eb6582..5515bb8a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -11,5 +11,5 @@
 	path = BurnOutSharp/External/stormlibsharp
 	url = https://github.com/robpaveza/stormlibsharp.git
 [submodule "BurnOutSharp/External/WixToolset"]
-	path = BurnOutSharp/External/WixToolset
+	path = WixToolset
 	url = https://github.com/wixtoolset/Dtf.git
diff --git a/BurnOutSharp/BurnOutSharp.csproj b/BurnOutSharp/BurnOutSharp.csproj
index 4ae89ae6..37d67cf7 100644
--- a/BurnOutSharp/BurnOutSharp.csproj
+++ b/BurnOutSharp/BurnOutSharp.csproj
@@ -24,6 +24,10 @@
 
   <ItemGroup>
     <PackageReference Include="SharpCompress" Version="0.28.3" />
+    <PackageReference Include="Teronis.MSBuild.Packaging.ProjectBuildInPackage" Version="0.1.7">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
     <PackageReference Include="UnshieldSharp" Version="1.6.5" />
     <PackageReference Include="WiseUnpacker" Version="1.0.2" />
   </ItemGroup>
@@ -40,12 +44,7 @@
       External\libmspack4n\lib\**\*;
       External\libmspack4n\libmspack4ntest\**\*;
       External\stormlibsharp\lib\**;
-      External\stormlibsharp\TestConsole\**;
-      External\WixToolset\src\Samples\**;
-      External\WixToolset\src\Tools\**;
-      External\WixToolset\src\WixToolset.Dtf.MSBuild\**;
-      External\WixToolset\src\WixToolset.Dtf.Resources\**;
-      External\WixToolset\src\WixToolsetTests.*\**
+      External\stormlibsharp\TestConsole\**
     </DefaultItemExcludes>
   </PropertyGroup>
 
@@ -61,4 +60,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset\src\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj">
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+  </ItemGroup>
+
 </Project>
diff --git a/BurnOutSharp/External/WixToolset b/WixToolset
similarity index 100%
rename from BurnOutSharp/External/WixToolset
rename to WixToolset