Fix some minor bugs.
Sean Hall committed
Jan 21, 2022 at 10:43 UTC
89439409a0776dce25216fcef360856ba81a86da
3 files changed
+23
-23
src/burn/engine/msiengine.cpp
+1
-1
@@ -774,7 +774,7 @@ extern "C" HRESULT MsiEngineDetectCompatiblePackage(
774
}
775
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
{
779
ExitFunction1(hr = S_OK);
780
}
src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
+21
-21
@@ -189,14 +189,14 @@ namespace WixToolsetTest.BurnE2E
189
var testRegistryValue = "PackageA";
190
191
var packageA = this.CreatePackageInstaller("PackageAv1");
192
- var packageBv1 = this.CreatePackageInstaller("PackageBv1");
193
- var packageBv101 = this.CreatePackageInstaller("PackageBv1_0_1");
192
+ var packageEv1 = this.CreatePackageInstaller("PackageEv1");
193
+ var packageEv101 = this.CreatePackageInstaller("PackageEv1_0_1");
194
var bundleJ = this.CreateBundleInstaller("BundleJ");
195
var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch");
196
197
packageA.VerifyInstalled(false);
198
- packageBv1.VerifyInstalled(false);
199
- packageBv101.VerifyInstalled(false);
198
+ packageEv1.VerifyInstalledWithVersion(false);
199
+ packageEv101.VerifyInstalledWithVersion(false);
200
201
bundleJ.Install();
202
if (this.SupportAddonAndPatchRelatedBundles)
@@ -205,7 +205,7 @@ namespace WixToolsetTest.BurnE2E
205
206
packageA.VerifyInstalled(true);
207
packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
208
- packageBv1.VerifyInstalled(true);
208
+ packageEv1.VerifyInstalledWithVersion(true);
209
}
210
211
bundleJ_Patch.Install();
@@ -215,8 +215,8 @@ namespace WixToolsetTest.BurnE2E
215
216
packageA.VerifyInstalled(true);
217
packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
218
- packageBv1.VerifyInstalled(false);
219
- packageBv101.VerifyInstalled(true);
218
+ packageEv1.VerifyInstalledWithVersion(false);
219
+ packageEv101.VerifyInstalledWithVersion(true);
220
}
221
222
bundleJ.Uninstall();
@@ -226,8 +226,8 @@ namespace WixToolsetTest.BurnE2E
226
bundleJ_Patch.VerifyUnregisteredAndRemovedFromPackageCache();
227
228
packageA.VerifyInstalled(false);
229
- packageBv1.VerifyInstalled(false);
230
- packageBv101.VerifyInstalled(false);
229
+ packageEv1.VerifyInstalledWithVersion(false);
230
+ packageEv101.VerifyInstalledWithVersion(false);
231
}
232
}
233
@@ -239,14 +239,14 @@ namespace WixToolsetTest.BurnE2E
239
var testRegistryValue = "PackageA";
240
241
var packageA = this.CreatePackageInstaller("PackageAv1");
242
- var packageBv1 = this.CreatePackageInstaller("PackageBv1");
243
- var packageBv101 = this.CreatePackageInstaller("PackageBv1_0_1");
242
+ var packageEv1 = this.CreatePackageInstaller("PackageEv1");
243
+ var packageEv101 = this.CreatePackageInstaller("PackageEv1_0_1");
244
var bundleJ = this.CreateBundleInstaller("BundleJ");
245
var bundleJ_Patch = this.CreateBundleInstaller("BundleJ_Patch");
246
247
packageA.VerifyInstalled(false);
248
- packageBv1.VerifyInstalled(false);
249
- packageBv101.VerifyInstalled(false);
248
+ packageEv1.VerifyInstalledWithVersion(false);
249
+ packageEv101.VerifyInstalledWithVersion(false);
250
251
bundleJ.Install();
252
if (this.SupportAddonAndPatchRelatedBundles)
@@ -255,7 +255,7 @@ namespace WixToolsetTest.BurnE2E
255
256
packageA.VerifyInstalled(true);
257
packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
258
- packageBv1.VerifyInstalled(true);
258
+ packageEv1.VerifyInstalledWithVersion(true);
259
}
260
261
bundleJ_Patch.Install();
@@ -265,8 +265,8 @@ namespace WixToolsetTest.BurnE2E
265
266
packageA.VerifyInstalled(true);
267
packageA.VerifyTestRegistryValue(testRegistryValue, patchedVersion);
268
- packageBv1.VerifyInstalled(false);
269
- packageBv101.VerifyInstalled(true);
268
+ packageEv1.VerifyInstalledWithVersion(false);
269
+ packageEv101.VerifyInstalledWithVersion(true);
270
}
271
272
bundleJ_Patch.Uninstall();
@@ -276,8 +276,8 @@ namespace WixToolsetTest.BurnE2E
276
277
packageA.VerifyInstalled(true);
278
packageA.VerifyTestRegistryValue(testRegistryValue, originalVersion);
279
- packageBv1.VerifyInstalled(true);
280
- packageBv101.VerifyInstalled(false);
279
+ packageEv1.VerifyInstalledWithVersion(true);
280
+ packageEv101.VerifyInstalledWithVersion(false);
281
}
282
283
bundleJ.Uninstall();
@@ -286,8 +286,8 @@ namespace WixToolsetTest.BurnE2E
286
bundleJ.VerifyUnregisteredAndRemovedFromPackageCache();
287
288
packageA.VerifyInstalled(false);
289
- packageBv1.VerifyInstalled(false);
290
- packageBv101.VerifyInstalled(false);
289
+ packageEv1.VerifyInstalledWithVersion(false);
290
+ packageEv101.VerifyInstalledWithVersion(false);
291
}
292
}
293
@@ -490,7 +490,7 @@ namespace WixToolsetTest.BurnE2E
490
491
var packageA = this.CreatePackageInstaller("PackageAv1");
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");
495
var bundleF_PatchAv102 = this.CreateBundleInstaller("BundleF_PatchAv1_0_2");
496
src/wix/WixToolset.Core/Compiler_Bundle.cs
+1
-1
@@ -2509,7 +2509,7 @@ namespace WixToolset.Core
2509
}
2510
else
2511
{
2512
- this.Core.ParseExtensionAttribute(node, attrib);
2512
+ extensionAttributes.Add(attrib);
2513
}
2514
}
2515