diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-02-26 11:24:10 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-02-27 07:47:08 -0800 |
| commit | 5fd1b7ff82f17d55c8357fe76898a1bdc5953476 (patch) | |
| tree | 5ec191ebf43009daf9bde6d0c26879b181b9a71b /src/WixToolset.Core/Compiler.cs | |
| parent | 760fb810ba5ecc3c6ce752a9bfa3755f7b7c0f6a (diff) | |
| download | wix-5fd1b7ff82f17d55c8357fe76898a1bdc5953476.tar.gz wix-5fd1b7ff82f17d55c8357fe76898a1bdc5953476.tar.bz2 wix-5fd1b7ff82f17d55c8357fe76898a1bdc5953476.zip | |
Absorb Dependency.wixext into Core
Partly resolves wixtoolset/issues#5949
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 85261cce..ac99a8a1 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -2366,6 +2366,16 @@ namespace WixToolset.Core | |||
| 2366 | var foundExtension = false; | 2366 | var foundExtension = false; |
| 2367 | this.ParseProgIdElement(child, id.Id, YesNoType.NotSet, null, null, null, ref foundExtension, YesNoType.NotSet); | 2367 | this.ParseProgIdElement(child, id.Id, YesNoType.NotSet, null, null, null, ref foundExtension, YesNoType.NotSet); |
| 2368 | break; | 2368 | break; |
| 2369 | case "Provides": | ||
| 2370 | if (win64) | ||
| 2371 | { | ||
| 2372 | this.Messaging.Write(CompilerWarnings.Win64Component(sourceLineNumbers, id.Id)); | ||
| 2373 | } | ||
| 2374 | |||
| 2375 | keyPathSet = this.ParseProvidesElement(child, null, id.Id, out keyPossible); | ||
| 2376 | keyBit = ComponentKeyPathType.Registry; | ||
| 2377 | break; | ||
| 2378 | |||
| 2369 | case "RegistryKey": | 2379 | case "RegistryKey": |
| 2370 | keyPathSet = this.ParseRegistryKeyElement(child, id.Id, null, null, win64, out keyPossible); | 2380 | keyPathSet = this.ParseRegistryKeyElement(child, id.Id, null, null, win64, out keyPossible); |
| 2371 | keyBit = ComponentKeyPathType.Registry; | 2381 | keyBit = ComponentKeyPathType.Registry; |
| @@ -6290,6 +6300,9 @@ namespace WixToolset.Core | |||
| 6290 | case "RelatedBundle": | 6300 | case "RelatedBundle": |
| 6291 | this.ParseRelatedBundleElement(child); | 6301 | this.ParseRelatedBundleElement(child); |
| 6292 | break; | 6302 | break; |
| 6303 | case "Requires": | ||
| 6304 | this.ParseRequiresElement(child, null, false); | ||
| 6305 | break; | ||
| 6293 | case "SetDirectory": | 6306 | case "SetDirectory": |
| 6294 | this.ParseSetDirectoryElement(child); | 6307 | this.ParseSetDirectoryElement(child); |
| 6295 | break; | 6308 | break; |
