diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-13 10:13:10 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-13 13:13:48 -0500 |
| commit | be43682720cf9c238aa1efba5940b8e2279c5bc4 (patch) | |
| tree | bec1c31030fdd961e5dfd8f0954e6b8d3274bee6 /src/test | |
| parent | 866413ec39c573a50b7ec0753f643918a1939dee (diff) | |
| download | wix-be43682720cf9c238aa1efba5940b8e2279c5bc4.tar.gz wix-be43682720cf9c238aa1efba5940b8e2279c5bc4.tar.bz2 wix-be43682720cf9c238aa1efba5940b8e2279c5bc4.zip | |
Try to improve fields of bundle symbols.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/burn/WixTestTools/BundleVerifier.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs index a5dbe0ec..56044c5f 100644 --- a/src/test/burn/WixTestTools/BundleVerifier.cs +++ b/src/test/burn/WixTestTools/BundleVerifier.cs | |||
| @@ -120,7 +120,7 @@ namespace WixTestTools | |||
| 120 | var intermediate = Intermediate.Load(wixOutput); | 120 | var intermediate = Intermediate.Load(wixOutput); |
| 121 | var section = intermediate.Sections.Single(); | 121 | var section = intermediate.Sections.Single(); |
| 122 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); | 122 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); |
| 123 | var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == YesNoDefaultType.Yes); | 123 | var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == true); |
| 124 | if (Directory.Exists(cachePath)) | 124 | if (Directory.Exists(cachePath)) |
| 125 | { | 125 | { |
| 126 | Directory.Delete(cachePath, true); | 126 | Directory.Delete(cachePath, true); |
| @@ -133,7 +133,7 @@ namespace WixTestTools | |||
| 133 | var intermediate = Intermediate.Load(wixOutput); | 133 | var intermediate = Intermediate.Load(wixOutput); |
| 134 | var section = intermediate.Sections.Single(); | 134 | var section = intermediate.Sections.Single(); |
| 135 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); | 135 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); |
| 136 | var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == YesNoDefaultType.Yes); | 136 | var cachePath = this.GetPackageCachePathForCacheId(packageSymbol.CacheId, packageSymbol.PerMachine == true); |
| 137 | Assert.Equal(cached, Directory.Exists(cachePath)); | 137 | Assert.Equal(cached, Directory.Exists(cachePath)); |
| 138 | } | 138 | } |
| 139 | 139 | ||
| @@ -144,7 +144,7 @@ namespace WixTestTools | |||
| 144 | var section = intermediate.Sections.Single(); | 144 | var section = intermediate.Sections.Single(); |
| 145 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); | 145 | var packageSymbol = section.Symbols.OfType<WixBundlePackageSymbol>().Single(p => p.Id.Id == packageId); |
| 146 | var providerSymbol = section.Symbols.OfType<WixDependencyProviderSymbol>().Single(p => p.ParentRef == packageId); | 146 | var providerSymbol = section.Symbols.OfType<WixDependencyProviderSymbol>().Single(p => p.ParentRef == packageId); |
| 147 | var registryRoot = packageSymbol.PerMachine == YesNoDefaultType.Yes ? Registry.LocalMachine : Registry.CurrentUser; | 147 | var registryRoot = packageSymbol.PerMachine == true ? Registry.LocalMachine : Registry.CurrentUser; |
| 148 | var subkeyPath = Path.Combine(DependencyRegistryRoot, providerSymbol.ProviderKey); | 148 | var subkeyPath = Path.Combine(DependencyRegistryRoot, providerSymbol.ProviderKey); |
| 149 | using var registryKey = registryRoot.OpenSubKey(subkeyPath); | 149 | using var registryKey = registryRoot.OpenSubKey(subkeyPath); |
| 150 | if (registryKey != null) | 150 | if (registryKey != null) |