diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-19 21:08:49 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-19 21:11:39 -0400 |
| commit | 61d04cad656e47a185575af7b19bc02412f3b606 (patch) | |
| tree | 10373cef36f947ac6dbe05da119e0f5bc9990ace | |
| parent | 1132e3c15314d3921a796464f07fe1398c1a05ec (diff) | |
| download | wix-61d04cad656e47a185575af7b19bc02412f3b606.tar.gz wix-61d04cad656e47a185575af7b19bc02412f3b606.tar.bz2 wix-61d04cad656e47a185575af7b19bc02412f3b606.zip | |
Remove 32-bit ARM support.
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 4 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 3 | ||||
| -rw-r--r-- | src/winterop/winterop.vcxproj | 8 | ||||
| -rw-r--r-- | src/wixnative/wixnative.vcxproj | 8 |
4 files changed, 0 insertions, 23 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj index ab7c4020..f12d674c 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | |||
| @@ -11,10 +11,6 @@ | |||
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | 12 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> |
| 13 | <PrivateAssets>All</PrivateAssets> | 13 | <PrivateAssets>All</PrivateAssets> |
| 14 | <Properties>Platform=ARM</Properties> | ||
| 15 | </ProjectReference> | ||
| 16 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | ||
| 17 | <PrivateAssets>All</PrivateAssets> | ||
| 18 | <Properties>Platform=ARM64</Properties> | 14 | <Properties>Platform=ARM64</Properties> |
| 19 | </ProjectReference> | 15 | </ProjectReference> |
| 20 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> | 16 | <ProjectReference Include="..\wixnative\wixnative.vcxproj"> |
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index 2e4b491c..0ec4747d 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | |||
| @@ -19,9 +19,6 @@ | |||
| 19 | <files> | 19 | <files> |
| 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
| 21 | 21 | ||
| 22 | <file src="$mergemoddir$ARM\mergemod.dll" target="runtimes\win-arm\native" /> | ||
| 23 | <file src="ARM\wixnative.exe" target="runtimes\win-arm\native" /> | ||
| 24 | <file src="ARM\wixnative.pdb" target="runtimes\win-arm\native" /> | ||
| 25 | <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> | 22 | <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> |
| 26 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> | 23 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> |
| 27 | <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> | 24 | <file src="ARM64\wixnative.pdb" target="runtimes\win-arm64\native" /> |
diff --git a/src/winterop/winterop.vcxproj b/src/winterop/winterop.vcxproj index 7eb2d078..28393dba 100644 --- a/src/winterop/winterop.vcxproj +++ b/src/winterop/winterop.vcxproj | |||
| @@ -8,10 +8,6 @@ | |||
| 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" /> | 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" /> |
| 9 | 9 | ||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|ARM"> | ||
| 12 | <Configuration>Debug</Configuration> | ||
| 13 | <Platform>ARM</Platform> | ||
| 14 | </ProjectConfiguration> | ||
| 15 | <ProjectConfiguration Include="Debug|ARM64"> | 11 | <ProjectConfiguration Include="Debug|ARM64"> |
| 16 | <Configuration>Debug</Configuration> | 12 | <Configuration>Debug</Configuration> |
| 17 | <Platform>ARM64</Platform> | 13 | <Platform>ARM64</Platform> |
| @@ -24,10 +20,6 @@ | |||
| 24 | <Configuration>Debug</Configuration> | 20 | <Configuration>Debug</Configuration> |
| 25 | <Platform>x64</Platform> | 21 | <Platform>x64</Platform> |
| 26 | </ProjectConfiguration> | 22 | </ProjectConfiguration> |
| 27 | <ProjectConfiguration Include="Release|ARM"> | ||
| 28 | <Configuration>Release</Configuration> | ||
| 29 | <Platform>ARM</Platform> | ||
| 30 | </ProjectConfiguration> | ||
| 31 | <ProjectConfiguration Include="Release|ARM64"> | 23 | <ProjectConfiguration Include="Release|ARM64"> |
| 32 | <Configuration>Release</Configuration> | 24 | <Configuration>Release</Configuration> |
| 33 | <Platform>ARM64</Platform> | 25 | <Platform>ARM64</Platform> |
diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj index feebdf5b..0d79b80c 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wixnative/wixnative.vcxproj | |||
| @@ -8,10 +8,6 @@ | |||
| 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" /> | 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.41\build\WixToolset.DUtil.props')" /> |
| 9 | 9 | ||
| 10 | <ItemGroup Label="ProjectConfigurations"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
| 11 | <ProjectConfiguration Include="Debug|ARM"> | ||
| 12 | <Configuration>Debug</Configuration> | ||
| 13 | <Platform>ARM</Platform> | ||
| 14 | </ProjectConfiguration> | ||
| 15 | <ProjectConfiguration Include="Debug|ARM64"> | 11 | <ProjectConfiguration Include="Debug|ARM64"> |
| 16 | <Configuration>Debug</Configuration> | 12 | <Configuration>Debug</Configuration> |
| 17 | <Platform>ARM64</Platform> | 13 | <Platform>ARM64</Platform> |
| @@ -24,10 +20,6 @@ | |||
| 24 | <Configuration>Debug</Configuration> | 20 | <Configuration>Debug</Configuration> |
| 25 | <Platform>x64</Platform> | 21 | <Platform>x64</Platform> |
| 26 | </ProjectConfiguration> | 22 | </ProjectConfiguration> |
| 27 | <ProjectConfiguration Include="Release|ARM"> | ||
| 28 | <Configuration>Release</Configuration> | ||
| 29 | <Platform>ARM</Platform> | ||
| 30 | </ProjectConfiguration> | ||
| 31 | <ProjectConfiguration Include="Release|ARM64"> | 23 | <ProjectConfiguration Include="Release|ARM64"> |
| 32 | <Configuration>Release</Configuration> | 24 | <Configuration>Release</Configuration> |
| 33 | <Platform>ARM64</Platform> | 25 | <Platform>ARM64</Platform> |