aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-09-19 21:01:10 -0400
committerGitHub <noreply@github.com>2020-09-19 21:01:10 -0400
commite8b32195c04a62ffd636ed260a3c28f0cd8f87b3 (patch)
tree73352415e147c90fe73f0ad9416a878d9042c6ab
parent8a2fa05b14244f179d9bb127c6cb23c72d3bf2ae (diff)
parentf4fdd3cd0c797e16b8edd995c58da29aacfa0d84 (diff)
downloadwix-e8b32195c04a62ffd636ed260a3c28f0cd8f87b3.tar.gz
wix-e8b32195c04a62ffd636ed260a3c28f0cd8f87b3.tar.bz2
wix-e8b32195c04a62ffd636ed260a3c28f0cd8f87b3.zip
Merge pull request #19 from wixtoolset/bob/armandnoleg
Remove 32-bit ARM support.
-rw-r--r--appveyor.cmd2
-rw-r--r--src/dutil/dutil.nuspec2
-rw-r--r--src/dutil/dutil.vcxproj8
3 files changed, 0 insertions, 12 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index c54f9161..54199392 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -8,12 +8,10 @@ msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v140 || exit /b
8 8
9msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b 9msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v141 || exit /b
10msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b 10msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v141 || exit /b
11msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v141 || exit /b
12msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b 11msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v141 || exit /b
13 12
14msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b 13msbuild -p:Configuration=Release;Platform=x86;PlatformToolset=v142 || exit /b
15msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b 14msbuild -p:Configuration=Release;Platform=x64;PlatformToolset=v142 || exit /b
16msbuild -p:Configuration=Release;Platform=ARM;PlatformToolset=v142 || exit /b
17msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b 15msbuild -p:Configuration=Release;Platform=ARM64;PlatformToolset=v142 || exit /b
18 16
19msbuild -p:Configuration=Release -t:PackNativeNuget src\dutil\dutil.vcxproj || exit /b 17msbuild -p:Configuration=Release -t:PackNativeNuget src\dutil\dutil.vcxproj || exit /b
diff --git a/src/dutil/dutil.nuspec b/src/dutil/dutil.nuspec
index 45ac64f0..3499a2d5 100644
--- a/src/dutil/dutil.nuspec
+++ b/src/dutil/dutil.nuspec
@@ -19,11 +19,9 @@
19 <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" /> 19 <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" />
20 <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" /> 20 <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" />
21 <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" /> 21 <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" />
22 <file src="..\..\build\$configuration$\v141\ARM\dutil.lib" target="build\native\v141\ARM" />
23 <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" /> 22 <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
24 <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" /> 23 <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
25 <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" /> 24 <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
26 <file src="..\..\build\$configuration$\v142\ARM\dutil.lib" target="build\native\v142\ARM" />
27 <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" /> 25 <file src="..\..\build\$configuration$\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
28 </files> 26 </files>
29</package> 27</package>
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index 4dbd2e6b..e9bbb98b 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -3,10 +3,6 @@
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 <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>
@@ -15,10 +11,6 @@
15 <Configuration>Debug</Configuration> 11 <Configuration>Debug</Configuration>
16 <Platform>Win32</Platform> 12 <Platform>Win32</Platform>
17 </ProjectConfiguration> 13 </ProjectConfiguration>
18 <ProjectConfiguration Include="Release|ARM">
19 <Configuration>Release</Configuration>
20 <Platform>ARM</Platform>
21 </ProjectConfiguration>
22 <ProjectConfiguration Include="Release|ARM64"> 14 <ProjectConfiguration Include="Release|ARM64">
23 <Configuration>Release</Configuration> 15 <Configuration>Release</Configuration>
24 <Platform>ARM64</Platform> 16 <Platform>ARM64</Platform>