diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-07-04 18:59:34 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-07-04 19:01:59 -0400 |
| commit | 6d17a027ff6155ed50f78858cad17d1baef9856d (patch) | |
| tree | 446d5f4730ef61703f19aa3bd4ee20e6e767c795 /src/wixext | |
| parent | 4e1ad5e7a257b351d40a8d68aa6e1a961766556b (diff) | |
| download | wix-6d17a027ff6155ed50f78858cad17d1baef9856d.tar.gz wix-6d17a027ff6155ed50f78858cad17d1baef9856d.tar.bz2 wix-6d17a027ff6155ed50f78858cad17d1baef9856d.zip | |
Add per-platform custom action support.
Diffstat (limited to 'src/wixext')
| -rw-r--r-- | src/wixext/DependencyCompiler.cs | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs index 018a507a..36a24c67 100644 --- a/src/wixext/DependencyCompiler.cs +++ b/src/wixext/DependencyCompiler.cs | |||
| @@ -362,17 +362,7 @@ namespace WixToolset.Dependency | |||
| 362 | 362 | ||
| 363 | if (PackageType.None == packageType) | 363 | if (PackageType.None == packageType) |
| 364 | { | 364 | { |
| 365 | // Reference the Check custom action to check for dependencies on the current provider. | 365 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyCheck", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); |
| 366 | if (Platform.ARM == this.Context.Platform) | ||
| 367 | { | ||
| 368 | // Ensure the ARM version of the CA is referenced. | ||
| 369 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixDependencyCheck_ARM"); | ||
| 370 | } | ||
| 371 | else | ||
| 372 | { | ||
| 373 | // All other supported platforms use x86. | ||
| 374 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixDependencyCheck"); | ||
| 375 | } | ||
| 376 | 366 | ||
| 377 | // Generate registry rows for the provider using binder properties. | 367 | // Generate registry rows for the provider using binder properties. |
| 378 | var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key); | 368 | var keyProvides = String.Concat(DependencyCommon.RegistryRoot, key); |
| @@ -578,16 +568,7 @@ namespace WixToolset.Dependency | |||
| 578 | 568 | ||
| 579 | private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers) | 569 | private void AddReferenceToWixDependencyRequire(IntermediateSection section, SourceLineNumber sourceLineNumbers) |
| 580 | { | 570 | { |
| 581 | if (Platform.ARM == this.Context.Platform) | 571 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "DependencyRequire", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); |
| 582 | { | ||
| 583 | // Ensure the ARM version of the CA is referenced. | ||
| 584 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixDependencyRequire_ARM"); | ||
| 585 | } | ||
| 586 | else | ||
| 587 | { | ||
| 588 | // All other supported platforms use x86. | ||
| 589 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, "CustomAction", "WixDependencyRequire"); | ||
| 590 | } | ||
| 591 | } | 572 | } |
| 592 | } | 573 | } |
| 593 | } | 574 | } |