diff options
| author | Bob Arnson <bob@firegiant.com> | 2021-02-23 18:52:35 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2021-02-23 18:59:40 -0500 |
| commit | eca63e35a7dd2d7925d635fabcf03a9b701b7272 (patch) | |
| tree | f985e35ef829392e8de6acd0d5cdd57c2ee7d34d | |
| parent | 6c535c2b3dbb6099d09b5b9a88ce78ad4f1c49bc (diff) | |
| download | wix-eca63e35a7dd2d7925d635fabcf03a9b701b7272.tar.gz wix-eca63e35a7dd2d7925d635fabcf03a9b701b7272.tar.bz2 wix-eca63e35a7dd2d7925d635fabcf03a9b701b7272.zip | |
Add custom action prefixes.
| -rw-r--r-- | global.json | 2 | ||||
| -rw-r--r-- | src/wixext/IIsCompiler.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/global.json b/global.json index 10345833..32e88652 100644 --- a/global.json +++ b/global.json | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "WixToolset.Sdk": "4.0.0-build-0163" | 3 | "WixToolset.Sdk": "4.0.0-build-0190" |
| 4 | } | 4 | } |
| 5 | } | 5 | } |
diff --git a/src/wixext/IIsCompiler.cs b/src/wixext/IIsCompiler.cs index 27258094..952a4a67 100644 --- a/src/wixext/IIsCompiler.cs +++ b/src/wixext/IIsCompiler.cs | |||
| @@ -288,8 +288,8 @@ namespace WixToolset.Iis | |||
| 288 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 288 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
| 289 | 289 | ||
| 290 | // Reference InstallCertificates and UninstallCertificates since nothing will happen without them | 290 | // Reference InstallCertificates and UninstallCertificates since nothing will happen without them |
| 291 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); | 291 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4InstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); |
| 292 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); | 292 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4UninstallCertificates", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); |
| 293 | 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 |
| 294 | 294 | ||
| 295 | if (!this.Messaging.EncounteredError) | 295 | if (!this.Messaging.EncounteredError) |
| @@ -2604,7 +2604,7 @@ namespace WixToolset.Iis | |||
| 2604 | 2604 | ||
| 2605 | private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) | 2605 | private void AddReferenceToConfigureIIs(IntermediateSection section, SourceLineNumber sourceLineNumbers) |
| 2606 | { | 2606 | { |
| 2607 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); | 2607 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4ConfigureIIs", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); |
| 2608 | } | 2608 | } |
| 2609 | } | 2609 | } |
| 2610 | } | 2610 | } |