diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 21:58:51 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-18 22:08:12 +1000 |
commit | 1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8 (patch) | |
tree | 97702e3c53055554a60a009e37de2dd21b3fa479 /src/mbanative | |
parent | b7ee8f1eaa4e67b3eeba426b4bc528b35042dbea (diff) | |
download | wix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.tar.gz wix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.tar.bz2 wix-1571b2e9a0dc0925e8d4bfacc19d7acd29068ff8.zip |
Add v142, x64, ARM, and ARM64.
Diffstat (limited to 'src/mbanative')
-rw-r--r-- | src/mbanative/mbanative.vcxproj | 22 | ||||
-rw-r--r-- | src/mbanative/packages.config | 2 | ||||
-rw-r--r-- | src/mbanative/runtime.win.WixToolset.Mba.Core.nuspec | 10 |
3 files changed, 28 insertions, 6 deletions
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 @@ | |||
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')" /> | 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.23\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.23\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.28\build\WixToolset.DUtil.props')" /> |
7 | 7 | ||
8 | <ItemGroup Label="ProjectConfigurations"> | 8 | <ItemGroup Label="ProjectConfigurations"> |
9 | <ProjectConfiguration Include="Debug|ARM"> | ||
10 | <Configuration>Debug</Configuration> | ||
11 | <Platform>ARM</Platform> | ||
12 | </ProjectConfiguration> | ||
13 | <ProjectConfiguration Include="Debug|ARM64"> | ||
14 | <Configuration>Debug</Configuration> | ||
15 | <Platform>ARM64</Platform> | ||
16 | </ProjectConfiguration> | ||
9 | <ProjectConfiguration Include="Debug|Win32"> | 17 | <ProjectConfiguration Include="Debug|Win32"> |
10 | <Configuration>Debug</Configuration> | 18 | <Configuration>Debug</Configuration> |
11 | <Platform>Win32</Platform> | 19 | <Platform>Win32</Platform> |
12 | </ProjectConfiguration> | 20 | </ProjectConfiguration> |
21 | <ProjectConfiguration Include="Release|ARM"> | ||
22 | <Configuration>Release</Configuration> | ||
23 | <Platform>ARM</Platform> | ||
24 | </ProjectConfiguration> | ||
25 | <ProjectConfiguration Include="Release|ARM64"> | ||
26 | <Configuration>Release</Configuration> | ||
27 | <Platform>ARM64</Platform> | ||
28 | </ProjectConfiguration> | ||
13 | <ProjectConfiguration Include="Release|Win32"> | 29 | <ProjectConfiguration Include="Release|Win32"> |
14 | <Configuration>Release</Configuration> | 30 | <Configuration>Release</Configuration> |
15 | <Platform>Win32</Platform> | 31 | <Platform>Win32</Platform> |
@@ -27,7 +43,7 @@ | |||
27 | <PropertyGroup Label="Globals"> | 43 | <PropertyGroup Label="Globals"> |
28 | <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid> | 44 | <ProjectGuid>{665E0441-17F9-4105-B202-EDF274657F6E}</ProjectGuid> |
29 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 45 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
30 | <PlatformToolset>v141</PlatformToolset> | 46 | <PlatformToolset>v142</PlatformToolset> |
31 | <CharacterSet>Unicode</CharacterSet> | 47 | <CharacterSet>Unicode</CharacterSet> |
32 | <TargetName>mbanative</TargetName> | 48 | <TargetName>mbanative</TargetName> |
33 | <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile> | 49 | <ProjectModuleDefinitionFile>mbanative.def</ProjectModuleDefinitionFile> |
@@ -78,7 +94,7 @@ | |||
78 | <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> | 94 | <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> |
79 | </PropertyGroup> | 95 | </PropertyGroup> |
80 | <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'))" /> | 96 | <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'))" /> |
81 | <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'))" /> | 97 | <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'))" /> |
82 | <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'))" /> | 98 | <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'))" /> |
83 | </Target> | 99 | </Target> |
84 | </Project> | 100 | </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 @@ | |||
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.23" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.28" targetFramework="native" /> |
6 | </packages> \ No newline at end of file | 6 | </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 @@ | |||
13 | </metadata> | 13 | </metadata> |
14 | 14 | ||
15 | <files> | 15 | <files> |
16 | <file src="v141\x86\mbanative.dll" target="runtimes\win-x86\native" /> | 16 | <file src="v142\x86\mbanative.dll" target="runtimes\win-x86\native" /> |
17 | <file src="v141\x86\mbanative.pdb" target="runtimes\win-x86\native" /> | 17 | <file src="v142\x86\mbanative.pdb" target="runtimes\win-x86\native" /> |
18 | <file src="v142\x64\mbanative.dll" target="runtimes\win-x64\native" /> | ||
19 | <file src="v142\x64\mbanative.pdb" target="runtimes\win-x64\native" /> | ||
20 | <file src="v142\ARM\mbanative.dll" target="runtimes\win-arm\native" /> | ||
21 | <file src="v142\ARM\mbanative.pdb" target="runtimes\win-arm\native" /> | ||
22 | <file src="v142\ARM64\mbanative.dll" target="runtimes\win-arm64\native" /> | ||
23 | <file src="v142\ARM64\mbanative.pdb" target="runtimes\win-arm64\native" /> | ||
18 | </files> | 24 | </files> |
19 | </package> | 25 | </package> |