Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 16:25 UTC
797c8464e43c999edc2ffce781457f11c3b4e8e5
4 files changed
+1
-19
src/ca/netfxca.vcxproj
-8
@@ -20,14 +20,6 @@
20
<Configuration>Release</Configuration>
21
<Platform>x64</Platform>
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>
23
<ProjectConfiguration Include="Debug|ARM64">
24
<Configuration>Debug</Configuration>
25
<Platform>ARM64</Platform>
src/wixext/NetFxCompiler.cs
+1
-1
@@ -145,7 +145,7 @@ namespace WixToolset.Netfx
145
146
this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
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
150
if (!this.Messaging.EncounteredError)
151
{
src/wixlib/NetFxExtension_arm.wxs
deleted
-8
@@ -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>
src/wixlib/netfx.wixproj
-2
@@ -9,12 +9,10 @@
9
<ItemGroup>
10
<BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
11
<BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
12
- <BindInputPaths Include="$(OutputPath)arm" BindName='arm' />
12
<BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
13
</ItemGroup>
14
15
<ItemGroup>
17
- <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM" />
16
<ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
17
<ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
18
<ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />