From 1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Thu, 18 Jun 2020 21:58:51 +1000
Subject: Add v142, x64, ARM, and ARM64.

---
 src/balutil/balutil.nuspec                         |  8 ++++++++
 src/balutil/balutil.vcxproj                        | 22 +++++++++++++++++++---
 src/balutil/build/WixToolset.BalUtil.props         |  5 +++++
 src/balutil/packages.config                        |  2 +-
 src/bextutil/bextutil.nuspec                       |  8 ++++++++
 src/bextutil/bextutil.vcxproj                      | 22 +++++++++++++++++++---
 src/bextutil/build/WixToolset.BextUtil.props       |  5 +++++
 src/bextutil/packages.config                       |  2 +-
 src/mbanative/mbanative.vcxproj                    | 22 +++++++++++++++++++---
 src/mbanative/packages.config                      |  2 +-
 .../runtime.win.WixToolset.Mba.Core.nuspec         | 10 ++++++++--
 .../WixToolsetTest.Mba.Core.csproj                 |  4 ----
 12 files changed, 94 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index e82610e3..b9d8d139 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -21,6 +21,14 @@
     <file src="build\$id$.props" target="build\" />
     <file src="inc\*" target="build\native\include" />
     <file src="..\..\build\$configuration$\v140\x86\balutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v140\x64\balutil.lib" target="build\native\v140\x64" />
     <file src="..\..\build\$configuration$\v141\x86\balutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\x64\balutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141\ARM\balutil.lib" target="build\native\v141\ARM" />
+    <file src="..\..\build\$configuration$\v141\ARM64\balutil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\build\$configuration$\v142\x86\balutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\build\$configuration$\v142\x64\balutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\build\$configuration$\v142\ARM\balutil.lib" target="build\native\v142\ARM" />
+    <file src="..\..\build\$configuration$\v142\ARM64\balutil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 31f0a9f7..f4207910 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -3,13 +3,29 @@
 
 <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.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -28,7 +44,7 @@
     <ProjectGuid>{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <TargetName>balutil</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Bootstrapper Application Layer native utility library</Description>
   </PropertyGroup>
@@ -91,7 +107,7 @@
       <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.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\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/balutil/build/WixToolset.BalUtil.props b/src/balutil/build/WixToolset.BalUtil.props
index 0c92a3fb..45b97f6a 100644
--- a/src/balutil/build/WixToolset.BalUtil.props
+++ b/src/balutil/build/WixToolset.BalUtil.props
@@ -20,4 +20,9 @@
       <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 251df9d0..be537005 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/bextutil/bextutil.nuspec b/src/bextutil/bextutil.nuspec
index 40488610..a1276b6f 100644
--- a/src/bextutil/bextutil.nuspec
+++ b/src/bextutil/bextutil.nuspec
@@ -21,6 +21,14 @@
     <file src="build\$id$.props" target="build\" />
     <file src="inc\*" target="build\native\include" />
     <file src="..\..\build\$configuration$\v140\x86\bextutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\build\$configuration$\v140\x64\bextutil.lib" target="build\native\v140\x64" />
     <file src="..\..\build\$configuration$\v141\x86\bextutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\build\$configuration$\v141\x64\bextutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\build\$configuration$\v141\ARM\bextutil.lib" target="build\native\v141\ARM" />
+    <file src="..\..\build\$configuration$\v141\ARM64\bextutil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\build\$configuration$\v142\x86\bextutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\build\$configuration$\v142\x64\bextutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\build\$configuration$\v142\ARM\bextutil.lib" target="build\native\v142\ARM" />
+    <file src="..\..\build\$configuration$\v142\ARM64\bextutil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj
index d6fa3816..b4aee2c7 100644
--- a/src/bextutil/bextutil.vcxproj
+++ b/src/bextutil/bextutil.vcxproj
@@ -3,13 +3,29 @@
 
 <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.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -28,7 +44,7 @@
     <ProjectGuid>{06027492-1CB9-48BC-B31E-C1F9356ED07E}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <TargetName>bextutil</TargetName>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Bundle Extension native utility library</Description>
   </PropertyGroup>
@@ -80,7 +96,7 @@
       <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.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\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/bextutil/build/WixToolset.BextUtil.props b/src/bextutil/build/WixToolset.BextUtil.props
index 3e2980ec..60a2db54 100644
--- a/src/bextutil/build/WixToolset.BextUtil.props
+++ b/src/bextutil/build/WixToolset.BextUtil.props
@@ -20,4 +20,9 @@
       <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" $(PlatformToolset.ToLower().StartsWith('v142')) ">
+    <Link>
+      <AdditionalDependencies>$(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config
index 251df9d0..be537005 100644
--- a/src/bextutil/packages.config
+++ b/src/bextutil/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 0a740a9f..29842a9b 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -3,13 +3,29 @@
 
 <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.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" />
 
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -27,7 +43,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <TargetName>mbanative</TargetName>
     <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile>
@@ -78,7 +94,7 @@
       <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.23\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.28\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/mbanative/packages.config b/src/mbanative/packages.config
index 251df9d0..be537005 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" />
   <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" />
 </packages>
\ No newline at end of file
diff --git a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
index a8546092..c95531da 100644
--- a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
+++ b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
@@ -13,7 +13,13 @@
   </metadata>
 
   <files>
-    <file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" />
-    <file src="v141\x86\mbanative.pdb" target="runtimes\win-x86\native" />
+    <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" />
+    <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" />
+    <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" />
+    <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" />
+    <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" />
+    <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" />
+    <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
+    <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" />
   </files>
 </package>
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 8691f89f..34a51a05 100644
--- a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -8,10 +8,6 @@
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\mbanative\mbanative.vcxproj">
       <Project>{665E0441-17F9-4105-B202-EDF274657F6E}</Project>
-- 
cgit v1.2.3-55-g6feb