diff options
author | Bob Arnson <bob@firegiant.com> | 2020-07-04 19:06:57 -0400 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-07-04 19:09:21 -0400 |
commit | 4082ae7f94346a8db77638ab8f0e06513a53c73a (patch) | |
tree | a624ca8ea9cfd2c1e3e253d9c352c7b54f273704 /src/wixext | |
parent | e2567d00aa073a08f6202d913606857f085b6d52 (diff) | |
download | wix-4082ae7f94346a8db77638ab8f0e06513a53c73a.tar.gz wix-4082ae7f94346a8db77638ab8f0e06513a53c73a.tar.bz2 wix-4082ae7f94346a8db77638ab8f0e06513a53c73a.zip |
Add per-platform custom action support.
Diffstat (limited to 'src/wixext')
-rw-r--r-- | src/wixext/IIsCompiler.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs index 6f0cdd5e..a221e78a 100644 --- a/src/wixext/IIsCompiler.cs +++ b/src/wixext/IIsCompiler.cs | |||
@@ -8,6 +8,7 @@ namespace WixToolset.Iis | |||
8 | using System.Xml.Linq; | 8 | using System.Xml.Linq; |
9 | using WixToolset.Data; | 9 | using WixToolset.Data; |
10 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
11 | using WixToolset.Extensibility.Data; | ||
11 | using WixToolset.Iis.Symbols; | 12 | using WixToolset.Iis.Symbols; |
12 | 13 | ||
13 | /// <summary> | 14 | /// <summary> |
@@ -287,8 +288,8 @@ namespace WixToolset.Iis | |||
287 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 288 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
288 | 289 | ||
289 | // Reference InstallCertificates and UninstallCertificates since nothing will happen without them | 290 | // Reference InstallCertificates and UninstallCertificates since nothing will happen without them |
290 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "InstallCertificates"); | 291 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); |
291 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "UninstallCertificates"); | 292 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); |
292 | this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table | 293 | this.ParseHelper.EnsureTable(section, sourceLineNumbers, IisTableDefinitions.CertificateHash); // Certificate CustomActions require the CertificateHash table |
293 | 294 | ||
294 | if (!this.Messaging.EncounteredError) | 295 | if (!this.Messaging.EncounteredError) |
@@ -2603,7 +2604,7 @@ namespace WixToolset.Iis | |||
2603 | 2604 | ||
2604 | private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) | 2605 | private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) |
2605 | { | 2606 | { |
2606 | this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.CustomAction, "ConfigureIIs"); | 2607 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM | CustomActionPlatforms.ARM64); |
2607 | } | 2608 | } |
2608 | } | 2609 | } |
2609 | } | 2610 | } |