diff options
| author | Bob Arnson <bob@firegiant.com> | 2023-01-11 20:14:29 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2023-01-11 21:29:41 -0500 |
| commit | 10794363b90e49885ace5729bb45af4da5d0f220 (patch) | |
| tree | f13aac3990088cdff76885f04bca433fa3c803d0 /src/ext/VisualStudio/wixext/VSCompiler.cs | |
| parent | bc4a72752cb199c7a3ba5a24f656b5e1c0aa9958 (diff) | |
| download | wix-10794363b90e49885ace5729bb45af4da5d0f220.tar.gz wix-10794363b90e49885ace5729bb45af4da5d0f220.tar.bz2 wix-10794363b90e49885ace5729bb45af4da5d0f220.zip | |
VSExtension cleanup:
- Add ARM64-specific custom action.
- Remove "naked" `CustomActionRef`s.
- Clean up `wix convert` behavior:
- Remove `PropertyRef`s for properties CA always sets.
Fixes https://github.com/wixtoolset/issues/issues/7100.
Fixes https://github.com/wixtoolset/issues/issues/7153.
Diffstat (limited to 'src/ext/VisualStudio/wixext/VSCompiler.cs')
| -rw-r--r-- | src/ext/VisualStudio/wixext/VSCompiler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ext/VisualStudio/wixext/VSCompiler.cs b/src/ext/VisualStudio/wixext/VSCompiler.cs index 1901a700..b6882779 100644 --- a/src/ext/VisualStudio/wixext/VSCompiler.cs +++ b/src/ext/VisualStudio/wixext/VSCompiler.cs | |||
| @@ -76,7 +76,7 @@ namespace WixToolset.VisualStudio | |||
| 76 | 76 | ||
| 77 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); | 77 | this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element); |
| 78 | 78 | ||
| 79 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4VSFindInstances", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64); | 79 | this.ParseHelper.CreateCustomActionReference(sourceLineNumbers, section, "Wix4VSFindInstances", this.Context.Platform, CustomActionPlatforms.X86 | CustomActionPlatforms.X64 | CustomActionPlatforms.ARM64); |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | private void ParseVsixPackageElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) | 82 | private void ParseVsixPackageElement(Intermediate intermediate, IntermediateSection section, XElement element, string componentId, string fileId) |