aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2020-09-20 16:25:13 -0400
committerBob Arnson <bob@firegiant.com>2020-09-20 16:28:46 -0400
commit797c8464e43c999edc2ffce781457f11c3b4e8e5 (patch)
tree9606c60ccc3b94fb48ee64c21908025adf21c07e
parent174043e6f961c5c63fb89a1995b469f03be7894d (diff)
downloadwix-797c8464e43c999edc2ffce781457f11c3b4e8e5.tar.gz
wix-797c8464e43c999edc2ffce781457f11c3b4e8e5.tar.bz2
wix-797c8464e43c999edc2ffce781457f11c3b4e8e5.zip
Remove 32-bit ARM support.
-rw-r--r--src/ca/netfxca.vcxproj8
-rw-r--r--src/wixext/NetFxCompiler.cs2
-rw-r--r--src/wixlib/NetFxExtension_arm.wxs8
-rw-r--r--src/wixlib/netfx.wixproj2
4 files changed, 1 insertions, 19 deletions
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index dec54dca..703e98fa 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -20,14 +20,6 @@
20 <Configuration>Release</Configuration> 20 <Configuration>Release</Configuration>
21 <Platform>x64</Platform> 21 <Platform>x64</Platform>
22 </ProjectConfiguration> 22 </ProjectConfiguration>
23 <ProjectConfiguration Include="Debug|ARM">
24 <Configuration>Debug</Configuration>
25 <Platform>ARM</Platform>
26 </ProjectConfiguration>
27 <ProjectConfiguration Include="Release|ARM">
28 <Configuration>Release</Configuration>
29 <Platform>ARM</Platform>
30 </ProjectConfiguration>
31 <ProjectConfiguration Include="Debug|ARM64"> 23 <ProjectConfiguration Include="Debug|ARM64">
32 <Configuration>Debug</Configuration> 24 <Configuration>Debug</Configuration>
33 <Platform>ARM64</Platform> 25 <Platform>ARM64</Platform>
diff --git a/src/wixext/NetFxCompiler.cs b/src/wixext/NetFxCompiler.cs
index 14efe95d..1a7981f5 100644
--- a/src/wixext/NetFxCompiler.cs
+++ b/src/wixext/NetFxCompiler.cs
@@ -145,7 +145,7 @@ namespace WixToolset.Netfx
145 145
146 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); 146 this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
147 147
148 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86); 148 this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
149 149
150 if (!this.Messaging.EncounteredError) 150 if (!this.Messaging.EncounteredError)
151 { 151 {
diff --git a/src/wixlib/NetFxExtension_arm.wxs b/src/wixlib/NetFxExtension_arm.wxs
deleted file mode 100644
index 8b5c508b..00000000
--- a/src/wixlib/NetFxExtension_arm.wxs
+++ /dev/null
@@ -1,8 +0,0 @@
1<?xml version="1.0"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?define platform=arm ?>
7 <?include NetfxExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 426446e8..700293d3 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -9,12 +9,10 @@
9 <ItemGroup> 9 <ItemGroup>
10 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' /> 10 <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' /> 11 <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12 <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
13 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' /> 12 <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
14 </ItemGroup> 13 </ItemGroup>
15 14
16 <ItemGroup> 15 <ItemGroup>
17 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM" />
18 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" /> 16 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
19 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" /> 17 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
20 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" /> 18 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />