From e84996576e588d27a7b1c61423c1e10c929b8b1a Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 20 Sep 2020 16:49:56 -0400 Subject: [PATCH] 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 7a995d0..4d9df50 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 c1dfc0c..ad01a82 100644 --- a/src/ca/dependencyca.vcxproj +++ b/src/ca/dependencyca.vcxproj @@ -20,14 +20,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs index 823532e..67072e3 100644 --- a/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs +++ b/src/test/WixToolsetTest.Dependency/DependencyExtensionFixture.cs @@ -19,7 +19,7 @@ public void CanBuildUsingProvides() 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 36a24c6..4aaa373 100644 --- a/src/wixext/DependencyCompiler.cs +++ b/src/wixext/DependencyCompiler.cs @@ -362,7 +362,7 @@ private IComponentKeyPath ParseProvidesElement(Intermediate intermediate, Interm 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 @@ private void ParseRequiresRefElement(Intermediate intermediate, IntermediateSect 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 21f863d..0516b18 100644 --- a/src/wixlib/DependencyExtension.wxs +++ b/src/wixlib/DependencyExtension.wxs @@ -1,5 +1,4 @@ - - + @@ -7,16 +6,16 @@ - !(loc.msierrDependencyMissingDependencies) - !(loc.msierrDependencyHasDependents) + + - + - + diff --git a/src/wixlib/DependencyExtension_Platform.wxi b/src/wixlib/DependencyExtension_Platform.wxi index 299a93e..68dec47 100644 --- a/src/wixlib/DependencyExtension_Platform.wxi +++ b/src/wixlib/DependencyExtension_Platform.wxi @@ -1,29 +1,28 @@ - - + - + - + - - + + - + - + - - + + - + diff --git a/src/wixlib/DependencyExtension_arm.wxs b/src/wixlib/DependencyExtension_arm.wxs deleted file mode 100644 index d4ba33a..0000000 --- a/src/wixlib/DependencyExtension_arm.wxs +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/wixlib/DependencyExtension_arm64.wxs b/src/wixlib/DependencyExtension_arm64.wxs index 36e023e..958650e 100644 --- a/src/wixlib/DependencyExtension_arm64.wxs +++ b/src/wixlib/DependencyExtension_arm64.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/DependencyExtension_x64.wxs b/src/wixlib/DependencyExtension_x64.wxs index 8298bce..4fe458e 100644 --- a/src/wixlib/DependencyExtension_x64.wxs +++ b/src/wixlib/DependencyExtension_x64.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/DependencyExtension_x86.wxs b/src/wixlib/DependencyExtension_x86.wxs index 715eba0..d8ac678 100644 --- a/src/wixlib/DependencyExtension_x86.wxs +++ b/src/wixlib/DependencyExtension_x86.wxs @@ -1,5 +1,4 @@ - - + diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi index 1d00df8..b171151 100644 --- a/src/wixlib/caDecor.wxi +++ b/src/wixlib/caDecor.wxi @@ -1,40 +1,39 @@ - - + - + - + - + - + - + - + - + - + - + diff --git a/src/wixlib/caerr.wxi b/src/wixlib/caerr.wxi index 141942f..ff7ec12 100644 --- a/src/wixlib/caerr.wxi +++ b/src/wixlib/caerr.wxi @@ -1,4 +1,4 @@ - + diff --git a/src/wixlib/dependency.wixproj b/src/wixlib/dependency.wixproj index f7ba0f7..b978a34 100644 --- a/src/wixlib/dependency.wixproj +++ b/src/wixlib/dependency.wixproj @@ -4,12 +4,18 @@ Library true + 1086 en-us - + + + + + + diff --git a/src/wixlib/en-us.wxl b/src/wixlib/en-us.wxl index ce29a15..6ad7d63 100644 --- a/src/wixlib/en-us.wxl +++ b/src/wixlib/en-us.wxl @@ -1,5 +1,4 @@ - - +