Remove 32-bit ARM support.
Bob Arnson committed
Sep 20, 2020 at 16:49 UTC
e84996576e588d27a7b1c61423c1e10c929b8b1a
14 files changed
+41
-58
global.json
+1
-1
@@ -1,5 +1,5 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0143"
3
+ "WixToolset.Sdk": "4.0.0-build-0157"
4
}
5
}
src/ca/dependencyca.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/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+1
-1
@@ -19,7 +19,7 @@ namespace WixToolsetTest.Dependency
19
var results = build.BuildAndQuery(Build, "WixDependencyProvider");
20
Assert.Equal(new[]
21
{
22
- "WixDependencyProvider:depJQsOasf1FRUsKxq8THB9sXk8yws\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
22
+ "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
23
}, results);
24
}
25
src/wixext/DependencyCompiler.cs
+2
-2
@@ -362,7 +362,7 @@ namespace WixToolset.Dependency
362
363
if (PackageType.None == packageType)
364
{
365
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
365
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
366
367
// Generate registry rows for the provider using binder properties.
368
var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key);
@@ -568,7 +568,7 @@ namespace WixToolset.Dependency
568
569
private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers)
570
{
571
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
571
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
572
}
573
}
574
}
src/wixlib/DependencyExtension.wxs
+5
-6
@@ -1,5 +1,4 @@
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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -7,16 +6,16 @@
6
7
<Fragment>
8
<UI Id="WixDependencyErrors">
10
- <Error Id="$(var.msierrDependencyMissingDependencies)">!(loc.msierrDependencyMissingDependencies)</Error>
11
- <Error Id="$(var.msierrDependencyHasDependents)">!(loc.msierrDependencyHasDependents)</Error>
9
+ <Error Id="$(var.msierrDependencyMissingDependencies)" Message="!(loc.msierrDependencyMissingDependencies)" />
10
+ <Error Id="$(var.msierrDependencyHasDependents)" Message="!(loc.msierrDependencyHasDependents)" />
11
</UI>
12
</Fragment>
13
14
<Fragment>
16
- <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes"/>
15
+ <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes" />
16
</Fragment>
17
18
<Fragment>
20
- <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes"/>
19
+ <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes" />
20
</Fragment>
21
</Wix>
src/wixlib/DependencyExtension_Platform.wxi
+10
-11
@@ -1,29 +1,28 @@
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. -->
1
+<!-- 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. -->
2
3
4
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?include caDecor.wxi ?>
6
7
<Fragment>
9
- <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes"/>
8
+ <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
9
<InstallExecuteSequence>
11
- <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes"><![CDATA[NOT DISABLEDEPENDENCYCHECK]]></Custom>
10
+ <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes" Condition="NOT DISABLEDEPENDENCYCHECK" />
11
</InstallExecuteSequence>
13
- <UIRef Id="WixDependencyErrors"/>
14
- <PropertyRef Id="DISABLEDEPENDENCYCHECK"/>
12
+ <UIRef Id="WixDependencyErrors" />
13
+ <PropertyRef Id="DISABLEDEPENDENCYCHECK" />
14
</Fragment>
15
16
<Fragment>
18
- <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes"/>
17
+ <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
18
<InstallExecuteSequence>
20
- <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes"><![CDATA[(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")]]></Custom>
19
+ <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")" />
20
</InstallExecuteSequence>
22
- <UIRef Id="WixDependencyErrors"/>
23
- <PropertyRef Id="IGNOREDEPENDENCIES"/>
21
+ <UIRef Id="WixDependencyErrors" />
22
+ <PropertyRef Id="IGNOREDEPENDENCIES" />
23
</Fragment>
24
25
<Fragment>
27
- <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll"/>
26
+ <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
27
</Fragment>
28
</Include>
src/wixlib/DependencyExtension_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 DependencyExtension_Platform.wxi ?>
8
-</Wix>
src/wixlib/DependencyExtension_arm64.wxs
+1
-2
@@ -1,5 +1,4 @@
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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/DependencyExtension_x64.wxs
+1
-2
@@ -1,5 +1,4 @@
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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/DependencyExtension_x86.wxs
+1
-2
@@ -1,5 +1,4 @@
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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
src/wixlib/caDecor.wxi
+10
-11
@@ -1,40 +1,39 @@
1
-<?xml version="1.0" encoding="utf-8"?>
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. -->
1
+<!-- 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. -->
2
3
5
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
4
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
<?ifdef Prefix ?>
6
<?undef Prefix ?>
8
- <?endif ?>
7
+ <?endif?>
8
9
<?define Prefix="Wix4" ?>
10
11
<?ifndef platform ?>
12
<?define platform="x86" ?>
14
- <?endif ?>
13
+ <?endif?>
14
15
<?if $(var.platform)="" ?>
16
<?undef platform ?>
17
<?define platform="x86" ?>
19
- <?endif ?>
18
+ <?endif?>
19
20
<?ifdef Suffix ?>
21
<?undef Suffix ?>
23
- <?endif ?>
22
+ <?endif?>
23
24
<?if $(var.platform)~="x86" ?>
25
<?define Suffix="_X86" ?>
27
- <?endif ?>
26
+ <?endif?>
27
28
<?if $(var.platform)~="x64" ?>
29
<?define Suffix="_X64" ?>
31
- <?endif ?>
30
+ <?endif?>
31
32
<?if $(var.platform)~="arm" ?>
33
<?define Suffix="_A32" ?>
35
- <?endif ?>
34
+ <?endif?>
35
36
<?if $(var.platform)~="arm64" ?>
37
<?define Suffix="_A64" ?>
39
- <?endif ?>
38
+ <?endif?>
39
</Include>
src/wixlib/caerr.wxi
+1
-1
@@ -1,4 +1,4 @@
1
-<Include>
1
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
2
<?define msierrSecureObjectsFailedCreateSD = 25520?>
3
<?define msierrSecureObjectsFailedSet = 25521?>
4
<?define msierrSecureObjectsUnknownType = 25522?>
src/wixlib/dependency.wixproj
+7
-1
@@ -4,12 +4,18 @@
4
<PropertyGroup>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
7
+ <!-- PropertyModularizationSuppressed -->
8
<SuppressSpecificWarnings>1086</SuppressSpecificWarnings>
9
<Cultures>en-us</Cultures>
10
</PropertyGroup>
11
12
<ItemGroup>
12
- <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM" />
13
+ <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
14
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
15
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
16
+ </ItemGroup>
17
+
18
+ <ItemGroup>
19
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM64" />
20
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x86" />
21
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x64" />
src/wixlib/en-us.wxl
+1
-2
@@ -1,5 +1,4 @@
1
-<?xml version="1.0" encoding="utf-8"?>
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. -->
1
+<!-- 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. -->
2
3
4
<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">