From e84996576e588d27a7b1c61423c1e10c929b8b1a Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 20 Sep 2020 16:49:56 -0400
Subject: Remove 32-bit ARM support.
---
global.json | 2 +-
src/ca/dependencyca.vcxproj | 8 --------
.../DependencyExtensionFixture.cs | 2 +-
src/wixext/DependencyCompiler.cs | 4 ++--
src/wixlib/DependencyExtension.wxs | 11 +++++------
src/wixlib/DependencyExtension_Platform.wxi | 21 ++++++++++-----------
src/wixlib/DependencyExtension_arm.wxs | 8 --------
src/wixlib/DependencyExtension_arm64.wxs | 3 +--
src/wixlib/DependencyExtension_x64.wxs | 3 +--
src/wixlib/DependencyExtension_x86.wxs | 3 +--
src/wixlib/caDecor.wxi | 21 ++++++++++-----------
src/wixlib/caerr.wxi | 2 +-
src/wixlib/dependency.wixproj | 8 +++++++-
src/wixlib/en-us.wxl | 3 +--
14 files changed, 41 insertions(+), 58 deletions(-)
delete mode 100644 src/wixlib/DependencyExtension_arm.wxs
diff --git a/global.json b/global.json
index 7a995d0a..4d9df50b 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"msbuild-sdks": {
- "WixToolset.Sdk": "4.0.0-build-0143"
+ "WixToolset.Sdk": "4.0.0-build-0157"
}
}
diff --git a/src/ca/dependencyca.vcxproj b/src/ca/dependencyca.vcxproj
index c1dfc0c0..ad01a82f 100644
--- a/src/ca/dependencyca.vcxproj
+++ b/src/ca/dependencyca.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/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
index 823532ee..67072e36 100644
--- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs
@@ -19,7 +19,7 @@ namespace WixToolsetTest.Dependency
var results = build.BuildAndQuery(Build, "WixDependencyProvider");
Assert.Equal(new[]
{
- "WixDependencyProvider:depJQsOasf1FRUsKxq8THB9sXk8yws\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
+ "WixDependencyProvider:dep74OfIcniaqxA7EprRGBw4Oyy3r8\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tUsingProvides\t\t\t",
}, results);
}
diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs
index 36a24c67..4aaa373b 100644
--- a/src/wixext/DependencyCompiler.cs
+++ b/src/wixext/DependencyCompiler.cs
@@ -362,7 +362,7 @@ namespace WixToolset.Dependency
if (PackageType.None == packageType)
{
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
// Generate registry rows for the provider using binder properties.
var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key);
@@ -568,7 +568,7 @@ namespace WixToolset.Dependency
private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers)
{
- this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64);
+ this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64);
}
}
}
diff --git a/src/wixlib/DependencyExtension.wxs b/src/wixlib/DependencyExtension.wxs
index 21f863d2..0516b18c 100644
--- a/src/wixlib/DependencyExtension.wxs
+++ b/src/wixlib/DependencyExtension.wxs
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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">
@@ -7,16 +6,16 @@
<Fragment>
<UI Id="WixDependencyErrors">
- <Error Id="$(var.msierrDependencyMissingDependencies)">!(loc.msierrDependencyMissingDependencies)</Error>
- <Error Id="$(var.msierrDependencyHasDependents)">!(loc.msierrDependencyHasDependents)</Error>
+ <Error Id="$(var.msierrDependencyMissingDependencies)" Message="!(loc.msierrDependencyMissingDependencies)" />
+ <Error Id="$(var.msierrDependencyHasDependents)" Message="!(loc.msierrDependencyHasDependents)" />
</UI>
</Fragment>
<Fragment>
- <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes"/>
+ <Property Id="DISABLEDEPENDENCYCHECK" Secure="yes" SuppressModularization="yes" />
</Fragment>
<Fragment>
- <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes"/>
+ <Property Id="IGNOREDEPENDENCIES" Secure="yes" SuppressModularization="yes" />
</Fragment>
</Wix>
diff --git a/src/wixlib/DependencyExtension_Platform.wxi b/src/wixlib/DependencyExtension_Platform.wxi
index 299a93eb..68dec471 100644
--- a/src/wixlib/DependencyExtension_Platform.wxi
+++ b/src/wixlib/DependencyExtension_Platform.wxi
@@ -1,29 +1,28 @@
-<?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. -->
+<!-- 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. -->
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?include caDecor.wxi ?>
<Fragment>
- <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes"/>
+ <CustomAction Id="$(var.Prefix)DependencyRequire$(var.Suffix)" DllEntry="WixDependencyRequire" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
<InstallExecuteSequence>
- <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes"><![CDATA[NOT DISABLEDEPENDENCYCHECK]]></Custom>
+ <Custom Action="$(var.Prefix)DependencyRequire$(var.Suffix)" Before="WixDependencyCheck$(var.Suffix)" Overridable="yes" Condition="NOT DISABLEDEPENDENCYCHECK" />
</InstallExecuteSequence>
- <UIRef Id="WixDependencyErrors"/>
- <PropertyRef Id="DISABLEDEPENDENCYCHECK"/>
+ <UIRef Id="WixDependencyErrors" />
+ <PropertyRef Id="DISABLEDEPENDENCYCHECK" />
</Fragment>
<Fragment>
- <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" BinaryKey="DependencyCA$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes"/>
+ <CustomAction Id="$(var.Prefix)DependencyCheck$(var.Suffix)" DllEntry="WixDependencyCheck" Execute="immediate" Return="check" SuppressModularization="yes" BinaryRef="DependencyCA$(var.Suffix)" />
<InstallExecuteSequence>
- <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes"><![CDATA[(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")]]></Custom>
+ <Custom Action="$(var.Prefix)DependencyCheck$(var.Suffix)" Before="InstallInitialize" Overridable="yes" Condition="(REMOVE OR MsiPatchRemovalList) AND NOT (UPGRADINGPRODUCTCODE OR IGNOREDEPENDENCIES="ALL")" />
</InstallExecuteSequence>
- <UIRef Id="WixDependencyErrors"/>
- <PropertyRef Id="IGNOREDEPENDENCIES"/>
+ <UIRef Id="WixDependencyErrors" />
+ <PropertyRef Id="IGNOREDEPENDENCIES" />
</Fragment>
<Fragment>
- <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll"/>
+ <Binary Id="DependencyCA$(var.Suffix)" SourceFile="!(bindpath.$(var.platform))dependencyca.dll" />
</Fragment>
</Include>
diff --git a/src/wixlib/DependencyExtension_arm.wxs b/src/wixlib/DependencyExtension_arm.wxs
deleted file mode 100644
index d4ba33a3..00000000
--- a/src/wixlib/DependencyExtension_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 DependencyExtension_Platform.wxi ?>
-</Wix>
diff --git a/src/wixlib/DependencyExtension_arm64.wxs b/src/wixlib/DependencyExtension_arm64.wxs
index 36e023e7..958650e6 100644
--- a/src/wixlib/DependencyExtension_arm64.wxs
+++ b/src/wixlib/DependencyExtension_arm64.wxs
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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">
diff --git a/src/wixlib/DependencyExtension_x64.wxs b/src/wixlib/DependencyExtension_x64.wxs
index 8298bce6..4fe458e8 100644
--- a/src/wixlib/DependencyExtension_x64.wxs
+++ b/src/wixlib/DependencyExtension_x64.wxs
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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">
diff --git a/src/wixlib/DependencyExtension_x86.wxs b/src/wixlib/DependencyExtension_x86.wxs
index 715eba02..d8ac6785 100644
--- a/src/wixlib/DependencyExtension_x86.wxs
+++ b/src/wixlib/DependencyExtension_x86.wxs
@@ -1,5 +1,4 @@
-<?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. -->
+<!-- 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">
diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi
index 1d00df8f..b1711518 100644
--- a/src/wixlib/caDecor.wxi
+++ b/src/wixlib/caDecor.wxi
@@ -1,40 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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. -->
-<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?ifdef Prefix ?>
<?undef Prefix ?>
- <?endif ?>
+ <?endif?>
<?define Prefix="Wix4" ?>
<?ifndef platform ?>
<?define platform="x86" ?>
- <?endif ?>
+ <?endif?>
<?if $(var.platform)="" ?>
<?undef platform ?>
<?define platform="x86" ?>
- <?endif ?>
+ <?endif?>
<?ifdef Suffix ?>
<?undef Suffix ?>
- <?endif ?>
+ <?endif?>
<?if $(var.platform)~="x86" ?>
<?define Suffix="_X86" ?>
- <?endif ?>
+ <?endif?>
<?if $(var.platform)~="x64" ?>
<?define Suffix="_X64" ?>
- <?endif ?>
+ <?endif?>
<?if $(var.platform)~="arm" ?>
<?define Suffix="_A32" ?>
- <?endif ?>
+ <?endif?>
<?if $(var.platform)~="arm64" ?>
<?define Suffix="_A64" ?>
- <?endif ?>
+ <?endif?>
</Include>
diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi
index 141942f2..ff7ec121 100644
--- a/src/wixlib/caerr.wxi
+++ b/src/wixlib/caerr.wxi
@@ -1,4 +1,4 @@
-<Include>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?define msierrSecureObjectsFailedCreateSD = 25520?>
<?define msierrSecureObjectsFailedSet = 25521?>
<?define msierrSecureObjectsUnknownType = 25522?>
diff --git a/src/wixlib/dependency.wixproj b/src/wixlib/dependency.wixproj
index f7ba0f79..b978a34e 100644
--- a/src/wixlib/dependency.wixproj
+++ b/src/wixlib/dependency.wixproj
@@ -4,12 +4,18 @@
<PropertyGroup>
<OutputType>Library</OutputType>
<BindFiles>true</BindFiles>
+ <!-- PropertyModularizationSuppressed -->
<SuppressSpecificWarnings>1086</SuppressSpecificWarnings>
<Cultures>en-us</Cultures>
</PropertyGroup>
<ItemGroup>
- <ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM" />
+ <BindInputPaths Include="$(OutputPath)x86" BindName='x86' />
+ <BindInputPaths Include="$(OutputPath)x64" BindName='x64' />
+ <BindInputPaths Include="$(OutputPath)arm64" BindName='arm64' />
+ </ItemGroup>
+
+ <ItemGroup>
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=ARM64" />
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x86" />
<ProjectReference Include="..\ca\dependencyca.vcxproj" Properties="Platform=x64" />
diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl
index ce29a153..6ad7d63d 100644
--- a/src/wixlib/en-us.wxl
+++ b/src/wixlib/en-us.wxl
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
+<!-- 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. -->
<WixLocalization Culture="en-US" xmlns="http://wixtoolset.org/schemas/v4/wxl">
--
cgit v1.2.3-55-g6feb