From 655a166adbd56ea7036b2001258ede77f58baee0 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 18 Jul 2020 16:48:54 +1000
Subject: Move Burn headers from BootstrapperCore repo.

---
 src/engine/engine.vcxproj  | 10 ++++------
 src/engine/packages.config |  1 -
 src/engine/precomp.h       |  8 ++++----
 3 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'src/engine')

diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index 6d064a43..906792a6 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -2,7 +2,6 @@
 <!-- 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 DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" />
   <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
@@ -42,10 +41,6 @@
   <ImportGroup Label="Shared">
   </ImportGroup>
 
-  <PropertyGroup>
-    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories>
-  </PropertyGroup>
-
   <ItemGroup>
     <ClCompile Include="apply.cpp" />
     <ClCompile Include="approvedexe.cpp" />
@@ -96,6 +91,10 @@
     <ClInclude Include="apply.h" />
     <ClInclude Include="approvedexe.h" />
     <ClInclude Include="bitsengine.h" />
+    <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" />
+    <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" />
+    <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" />
+    <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" />
     <ClInclude Include="burnextension.h" />
     <ClInclude Include="cabextract.h" />
     <ClInclude Include="cache.h" />
@@ -166,7 +165,6 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" />
     <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props'))" />
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.1.91\build\Nerdbank.GitVersioning.targets'))" />
   </Target>
diff --git a/src/engine/packages.config b/src/engine/packages.config
index 98db4ce4..04a6553e 100644
--- a/src/engine/packages.config
+++ b/src/engine/packages.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
   <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/engine/precomp.h b/src/engine/precomp.h
index 04dfa50e..c60d7c0e 100644
--- a/src/engine/precomp.h
+++ b/src/engine/precomp.h
@@ -61,10 +61,10 @@
 #include <atomutil.h>
 #include <apuputil.h>
 
-#include "BootstrapperEngine.h"
-#include "BootstrapperApplication.h"
-#include "BundleExtensionEngine.h"
-#include "BundleExtension.h"
+#include "..\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h"
+#include "..\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h"
+#include "..\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h"
+#include "..\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h"
 
 #include "platform.h"
 #include "variant.h"
-- 
cgit v1.2.3-55-g6feb