Integrate into latest v4

6 files changed, 190 insertions, 2 deletions

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
index 3c0f09c9..190c327f 100644
--- a/src/engine/engine.cpp
+++ b/src/engine/engine.cpp
@@ -144,6 +144,7 @@ extern "C" HRESULT EngineRun(
     fXmlInitialized = TRUE;
 
     ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
+    #pragma warning(suppress: 4996)
     if (!::GetVersionExW((LPOSVERSIONINFOW)&ovix))
     {
         ExitWithLastError(hr, "Failed to get OS info.");
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
new file mode 100644
index 00000000..169c47fa
--- /dev/null
+++ b/src/engine/engine.vcxproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.4.0.1\build\WixToolset.BootstrapperCore.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8119537D-E1D9-6591-D51A-49768A2F9C37}</ProjectGuid>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <TargetName>engine</TargetName>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <Description>Native component of WixToolset.Burn</Description>
+  </PropertyGroup>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>$(ProjectDir)..\inc</ProjectAdditionalIncludeDirectories>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ClCompile Include="apply.cpp" />
+    <ClCompile Include="approvedexe.cpp" />
+    <ClCompile Include="bitsengine.cpp" />
+    <ClCompile Include="catalog.cpp" />
+    <ClCompile Include="detect.cpp" />
+    <ClCompile Include="embedded.cpp" />
+    <ClCompile Include="EngineForApplication.cpp" />
+    <ClCompile Include="cabextract.cpp" />
+    <ClCompile Include="cache.cpp" />
+    <ClCompile Include="condition.cpp" />
+    <ClCompile Include="container.cpp" />
+    <ClCompile Include="core.cpp" />
+    <ClCompile Include="dependency.cpp" />
+    <ClCompile Include="elevation.cpp" />
+    <ClCompile Include="engine.cpp" />
+    <ClCompile Include="exeengine.cpp" />
+    <ClCompile Include="logging.cpp" />
+    <ClCompile Include="manifest.cpp" />
+    <ClCompile Include="msiengine.cpp" />
+    <ClCompile Include="mspengine.cpp" />
+    <ClCompile Include="msuengine.cpp" />
+    <ClCompile Include="NetFxChainer.cpp" />
+    <ClCompile Include="package.cpp" />
+    <ClCompile Include="payload.cpp" />
+    <ClCompile Include="pipe.cpp" />
+    <ClCompile Include="plan.cpp" />
+    <ClCompile Include="platform.cpp" />
+    <ClCompile Include="precomp.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="pseudobundle.cpp" />
+    <ClCompile Include="registration.cpp" />
+    <ClCompile Include="relatedbundle.cpp" />
+    <ClCompile Include="search.cpp" />
+    <ClCompile Include="section.cpp" />
+    <ClCompile Include="splashscreen.cpp" />
+    <ClCompile Include="uithread.cpp" />
+    <ClCompile Include="update.cpp" />
+    <ClCompile Include="userexperience.cpp" />
+    <ClCompile Include="variable.cpp" />
+    <ClCompile Include="variant.cpp" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="..\inc\BootstrapperApplication.h" />
+    <ClInclude Include="..\inc\BootstrapperEngine.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ClInclude Include="apply.h" />
+    <ClInclude Include="approvedexe.h" />
+    <ClInclude Include="bitsengine.h" />
+    <ClInclude Include="cabextract.h" />
+    <ClInclude Include="cache.h" />
+    <ClInclude Include="catalog.h" />
+    <ClInclude Include="condition.h" />
+    <ClInclude Include="container.h" />
+    <ClInclude Include="core.h" />
+    <ClInclude Include="dependency.h" />
+    <ClInclude Include="detect.h" />
+    <ClInclude Include="elevation.h" />
+    <ClInclude Include="embedded.h" />
+    <ClInclude Include="EngineForApplication.h" />
+    <ClInclude Include="exeengine.h" />
+    <ClInclude Include="inc\engine.h" />
+    <ClInclude Include="logging.h" />
+    <ClInclude Include="manifest.h" />
+    <ClInclude Include="msiengine.h" />
+    <ClInclude Include="mspengine.h" />
+    <ClInclude Include="msuengine.h" />
+    <ClInclude Include="netfxchainer.h" />
+    <ClInclude Include="package.h" />
+    <ClInclude Include="payload.h" />
+    <ClInclude Include="pipe.h" />
+    <ClInclude Include="plan.h" />
+    <ClInclude Include="platform.h" />
+    <ClInclude Include="precomp.h" />
+    <ClInclude Include="pseudobundle.h" />
+    <ClInclude Include="registration.h" />
+    <ClInclude Include="relatedbundle.h" />
+    <ClInclude Include="search.h" />
+    <ClInclude Include="section.h" />
+    <ClInclude Include="splashscreen.h" />
+    <ClInclude Include="uithread.h" />
+    <ClInclude Include="update.h" />
+    <ClInclude Include="userexperience.h" />
+    <ClInclude Include="variable.h" />
+    <ClInclude Include="variant.h" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <CustomBuild Include="engine.mc">
+      <Message>Compiling message file...</Message>
+      <Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc"
+rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
+      <Outputs>$(IntDir)engine.messages.h;$(OutDir)engine.messages.rc</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+
+  <Target Name="SetWixVersion"
+          DependsOnTargets="GetBuildVersion"
+          BeforeTargets="ClCompile">
+    <ItemGroup>
+      <ClCompile>
+        <!-- TODO: get rmj and rmm dynamically -->
+        <PreprocessorDefinitions>rmj=4;rmm=0;rup=$(BuildNumber);szVerMajorMinorBuild="$(BuildVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
+
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <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.4.0.1\build\WixToolset.BootstrapperCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.4.0.1\build\WixToolset.BootstrapperCore.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.13\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+</Project>
diff --git a/src/engine/packages.config b/src/engine/packages.config
new file mode 100644
index 00000000..52c84cf0
--- /dev/null
+++ b/src/engine/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
+  <package id="WixToolset.BootstrapperCore" version="4.0.1" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.13" targetFramework="native" />
+</packages>
\ No newline at end of file
diff --git a/src/engine/precomp.cpp b/src/engine/precomp.cpp
new file mode 100644
index 00000000..37664a1c
--- /dev/null
+++ b/src/engine/precomp.cpp
@@ -0,0 +1,3 @@
+// 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.
+
+#include "precomp.h"
diff --git a/src/engine/precomp.h b/src/engine/precomp.h
index d3ebe354..477dc310 100644
--- a/src/engine/precomp.h
+++ b/src/engine/precomp.h
@@ -4,12 +4,15 @@
 
 #define ExitTrace LogErrorString
 
-#include <wixver.h>
-
 #include <windows.h>
 #include <aclapi.h>
 #include <Bits.h>
+
+#pragma warning(push)
+#pragma warning(disable:4458) // declaration of 'xxx' hides class member
 #include <gdiplus.h>
+#pragma warning(pop)
+
 #include <math.h>
 #include <msiquery.h>
 #include <sddl.h>
diff --git a/src/engine/variable.cpp b/src/engine/variable.cpp
index ed4abea2..7377b116 100644
--- a/src/engine/variable.cpp
+++ b/src/engine/variable.cpp
@@ -1698,6 +1698,7 @@ static HRESULT InitializeVariableOsInfo(
     BURN_VARIANT value = { };
 
     ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
+    #pragma warning(suppress: 4996)
     if (!::GetVersionExW((LPOSVERSIONINFOW)&ovix))
     {
         ExitWithLastError(hr, "Failed to get OS info.");