Integrate into latest v4.

8 files changed, 111 insertions, 51 deletions

diff --git a/src/wixlib/DIFxAppExtension.wixproj b/src/wixlib/DIFxAppExtension.wixproj
deleted file mode 100644
index f4a7eb74..00000000
--- a/src/wixlib/DIFxAppExtension.wixproj
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <PropertyGroup>
-    <ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid>
-    <OutputName>difxapp_$(Platform)</OutputName>
-    <OutputType>Library</OutputType>
-    <BindFiles>true</BindFiles>
-    <Pedantic>true</Pedantic>
-    <Cultures>en-us</Cultures>
-  </PropertyGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
-
-  <PropertyGroup>
-    <DefineConstants>
-      $(DefineConstants);
-      DIFxAppDll=$(ProjectDir)$(Platform)\DIFxApp.dll;
-      DIFxAppADll=$(ProjectDir)$(Platform)\DIFxAppA.dll;
-    </DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="DIFxAppExtension.wxs" />
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
-</Project>
diff --git a/src/wixlib/DIFxAppExtension.wxs b/src/wixlib/DIFxAppExtension.wxs
deleted file mode 100644
index 44b0ce2c..00000000
--- a/src/wixlib/DIFxAppExtension.wxs
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0'?>
-<!-- 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. -->
-
-
-<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
-   <Fragment Id='DIFxAppCustomActions'>
-      <InstallExecuteSequence>
-          <Custom Action='MsiProcessDrivers'   After='InstallFiles'>VersionNT &gt; 400</Custom>
-          <Custom Action='MsiCleanupOnSuccess' After='InstallFinalize'>VersionNT &gt; 400</Custom>
-      </InstallExecuteSequence>
-      
-      <Binary Id='DIFxApp.dll'  SourceFile='$(var.DIFxAppDll)'/>
-      <Binary Id='DIFxAppA.dll' SourceFile='$(var.DIFxAppADll)'/>
-
-      <CustomAction Id='MsiProcessDrivers'   BinaryKey='DIFxApp.dll'  DllEntry='ProcessDriverPackages'   SuppressModularization='yes' Execute='immediate' />
-      <CustomAction Id='MsiInstallDrivers'   BinaryKey='DIFxAppA.dll' DllEntry='InstallDriverPackages'   SuppressModularization='yes' Execute='deferred' Impersonate='no' />
-      <CustomAction Id='MsiUninstallDrivers' BinaryKey='DIFxAppA.dll' DllEntry='UninstallDriverPackages' SuppressModularization='yes' Execute='deferred' Impersonate='no' />
-      <CustomAction Id='MsiRollbackInstall'  BinaryKey='DIFxAppA.dll' DllEntry='RollbackInstall'         SuppressModularization='yes' Execute='rollback' Impersonate='no' />
-      <CustomAction Id='MsiCleanupOnSuccess' BinaryKey='DIFxApp.dll'  DllEntry='CleanupOnSuccess'        SuppressModularization='yes' Execute='immediate' />
-   </Fragment>
-</Wix>
diff --git a/src/wixlib/DifxAppExtension_Platform.wxi b/src/wixlib/DifxAppExtension_Platform.wxi
new file mode 100644
index 00000000..7583f7ea
--- /dev/null
+++ b/src/wixlib/DifxAppExtension_Platform.wxi
@@ -0,0 +1,23 @@
+<?xml version='1.0'?>
+<!-- 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 xmlns='http://wixtoolset.org/schemas/v4/wxs'>
+   <?include caSuffix.wxi ?>
+   
+   <Fragment>
+      <InstallExecuteSequence>
+          <Custom Action='MsiProcessDrivers'   After='InstallFiles'>VersionNT &gt; 400</Custom>
+          <Custom Action='MsiCleanupOnSuccess' After='InstallFinalize'>VersionNT &gt; 400</Custom>
+      </InstallExecuteSequence>
+      
+      <Binary Id='DIFxApp.dll$(var.Suffix)'  SourceFile='$(var.platform)\DIFxApp.dll'/>
+      <Binary Id='DIFxAppA.dll$(var.Suffix)' SourceFile='$(var.platform)\DIFxAppA.dll'/>
+
+      <CustomAction Id='MsiProcessDrivers$(var.Suffix)'   BinaryKey='DIFxApp.dll$(var.Suffix)'  DllEntry='ProcessDriverPackages'   SuppressModularization='yes' Execute='immediate' />
+      <CustomAction Id='MsiInstallDrivers$(var.Suffix)'   BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='InstallDriverPackages'   SuppressModularization='yes' Execute='deferred' Impersonate='no' />
+      <CustomAction Id='MsiUninstallDrivers$(var.Suffix)' BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='UninstallDriverPackages' SuppressModularization='yes' Execute='deferred' Impersonate='no' />
+      <CustomAction Id='MsiRollbackInstall$(var.Suffix)'  BinaryKey='DIFxAppA.dll$(var.Suffix)' DllEntry='RollbackInstall'         SuppressModularization='yes' Execute='rollback' Impersonate='no' />
+      <CustomAction Id='MsiCleanupOnSuccess$(var.Suffix)' BinaryKey='DIFxApp.dll$(var.Suffix)'  DllEntry='CleanupOnSuccess'        SuppressModularization='yes' Execute='immediate' />
+   </Fragment>
+</Include>
diff --git a/src/wixlib/DifxAppExtension_x64.wxs b/src/wixlib/DifxAppExtension_x64.wxs
new file mode 100644
index 00000000..3c534363
--- /dev/null
+++ b/src/wixlib/DifxAppExtension_x64.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x64 ?>
+    <?include DifxAppExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/wixlib/DifxAppExtension_x86.wxs b/src/wixlib/DifxAppExtension_x86.wxs
new file mode 100644
index 00000000..d352a272
--- /dev/null
+++ b/src/wixlib/DifxAppExtension_x86.wxs
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!-- 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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?define platform=x86 ?>
+    <?include DifxAppExtension_Platform.wxi ?>
+</Wix>
diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi
new file mode 100644
index 00000000..a56a2393
--- /dev/null
+++ b/src/wixlib/caSuffix.wxi
@@ -0,0 +1,28 @@
+<?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. -->
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+    <?ifndef platform ?>
+        <?error Required value "platform" not defined in include caSuffix.wxi ?>
+    <?endif ?>
+
+    <?ifdef Suffix ?>
+        <?undef Suffix ?>
+        <?undef DeferredSuffix ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x86" ?>
+        <?define Suffix="" ?>
+        <?define DeferredSuffix="" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="x64" ?>
+        <?define Suffix="_x64" ?>
+        <?define DeferredSuffix="_64" ?>
+    <?endif ?>
+
+    <?if $(var.platform)="arm" ?>
+        <?define Suffix="_ARM" ?>
+        <?define DeferredSuffix="_ARM" ?>
+    <?endif ?>
+</Include>
diff --git a/src/wixlib/difxapp.wixproj b/src/wixlib/difxapp.wixproj
new file mode 100644
index 00000000..9b414afd
--- /dev/null
+++ b/src/wixlib/difxapp.wixproj
@@ -0,0 +1,39 @@
+<?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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+  <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" />
+  <Import Project="..\FindLocalWix.props" />
+  <PropertyGroup>
+    <ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid>
+    <OutputName>difxapp</OutputName>
+    <OutputType>Library</OutputType>
+    <BindFiles>true</BindFiles>
+    <Pedantic>true</Pedantic>
+    <Cultures>en-us</Cultures>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="DifxAppExtension_x64.wxs" />
+    <Compile Include="DifxAppExtension_x86.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="caSuffix.wxi" />
+    <None Include="DifxAppExtension_Platform.wxi" />
+    <None Include="packages.config" />
+  </ItemGroup>
+
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
+  </Target>
+  <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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props'))" />
+  </Target>
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
new file mode 100644
index 00000000..7964daed
--- /dev/null
+++ b/src/wixlib/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
+  <package id="WixToolset.MSBuild" version="4.0.0-build-0035" developmentDependency="true" targetFramework="net40" />
+</packages>
\ No newline at end of file