aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-01-21 10:43:11 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-01-21 17:29:12 -0600
commit89439409a0776dce25216fcef360856ba81a86da (patch)
tree5b350479ed3590c86beccf7ad0ec821008828235
parent2a4c1fc0413228f4d4aca0c981409edaed7b5ee5 (diff)
downloadwix-89439409a0776dce25216fcef360856ba81a86da.tar.gz
wix-89439409a0776dce25216fcef360856ba81a86da.tar.bz2
wix-89439409a0776dce25216fcef360856ba81a86da.zip
Fix some minor bugs.
Diffstat
-rw-r--r--src/burn/engine/msiengine.cpp2
-rw-r--r--src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs42
-rw-r--r--src/wix/WixToolset.Core/Compiler_Bundle.cs2
3 files changed, 23 insertions, 23 deletions
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index e3a80c9f..c8f68184 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -774,7 +774,7 @@ extern "C" HRESULT MsiEngineDetectCompatiblePackage(
774 } 774 }
775 775
776 hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczVersion); 776 hr = WiuGetProductInfoEx(wzCompatibleProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczVersion);
777 if (HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) == hr || HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY) == hr) 777 if (HRESULT_FROM_WIN32(ERROR_UNKNOWN_PRODUCT) == hr || HRESULT_FROM_WIN32(ERROR_UNKNOWN_PROPERTY) == hr || E_INVALIDARG == hr)
778 { 778 {
779 ExitFunction1(hr = S_OK); 779 ExitFunction1(hr = S_OK);
780 } 780 }
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
index 825160c5..e95e141c 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+++ b/src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
@@ -189,14 +189,14 @@ namespace WixToolsetTest.BurnE2E
189 var testRegistryValue = "PackageA"; 189 var testRegistryValue = "PackageA";
190 190
191 var packageA = this.CreatePackageInstaller("PackageAv1"); 191 var packageA = this.CreatePackageInstaller("PackageAv1");
192 var packageBv1 = this.CreatePackageInstaller("PackageBv1"); 192 var packageEv1 = this.CreatePackageInstaller("PackageEv1");
193 var packageBv101 = this.CreatePackageInstaller("PackageBv1_0_1"); 193 var packageEv101 = this.CreatePackageInstaller("PackageEv1_0_1");
194 var bundleJ = this.CreateBundleInstaller("BundleJ"); 194 var bundleJ = this.CreateBundleInstaller("BundleJ");
195 var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch"); 195 var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch");
196 196
197 packageA.VerifyInstalled(false); 197 packageA.VerifyInstalled(false);
198 packageBv1.VerifyInstalled(false); 198 packageEv1.VerifyInstalledWithVersion(false);
199 packageBv101.VerifyInstalled(false); 199 packageEv101.VerifyInstalledWithVersion(false);
200 200
201 bundleJ.Install(); 201 bundleJ.Install();
202 if (this.SupportAddonAndPatchRelatedBundles) 202 if (this.SupportAddonAndPatchRelatedBundles)
@@ -205,7 +205,7 @@ namespace WixToolsetTest.BurnE2E
205 205
206 packageA.VerifyInstalled(true); 206 packageA.VerifyInstalled(true);
207 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion); 207 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
208 packageBv1.VerifyInstalled(true); 208 packageEv1.VerifyInstalledWithVersion(true);
209 } 209 }
210 210
211 bundleJ_Patch.Install(); 211 bundleJ_Patch.Install();
@@ -215,8 +215,8 @@ namespace WixToolsetTest.BurnE2E
215 215
216 packageA.VerifyInstalled(true); 216 packageA.VerifyInstalled(true);
217 packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion); 217 packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
218 packageBv1.VerifyInstalled(false); 218 packageEv1.VerifyInstalledWithVersion(false);
219 packageBv101.VerifyInstalled(true); 219 packageEv101.VerifyInstalledWithVersion(true);
220 } 220 }
221 221
222 bundleJ.Uninstall(); 222 bundleJ.Uninstall();
@@ -226,8 +226,8 @@ namespace WixToolsetTest.BurnE2E
226 bundleJ_Patch.VerifyUnregisteredAndRemovedFromPackageCache(); 226 bundleJ_Patch.VerifyUnregisteredAndRemovedFromPackageCache();
227 227
228 packageA.VerifyInstalled(false); 228 packageA.VerifyInstalled(false);
229 packageBv1.VerifyInstalled(false); 229 packageEv1.VerifyInstalledWithVersion(false);
230 packageBv101.VerifyInstalled(false); 230 packageEv101.VerifyInstalledWithVersion(false);
231 } 231 }
232 } 232 }
233 233
@@ -239,14 +239,14 @@ namespace WixToolsetTest.BurnE2E
239 var testRegistryValue = "PackageA"; 239 var testRegistryValue = "PackageA";
240 240
241 var packageA = this.CreatePackageInstaller("PackageAv1"); 241 var packageA = this.CreatePackageInstaller("PackageAv1");
242 var packageBv1 = this.CreatePackageInstaller("PackageBv1"); 242 var packageEv1 = this.CreatePackageInstaller("PackageEv1");
243 var packageBv101 = this.CreatePackageInstaller("PackageBv1_0_1"); 243 var packageEv101 = this.CreatePackageInstaller("PackageEv1_0_1");
244 var bundleJ = this.CreateBundleInstaller("BundleJ"); 244 var bundleJ = this.CreateBundleInstaller("BundleJ");
245 var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch"); 245 var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch");
246 246
247 packageA.VerifyInstalled(false); 247 packageA.VerifyInstalled(false);
248 packageBv1.VerifyInstalled(false); 248 packageEv1.VerifyInstalledWithVersion(false);
249 packageBv101.VerifyInstalled(false); 249 packageEv101.VerifyInstalledWithVersion(false);
250 250
251 bundleJ.Install(); 251 bundleJ.Install();
252 if (this.SupportAddonAndPatchRelatedBundles) 252 if (this.SupportAddonAndPatchRelatedBundles)
@@ -255,7 +255,7 @@ namespace WixToolsetTest.BurnE2E
255 255
256 packageA.VerifyInstalled(true); 256 packageA.VerifyInstalled(true);
257 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion); 257 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
258 packageBv1.VerifyInstalled(true); 258 packageEv1.VerifyInstalledWithVersion(true);
259 } 259 }
260 260
261 bundleJ_Patch.Install(); 261 bundleJ_Patch.Install();
@@ -265,8 +265,8 @@ namespace WixToolsetTest.BurnE2E
265 265
266 packageA.VerifyInstalled(true); 266 packageA.VerifyInstalled(true);
267 packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion); 267 packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
268 packageBv1.VerifyInstalled(false); 268 packageEv1.VerifyInstalledWithVersion(false);
269 packageBv101.VerifyInstalled(true); 269 packageEv101.VerifyInstalledWithVersion(true);
270 } 270 }
271 271
272 bundleJ_Patch.Uninstall(); 272 bundleJ_Patch.Uninstall();
@@ -276,8 +276,8 @@ namespace WixToolsetTest.BurnE2E
276 276
277 packageA.VerifyInstalled(true); 277 packageA.VerifyInstalled(true);
278 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion); 278 packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
279 packageBv1.VerifyInstalled(true); 279 packageEv1.VerifyInstalledWithVersion(true);
280 packageBv101.VerifyInstalled(false); 280 packageEv101.VerifyInstalledWithVersion(false);
281 } 281 }
282 282
283 bundleJ.Uninstall(); 283 bundleJ.Uninstall();
@@ -286,8 +286,8 @@ namespace WixToolsetTest.BurnE2E
286 bundleJ.VerifyUnregisteredAndRemovedFromPackageCache(); 286 bundleJ.VerifyUnregisteredAndRemovedFromPackageCache();
287 287
288 packageA.VerifyInstalled(false); 288 packageA.VerifyInstalled(false);
289 packageBv1.VerifyInstalled(false); 289 packageEv1.VerifyInstalledWithVersion(false);
290 packageBv101.VerifyInstalled(false); 290 packageEv101.VerifyInstalledWithVersion(false);
291 } 291 }
292 } 292 }
293 293
@@ -490,7 +490,7 @@ namespace WixToolsetTest.BurnE2E
490 490
491 var packageA = this.CreatePackageInstaller("PackageAv1"); 491 var packageA = this.CreatePackageInstaller("PackageAv1");
492 var packageB = this.CreatePackageInstaller("PackageBv1"); 492 var packageB = this.CreatePackageInstaller("PackageBv1");
493 var bundleF = this.CreateBundleInstaller("BundleJ"); 493 var bundleF = this.CreateBundleInstaller("BundleF");
494 var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1"); 494 var bundleF_PatchAv101 = this.CreateBundleInstaller("BundleF_PatchAv1_0_1");
495 var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2"); 495 var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2");
496 496
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 851561d1..c8b78243 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -2509,7 +2509,7 @@ namespace WixToolset.Core
2509 } 2509 }
2510 else 2510 else
2511 { 2511 {
2512 this.Core.ParseExtensionAttribute(node, attrib); 2512 extensionAttributes.Add(attrib);
2513 } 2513 }
2514 } 2514 }
2515 2515
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-19 19:11:38 +0000