From 797c8464e43c999edc2ffce781457f11c3b4e8e5 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 20 Sep 2020 16:25:13 -0400
Subject: Remove 32-bit ARM support.

---
 src/ca/netfxca.vcxproj            | 8 --------
 src/wixext/NetFxCompiler.cs       | 2 +-
 src/wixlib/NetFxExtension_arm.wxs | 8 --------
 src/wixlib/netfx.wixproj          | 2 --
 4 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 src/wixlib/NetFxExtension_arm.wxs

(limited to 'src')

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 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM">
-      <Configuration>Release</Configuration>
-      <Platform>ARM</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
       <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
 
             this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
 
-            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
+            this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "NetFxScheduleNativeImage", this.Context.Platform, CustomActionPlatforms.ARM64 | CustomActionPlatforms.X64 | CustomActionPlatforms.X86);
 
             if (!this.Messaging.EncounteredError)
             {
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 @@
-<?xml version="1.0"?>
-<!-- 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. -->
-
-
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-    <?define platform=arm ?>
-    <?include NetfxExtension_Platform.wxi ?>
-</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 @@
   <ItemGroup>
     <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
     <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
-    <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
     <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM" />
     <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
     <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
     <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />
-- 
cgit v1.2.3-55-g6feb