aboutsummaryrefslogtreecommitdiff
path: root/src/wixext/DependencyCompiler.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixext/DependencyCompiler.cs')
-rw-r--r--src/wixext/DependencyCompiler.cs38
1 files changed, 19 insertions, 19 deletions
diff --git a/src/wixext/DependencyCompiler.cs b/src/wixext/DependencyCompiler.cs
index 4ec6f477..018a507a 100644
--- a/src/wixext/DependencyCompiler.cs
+++ b/src/wixext/DependencyCompiler.cs
@@ -8,8 +8,8 @@ namespace WixToolset.Dependency
8 using System.Text; 8 using System.Text;
9 using System.Xml.Linq; 9 using System.Xml.Linq;
10 using WixToolset.Data; 10 using WixToolset.Data;
11 using WixToolset.Data.Tuples; 11 using WixToolset.Data.Symbols;
12 using WixToolset.Dependency.Tuples; 12 using WixToolset.Dependency.Symbols;
13 using WixToolset.Extensibility; 13 using WixToolset.Extensibility;
14 using WixToolset.Extensibility.Data; 14 using WixToolset.Extensibility.Data;
15 15
@@ -207,9 +207,9 @@ namespace WixToolset.Dependency
207 207
208 if (!this.Messaging.EncounteredError) 208 if (!this.Messaging.EncounteredError)
209 { 209 {
210 // Create the provider tuple for the bundle. The Component_ field is required 210 // Create the provider symbol for the bundle. The Component_ field is required
211 // in the table definition but unused for bundles, so just set it to the valid ID. 211 // in the table definition but unused for bundles, so just set it to the valid ID.
212 section.AddTuple(new WixDependencyProviderTuple(sourceLineNumbers, id) 212 section.AddSymbol(new WixDependencyProviderSymbol(sourceLineNumbers, id)
213 { 213 {
214 ComponentRef = id.Id, 214 ComponentRef = id.Id,
215 ProviderKey = providerKey, 215 ProviderKey = providerKey,
@@ -290,7 +290,7 @@ namespace WixToolset.Dependency
290 else if (PackageType.None == packageType) 290 else if (PackageType.None == packageType)
291 { 291 {
292 // Make sure the ProductCode is authored and set the key. 292 // Make sure the ProductCode is authored and set the key.
293 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.Property, "ProductCode"); 293 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.Property, "ProductCode");
294 key = "!(bind.property.ProductCode)"; 294 key = "!(bind.property.ProductCode)";
295 } 295 }
296 296
@@ -344,7 +344,7 @@ namespace WixToolset.Dependency
344 344
345 if (!this.Messaging.EncounteredError) 345 if (!this.Messaging.EncounteredError)
346 { 346 {
347 var tuple = section.AddTuple(new WixDependencyProviderTuple(sourceLineNumbers, id) 347 var symbol = section.AddSymbol(new WixDependencyProviderSymbol(sourceLineNumbers, id)
348 { 348 {
349 ComponentRef = parentId, 349 ComponentRef = parentId,
350 ProviderKey = key, 350 ProviderKey = key,
@@ -352,12 +352,12 @@ namespace WixToolset.Dependency
352 352
353 if (!String.IsNullOrEmpty(version)) 353 if (!String.IsNullOrEmpty(version))
354 { 354 {
355 tuple.Version = version; 355 symbol.Version = version;
356 } 356 }
357 357
358 if (!String.IsNullOrEmpty(displayName)) 358 if (!String.IsNullOrEmpty(displayName))
359 { 359 {
360 tuple.DisplayName = displayName; 360 symbol.DisplayName = displayName;
361 } 361 }
362 362
363 if (PackageType.None == packageType) 363 if (PackageType.None == packageType)
@@ -379,18 +379,18 @@ namespace WixToolset.Dependency
379 var root = RegistryRootType.MachineUser; 379 var root = RegistryRootType.MachineUser;
380 380
381 var value = "[ProductCode]"; 381 var value = "[ProductCode]";
382 this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, root, keyProvides, null, value, parentId, false); 382 this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, root, keyProvides, null, value, parentId, false);
383 383
384 value = !String.IsNullOrEmpty(version) ? version : "[ProductVersion]"; 384 value = !String.IsNullOrEmpty(version) ? version : "[ProductVersion]";
385 var versionRegistryTuple = 385 var versionRegistrySymbol =
386 this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, root, keyProvides, "Version", value, parentId, false); 386 this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, root, keyProvides, "Version", value, parentId, false);
387 387
388 value = !String.IsNullOrEmpty(displayName) ? displayName : "[ProductName]"; 388 value = !String.IsNullOrEmpty(displayName) ? displayName : "[ProductName]";
389 this.ParseHelper.CreateRegistryTuple(section, sourceLineNumbers, root, keyProvides, "DisplayName", value, parentId, false); 389 this.ParseHelper.CreateRegistrySymbol(section, sourceLineNumbers, root, keyProvides, "DisplayName", value, parentId, false);
390 390
391 // Use the Version registry value and use that as a potential key path. 391 // Use the Version registry value and use that as a potential key path.
392 keyPath = this.CreateComponentKeyPath(); 392 keyPath = this.CreateComponentKeyPath();
393 keyPath.Id = versionRegistryTuple.Id; 393 keyPath.Id = versionRegistrySymbol.Id;
394 keyPath.Explicit = false; 394 keyPath.Explicit = false;
395 keyPath.Type = PossibleKeyPathType.Registry; 395 keyPath.Type = PossibleKeyPathType.Registry;
396 } 396 }
@@ -494,7 +494,7 @@ namespace WixToolset.Dependency
494 this.AddReferenceToWixDependencyRequire(section, sourceLineNumbers); 494 this.AddReferenceToWixDependencyRequire(section, sourceLineNumbers);
495 } 495 }
496 496
497 var tuple = section.AddTuple(new WixDependencyTuple(sourceLineNumbers, id) 497 var symbol = section.AddSymbol(new WixDependencySymbol(sourceLineNumbers, id)
498 { 498 {
499 ProviderKey = providerKey, 499 ProviderKey = providerKey,
500 MinVersion = minVersion, 500 MinVersion = minVersion,
@@ -503,13 +503,13 @@ namespace WixToolset.Dependency
503 503
504 if (0 != attributes) 504 if (0 != attributes)
505 { 505 {
506 tuple.Attributes = attributes; 506 symbol.Attributes = attributes;
507 } 507 }
508 508
509 // Create the relationship between this WixDependency tuple and the WixDependencyProvider tuple. 509 // Create the relationship between this WixDependency symbol and the WixDependencyProvider symbol.
510 if (!String.IsNullOrEmpty(providerId)) 510 if (!String.IsNullOrEmpty(providerId))
511 { 511 {
512 section.AddTuple(new WixDependencyRefTuple(sourceLineNumbers) 512 section.AddSymbol(new WixDependencyRefSymbol(sourceLineNumbers)
513 { 513 {
514 WixDependencyProviderRef = providerId, 514 WixDependencyProviderRef = providerId,
515 WixDependencyRef = id.Id, 515 WixDependencyRef = id.Id,
@@ -565,10 +565,10 @@ namespace WixToolset.Dependency
565 } 565 }
566 566
567 // Create a link dependency on the row that contains information we'll need during bind. 567 // Create a link dependency on the row that contains information we'll need during bind.
568 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, DependencyTupleDefinitions.WixDependency, id); 568 this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, DependencySymbolDefinitions.WixDependency, id);
569 569
570 // Create the relationship between the WixDependency row and the parent WixDependencyProvider row. 570 // Create the relationship between the WixDependency row and the parent WixDependencyProvider row.
571 section.AddTuple(new WixDependencyRefTuple(sourceLineNumbers) 571 section.AddSymbol(new WixDependencyRefSymbol(sourceLineNumbers)
572 { 572 {
573 WixDependencyProviderRef = providerId, 573 WixDependencyProviderRef = providerId,
574 WixDependencyRef = id, 574 WixDependencyRef = id,