diff options
Diffstat (limited to 'src/WixTestTools/BundleVerifier.cs')
-rw-r--r-- | src/WixTestTools/BundleVerifier.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/WixTestTools/BundleVerifier.cs b/src/WixTestTools/BundleVerifier.cs index 293da560..984df169 100644 --- a/src/WixTestTools/BundleVerifier.cs +++ b/src/WixTestTools/BundleVerifier.cs | |||
@@ -73,10 +73,11 @@ namespace WixTestTools | |||
73 | public bool TryGetRegistration(out BundleRegistration registration) | 73 | public bool TryGetRegistration(out BundleRegistration registration) |
74 | { | 74 | { |
75 | var bundleSymbol = this.GetBundleSymbol(); | 75 | var bundleSymbol = this.GetBundleSymbol(); |
76 | var x64 = bundleSymbol.Platform != Platform.X86; | ||
76 | var bundleId = bundleSymbol.BundleId; | 77 | var bundleId = bundleSymbol.BundleId; |
77 | if (bundleSymbol.PerMachine) | 78 | if (bundleSymbol.PerMachine) |
78 | { | 79 | { |
79 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, out registration); | 80 | return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration); |
80 | } | 81 | } |
81 | else | 82 | else |
82 | { | 83 | { |
@@ -132,9 +133,9 @@ namespace WixTestTools | |||
132 | Assert.True(Directory.Exists(cachePath)); | 133 | Assert.True(Directory.Exists(cachePath)); |
133 | } | 134 | } |
134 | 135 | ||
135 | public void VerifyExeTestRegistryRootDeleted(string name) | 136 | public void VerifyExeTestRegistryRootDeleted(string name, bool x64 = false) |
136 | { | 137 | { |
137 | using var testRegistryRoot = this.TestContext.GetTestRegistryRoot(name); | 138 | using var testRegistryRoot = this.TestContext.GetTestRegistryRoot(x64, name); |
138 | if (testRegistryRoot != null) | 139 | if (testRegistryRoot != null) |
139 | { | 140 | { |
140 | var actualValue = testRegistryRoot.GetValue("Version") as string; | 141 | var actualValue = testRegistryRoot.GetValue("Version") as string; |
@@ -142,9 +143,9 @@ namespace WixTestTools | |||
142 | } | 143 | } |
143 | } | 144 | } |
144 | 145 | ||
145 | public void VerifyExeTestRegistryValue(string name, string expectedValue) | 146 | public void VerifyExeTestRegistryValue(string name, string expectedValue, bool x64 = false) |
146 | { | 147 | { |
147 | using (var root = this.TestContext.GetTestRegistryRoot(name)) | 148 | using (var root = this.TestContext.GetTestRegistryRoot(x64, name)) |
148 | { | 149 | { |
149 | Assert.NotNull(root); | 150 | Assert.NotNull(root); |
150 | var actualValue = root.GetValue("Version") as string; | 151 | var actualValue = root.GetValue("Version") as string; |