diff options
| author | Rob Mensching <rob@firegiant.com> | 2024-12-29 18:01:20 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2024-12-29 18:01:20 -0800 |
| commit | 8dd2ee866dee2b25c67175c2ea88fa34e4568c5e (patch) | |
| tree | 3b40f8e70c351a00cc68190bbef148e4edb2ee54 /src/test/burn/WixTestTools | |
| parent | bd4559125099e91b8d2de9429e7cbf749e050597 (diff) | |
| download | wix-8dd2ee866dee2b25c67175c2ea88fa34e4568c5e.tar.gz wix-8dd2ee866dee2b25c67175c2ea88fa34e4568c5e.tar.bz2 wix-8dd2ee866dee2b25c67175c2ea88fa34e4568c5e.zip | |
Rename "bundle id" concept to "bundle code"
The "bundle id" always had more in common with the PackageCode from the Windows
Installer. With the introduction of an actual Id attribute on the Bundle
element, there is potential for confusion, so there is finally real motivation
to rename "bundle id" to "bundle code".
Diffstat (limited to 'src/test/burn/WixTestTools')
| -rw-r--r-- | src/test/burn/WixTestTools/BundleVerifier.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs index b750c80c..0819805d 100644 --- a/src/test/burn/WixTestTools/BundleVerifier.cs +++ b/src/test/burn/WixTestTools/BundleVerifier.cs | |||
| @@ -62,7 +62,7 @@ namespace WixTestTools | |||
| 62 | public string GetExpectedCachedBundlePath() | 62 | public string GetExpectedCachedBundlePath() |
| 63 | { | 63 | { |
| 64 | var bundleSymbol = this.GetBundleSymbol(); | 64 | var bundleSymbol = this.GetBundleSymbol(); |
| 65 | var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine); | 65 | var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine); |
| 66 | return Path.Combine(cachePath, Path.GetFileName(this.Bundle)); | 66 | return Path.Combine(cachePath, Path.GetFileName(this.Bundle)); |
| 67 | } | 67 | } |
| 68 | 68 | ||
| @@ -107,14 +107,14 @@ namespace WixTestTools | |||
| 107 | { | 107 | { |
| 108 | var bundleSymbol = this.GetBundleSymbol(); | 108 | var bundleSymbol = this.GetBundleSymbol(); |
| 109 | var x64 = bundleSymbol.Platform != Platform.X86; | 109 | var x64 = bundleSymbol.Platform != Platform.X86; |
| 110 | var bundleId = bundleSymbol.BundleId; | 110 | var bundleCode = bundleSymbol.BundleCode; |
| 111 | if (bundleSymbol.PerMachine) | 111 | if (bundleSymbol.PerMachine) |
| 112 | { | 112 | { |
| 113 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration); | 113 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration); |
| 114 | } | 114 | } |
| 115 | else | 115 | else |
| 116 | { | 116 | { |
| 117 | return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration); | 117 | return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration); |
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | 120 | ||
