diff options
author | Bob Arnson <bob@firegiant.com> | 2020-09-19 21:03:36 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-09-19 21:07:05 -0400 |
commit | 665654b4f553c567b11aab3b4d65635b083a5a9e (patch) | |
tree | 89015e815215f655e7e427b80dc7307374d673f8 | |
parent | 95d029b5b7fac931149f1fafdd2b12ad09fe3146 (diff) | |
download | wix-665654b4f553c567b11aab3b4d65635b083a5a9e.tar.gz wix-665654b4f553c567b11aab3b4d65635b083a5a9e.tar.bz2 wix-665654b4f553c567b11aab3b4d65635b083a5a9e.zip |
Remove 32-bit ARM support.
-rw-r--r-- | appveyor.cmd | 2 | ||||
-rw-r--r-- | src/wcautil/wcautil.nuspec | 2 | ||||
-rw-r--r-- | src/wcautil/wcautil.vcxproj | 8 |
3 files changed, 0 insertions, 12 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index c1d4dbfe..a2596256 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
@@ -8,12 +8,10 @@ msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b | |||
8 | 8 | ||
9 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b | 9 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b |
10 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b | 10 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b |
11 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141 || exit /b | ||
12 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b | 11 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b |
13 | 12 | ||
14 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b | 13 | msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b |
15 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b | 14 | msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b |
16 | msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142 || exit /b | ||
17 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b | 15 | msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b |
18 | 16 | ||
19 | msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj || exit /b | 17 | msbuild -p:Configuration=Release -t:PackNativeNuget src\wcautil\wcautil.vcxproj || exit /b |
diff --git a/src/wcautil/wcautil.nuspec b/src/wcautil/wcautil.nuspec index b2786a00..a57a5749 100644 --- a/src/wcautil/wcautil.nuspec +++ b/src/wcautil/wcautil.nuspec | |||
@@ -22,11 +22,9 @@ | |||
22 | <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> | 22 | <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" /> |
23 | <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> | 23 | <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" /> |
24 | <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> | 24 | <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" /> |
25 | <file src="..\..\build\$configuration$\v141\ARM\wcautil.lib" target="build\native\v141\ARM" /> | ||
26 | <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> | 25 | <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" /> |
27 | <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> | 26 | <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" /> |
28 | <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> | 27 | <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" /> |
29 | <file src="..\..\build\$configuration$\v142\ARM\wcautil.lib" target="build\native\v142\ARM" /> | ||
30 | <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> | 28 | <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" /> |
31 | </files> | 29 | </files> |
32 | </package> | 30 | </package> |
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index 2c4f9062..27ed9ac7 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
@@ -3,10 +3,6 @@ | |||
3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
5 | <ItemGroup Label="ProjectConfigurations"> | 5 | <ItemGroup Label="ProjectConfigurations"> |
6 | <ProjectConfiguration Include="Debug|ARM"> | ||
7 | <Configuration>Debug</Configuration> | ||
8 | <Platform>ARM</Platform> | ||
9 | </ProjectConfiguration> | ||
10 | <ProjectConfiguration Include="Debug|ARM64"> | 6 | <ProjectConfiguration Include="Debug|ARM64"> |
11 | <Configuration>Debug</Configuration> | 7 | <Configuration>Debug</Configuration> |
12 | <Platform>ARM64</Platform> | 8 | <Platform>ARM64</Platform> |
@@ -19,10 +15,6 @@ | |||
19 | <Configuration>Debug</Configuration> | 15 | <Configuration>Debug</Configuration> |
20 | <Platform>Win32</Platform> | 16 | <Platform>Win32</Platform> |
21 | </ProjectConfiguration> | 17 | </ProjectConfiguration> |
22 | <ProjectConfiguration Include="Release|ARM"> | ||
23 | <Configuration>Release</Configuration> | ||
24 | <Platform>ARM</Platform> | ||
25 | </ProjectConfiguration> | ||
26 | <ProjectConfiguration Include="Release|ARM64"> | 18 | <ProjectConfiguration Include="Release|ARM64"> |
27 | <Configuration>Release</Configuration> | 19 | <Configuration>Release</Configuration> |
28 | <Platform>ARM64</Platform> | 20 | <Platform>ARM64</Platform> |