aboutsummaryrefslogtreecommitdiff
path: root/src/engine
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-07-18 16:48:54 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-07-18 16:50:49 +1000
commit655a166adbd56ea7036b2001258ede77f58baee0 (patch)
treea8815533c850f8f8f04fee40c7a9e7ef18592dc7 /src/engine
parent6d763d9c86405644cc72530ad64978efd6ba5828 (diff)
downloadwix-655a166adbd56ea7036b2001258ede77f58baee0.tar.gz
wix-655a166adbd56ea7036b2001258ede77f58baee0.tar.bz2
wix-655a166adbd56ea7036b2001258ede77f58baee0.zip
Move Burn headers from BootstrapperCore repo.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/engine.vcxproj10
-rw-r--r--src/engine/packages.config1
-rw-r--r--src/engine/precomp.h8
3 files changed, 8 insertions, 11 deletions
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 @@
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<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <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')" />
6 <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" /> 5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.45\build\WixToolset.DUtil.props')" />
7 6
8 <ItemGroup Label="ProjectConfigurations"> 7 <ItemGroup Label="ProjectConfigurations">
@@ -42,10 +41,6 @@
42 <ImportGroup Label="Shared"> 41 <ImportGroup Label="Shared">
43 </ImportGroup> 42 </ImportGroup>
44 43
45 <PropertyGroup>
46 <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories>
47 </PropertyGroup>
48
49 <ItemGroup> 44 <ItemGroup>
50 <ClCompile Include="apply.cpp" /> 45 <ClCompile Include="apply.cpp" />
51 <ClCompile Include="approvedexe.cpp" /> 46 <ClCompile Include="approvedexe.cpp" />
@@ -96,6 +91,10 @@
96 <ClInclude Include="apply.h" /> 91 <ClInclude Include="apply.h" />
97 <ClInclude Include="approvedexe.h" /> 92 <ClInclude Include="approvedexe.h" />
98 <ClInclude Include="bitsengine.h" /> 93 <ClInclude Include="bitsengine.h" />
94 <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h" />
95 <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h" />
96 <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h" />
97 <ClInclude Include="..\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h" />
99 <ClInclude Include="burnextension.h" /> 98 <ClInclude Include="burnextension.h" />
100 <ClInclude Include="cabextract.h" /> 99 <ClInclude Include="cabextract.h" />
101 <ClInclude Include="cache.h" /> 100 <ClInclude Include="cache.h" />
@@ -166,7 +165,6 @@ rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
166 <PropertyGroup> 165 <PropertyGroup>
167 <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> 166 <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>
168 </PropertyGroup> 167 </PropertyGroup>
169 <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'))" />
170 <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'))" /> 168 <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'))" />
171 <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'))" /> 169 <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'))" />
172 </Target> 170 </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 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<packages> 2<packages>
3 <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="3.1.91" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
5 <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" /> 4 <package id="WixToolset.DUtil" version="4.0.45" targetFramework="native" />
6</packages> \ No newline at end of file 5</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 @@
61#include <atomutil.h> 61#include <atomutil.h>
62#include <apuputil.h> 62#include <apuputil.h>
63 63
64#include "BootstrapperEngine.h" 64#include "..\WixToolset.BootstrapperCore.Native\inc\BootstrapperEngine.h"
65#include "BootstrapperApplication.h" 65#include "..\WixToolset.BootstrapperCore.Native\inc\BootstrapperApplication.h"
66#include "BundleExtensionEngine.h" 66#include "..\WixToolset.BootstrapperCore.Native\inc\BundleExtensionEngine.h"
67#include "BundleExtension.h" 67#include "..\WixToolset.BootstrapperCore.Native\inc\BundleExtension.h"
68 68
69#include "platform.h" 69#include "platform.h"
70#include "variant.h" 70#include "variant.h"