diff --git a/appveyor.cmd b/appveyor.cmd
index 1e1f118..bb617d8 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -5,8 +5,17 @@
nuget restore
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140
msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141
+msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v141
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141
+
+msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142
+msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142
+msbuild -p:Configuration=%_C%;Platform=ARM;PlatformToolset=v142
+msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142
@rem msbuild -t:VSTest -p:Configuration=%_C% src\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj
diff --git a/balutil.sln b/balutil.sln
index e923cf1..9bca316 100644
--- a/balutil.sln
+++ b/balutil.sln
@@ -15,47 +15,92 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Mba.Core", "
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|ARM = Debug|ARM
+ Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
+ Release|ARM = Release|ARM
+ Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.ActiveCfg = Debug|ARM
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM.Build.0 = Debug|ARM
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|ARM64.Build.0 = Debug|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.ActiveCfg = Debug|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x64.Build.0 = Debug|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.ActiveCfg = Debug|Win32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Debug|x86.Build.0 = Debug|Win32
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.ActiveCfg = Release|ARM
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM.Build.0 = Release|ARM
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.ActiveCfg = Release|ARM64
+ {EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|ARM64.Build.0 = Release|ARM64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.ActiveCfg = Release|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x64.Build.0 = Release|x64
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.ActiveCfg = Release|Win32
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}.Release|x86.Build.0 = Release|Win32
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.ActiveCfg = Debug|ARM
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM.Build.0 = Debug|ARM
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|ARM64.Build.0 = Debug|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.ActiveCfg = Debug|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x64.Build.0 = Debug|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.ActiveCfg = Debug|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Debug|x86.Build.0 = Debug|Win32
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.ActiveCfg = Release|ARM
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM.Build.0 = Release|ARM
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.ActiveCfg = Release|ARM64
+ {06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|ARM64.Build.0 = Release|ARM64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.ActiveCfg = Release|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x64.Build.0 = Release|x64
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.ActiveCfg = Release|Win32
{06027492-1CB9-48BC-B31E-C1F9356ED07E}.Release|x86.Build.0 = Release|Win32
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM.Build.0 = Debug|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|ARM64.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x64.Build.0 = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.ActiveCfg = Debug|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Debug|x86.Build.0 = Debug|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.ActiveCfg = Release|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM.Build.0 = Release|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|ARM64.Build.0 = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x64.Build.0 = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.ActiveCfg = Release|Any CPU
{E7E1841E-A58E-4901-B9CA-4845B807D45F}.Release|x86.Build.0 = Release|Any CPU
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.ActiveCfg = Debug|ARM
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM.Build.0 = Debug|ARM
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.ActiveCfg = Debug|ARM64
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Debug|ARM64.Build.0 = Debug|ARM64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.ActiveCfg = Debug|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x64.Build.0 = Debug|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.ActiveCfg = Debug|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Debug|x86.Build.0 = Debug|Win32
- {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|Win32
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.ActiveCfg = Release|ARM
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM.Build.0 = Release|ARM
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.ActiveCfg = Release|ARM64
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|ARM64.Build.0 = Release|ARM64
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.ActiveCfg = Release|x64
+ {665E0441-17F9-4105-B202-EDF274657F6E}.Release|x64.Build.0 = Release|x64
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.ActiveCfg = Release|Win32
{665E0441-17F9-4105-B202-EDF274657F6E}.Release|x86.Build.0 = Release|Win32
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.ActiveCfg = Debug|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM.Build.0 = Debug|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|ARM64.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x64.Build.0 = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.ActiveCfg = Debug|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Debug|x86.Build.0 = Debug|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.ActiveCfg = Release|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM.Build.0 = Release|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.ActiveCfg = Release|Any CPU
+ {F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|ARM64.Build.0 = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.ActiveCfg = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x64.Build.0 = Release|Any CPU
{F54997F7-10D7-409B-B9F2-DB546490EDC0}.Release|x86.ActiveCfg = Release|Any CPU
diff --git a/src/balutil/balutil.nuspec b/src/balutil/balutil.nuspec
index e82610e..b9d8d13 100644
--- a/src/balutil/balutil.nuspec
+++ b/src/balutil/balutil.nuspec
@@ -21,6 +21,14 @@
+
+
+
+
+
+
+
+
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj
index 31f0a9f..f420791 100644
--- a/src/balutil/balutil.vcxproj
+++ b/src/balutil/balutil.vcxproj
@@ -3,13 +3,29 @@
-
+
+
+ Debug
+ ARM
+
+
+ Debug
+ ARM64
+
Debug
Win32
+
+ Release
+ ARM
+
+
+ Release
+ ARM64
+
Release
Win32
@@ -28,7 +44,7 @@
{EDCB8095-0E6A-43E0-BC33-C4F762FC5CDB}
StaticLibrary
balutil
- v141
+ v142
MultiByte
WiX Toolset Bootstrapper Application Layer native utility library
@@ -91,7 +107,7 @@
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}.
-
+
diff --git a/src/balutil/build/WixToolset.BalUtil.props b/src/balutil/build/WixToolset.BalUtil.props
index 0c92a3f..45b97f6 100644
--- a/src/balutil/build/WixToolset.BalUtil.props
+++ b/src/balutil/build/WixToolset.BalUtil.props
@@ -20,4 +20,9 @@
$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)
+
+
+ $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\balutil.lib;%(AdditionalDependencies)
+
+
diff --git a/src/balutil/packages.config b/src/balutil/packages.config
index 251df9d..be53700 100644
--- a/src/balutil/packages.config
+++ b/src/balutil/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/bextutil/bextutil.nuspec b/src/bextutil/bextutil.nuspec
index 4048861..a1276b6 100644
--- a/src/bextutil/bextutil.nuspec
+++ b/src/bextutil/bextutil.nuspec
@@ -21,6 +21,14 @@
+
+
+
+
+
+
+
+
diff --git a/src/bextutil/bextutil.vcxproj b/src/bextutil/bextutil.vcxproj
index d6fa381..b4aee2c 100644
--- a/src/bextutil/bextutil.vcxproj
+++ b/src/bextutil/bextutil.vcxproj
@@ -3,13 +3,29 @@
-
+
+
+ Debug
+ ARM
+
+
+ Debug
+ ARM64
+
Debug
Win32
+
+ Release
+ ARM
+
+
+ Release
+ ARM64
+
Release
Win32
@@ -28,7 +44,7 @@
{06027492-1CB9-48BC-B31E-C1F9356ED07E}
StaticLibrary
bextutil
- v141
+ v142
MultiByte
WiX Toolset Bundle Extension native utility library
@@ -80,7 +96,7 @@
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}.
-
+
diff --git a/src/bextutil/build/WixToolset.BextUtil.props b/src/bextutil/build/WixToolset.BextUtil.props
index 3e2980e..60a2db5 100644
--- a/src/bextutil/build/WixToolset.BextUtil.props
+++ b/src/bextutil/build/WixToolset.BextUtil.props
@@ -20,4 +20,9 @@
$(MSBuildThisFileDirectory)native\v141\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)
+
+
+ $(MSBuildThisFileDirectory)native\v142\$(PlatformTarget)\bextutil.lib;%(AdditionalDependencies)
+
+
diff --git a/src/bextutil/packages.config b/src/bextutil/packages.config
index 251df9d..be53700 100644
--- a/src/bextutil/packages.config
+++ b/src/bextutil/packages.config
@@ -2,5 +2,5 @@
-
+
\ No newline at end of file
diff --git a/src/mbanative/mbanative.vcxproj b/src/mbanative/mbanative.vcxproj
index 0a740a9..29842a9 100644
--- a/src/mbanative/mbanative.vcxproj
+++ b/src/mbanative/mbanative.vcxproj
@@ -3,13 +3,29 @@
-
+
+
+ Debug
+ ARM
+
+
+ Debug
+ ARM64
+
Debug
Win32
+
+ Release
+ ARM
+
+
+ Release
+ ARM64
+
Release
Win32
@@ -27,7 +43,7 @@
{665E0441-17F9-4105-B202-EDF274657F6E}
DynamicLibrary
- v141
+ v142
Unicode
mbanative
mbanative.def
@@ -78,7 +94,7 @@
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}.
-
+
diff --git a/src/mbanative/packages.config b/src/mbanative/packages.config
index 251df9d..be53700 100644
--- a/src/mbanative/packages.config
+++ b/src/mbanative/packages.config
@@ -2,5 +2,5 @@
-
+
\ 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 a854609..c95531d 100644
--- a/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
+++ b/src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec
@@ -13,7 +13,13 @@
-
-
+
+
+
+
+
+
+
+
diff --git a/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 8691f89..34a51a0 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 @@
win-x86
-
- NU1701
-
-
{665E0441-17F9-4105-B202-EDF274657F6E}