diff options
author | Bob Arnson <bob@firegiant.com> | 2024-01-01 22:07:46 -0500 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2024-01-01 22:53:44 -0500 |
commit | 44a13ff738267fc7e1147e46cd86df6cdbba7bb3 (patch) | |
tree | 3a7451f479e84a666605ab74ac2ee44d94cf576b /src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |
parent | 59ca47751ea1d59198e01b7e6a0a3d9fc144088e (diff) | |
download | wix-44a13ff738267fc7e1147e46cd86df6cdbba7bb3.tar.gz wix-44a13ff738267fc7e1147e46cd86df6cdbba7bb3.tar.bz2 wix-44a13ff738267fc7e1147e46cd86df6cdbba7bb3.zip |
Remove warning for `Wix` bundle variable prefix.
It's a bit overzealous.
Fixes https://github.com/wixtoolset/issues/issues/7579.
Diffstat (limited to 'src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs')
-rw-r--r-- | src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 7cc3a6d4..06e70dcf 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs | |||
@@ -471,53 +471,6 @@ namespace WixToolsetTest.Util | |||
471 | } | 471 | } |
472 | 472 | ||
473 | [Fact] | 473 | [Fact] |
474 | public void CanBuildBundleWithWarningsWithSearchesUsingDiscouragedVariableNames() | ||
475 | { | ||
476 | var folder = TestData.Get("TestData", "BundleWithSearches"); | ||
477 | var rootFolder = TestData.Get(); | ||
478 | var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll"); | ||
479 | |||
480 | using (var fs = new DisposableFileSystem()) | ||
481 | { | ||
482 | var baseFolder = fs.GetFolder(); | ||
483 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
484 | var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); | ||
485 | var baFolderPath = Path.Combine(baseFolder, "ba"); | ||
486 | var extractFolderPath = Path.Combine(baseFolder, "extract"); | ||
487 | |||
488 | var result = WixRunner.Execute(false, new[] | ||
489 | { | ||
490 | "build", | ||
491 | Path.Combine(folder, "BundleUsingDiscouragedVariableNames.wxs"), | ||
492 | "-ext", wixext, | ||
493 | "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), | ||
494 | "-bindpath", Path.Combine(folder, "data"), | ||
495 | "-intermediateFolder", intermediateFolder, | ||
496 | "-o", bundlePath, | ||
497 | }); | ||
498 | |||
499 | var messages = result.Messages.Select(m => m.ToString()).ToList(); | ||
500 | messages.Sort(); | ||
501 | |||
502 | WixAssert.CompareLineByLine(new[] | ||
503 | { | ||
504 | "The *Search/@Variable attribute's value begins with the reserved prefix 'Wix'. Some prefixes are reserved by the WiX toolset for well-known values. Change your attribute's value to not begin with the same prefix.", | ||
505 | }, messages.ToArray()); | ||
506 | |||
507 | result.AssertSuccess(); | ||
508 | |||
509 | var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); | ||
510 | extractResult.AssertSuccess(); | ||
511 | |||
512 | var utilSearches = extractResult.GetManifestTestXmlLines("/burn:BurnManifest/*[self::burn:ExtensionSearch or self::burn:DirectorySearch or self::burn:FileSearch or self::burn:MsiProductSearch or self::burn:RegistrySearch]"); | ||
513 | WixAssert.CompareLineByLine(new[] | ||
514 | { | ||
515 | @"<RegistrySearch Id='wrsvJmsaXS39nKFUh9CVvRE6SSC4qk' Variable='WixCustomVariable' Root='HKLM' Key='SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Custom' Value='Release' Win64='yes' Type='value' VariableType='string' />", | ||
516 | }, utilSearches); | ||
517 | } | ||
518 | } | ||
519 | |||
520 | [Fact] | ||
521 | public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames() | 474 | public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames() |
522 | { | 475 | { |
523 | var folder = TestData.Get("TestData", "BundleWithSearches"); | 476 | var folder = TestData.Get("TestData", "BundleWithSearches"); |