From 44a13ff738267fc7e1147e46cd86df6cdbba7bb3 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 1 Jan 2024 22:07:46 -0500 Subject: Remove warning for `Wix` bundle variable prefix. It's a bit overzealous. Fixes https://github.com/wixtoolset/issues/issues/7579. --- .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs | 35 ++++++++++++++++ .../TestData/UsingNetFxSearches/BundleLatest.wxs | 13 ++++++ .../BundleUsingDiscouragedVariableNames.wxs | 19 --------- .../WixToolsetTest.Util/UtilExtensionFixture.cs | 47 ---------------------- 4 files changed, 48 insertions(+), 66 deletions(-) create mode 100644 src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNetFxSearches/BundleLatest.wxs delete mode 100644 src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingDiscouragedVariableNames.wxs (limited to 'src/ext') diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs index bb3b7b35..27a19116 100644 --- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs @@ -108,6 +108,41 @@ namespace WixToolsetTest.Netfx } } + [Fact] + public void CanBuildUsingNetFxSearches() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\UsingNetFxSearches"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var extensionResult = WixRunner.Execute(warningsAsErrors: true, new[] + { + "extension", "add", + "WixToolset.Bal.wixext", + "extension", "add", + "WixToolset.Util.wixext", + }); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "BundleLatest.wxs"), + "-ext", "WixToolset.Bal.wixext", + "-ext", "WixToolset.Util.wixext", + "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + "-arch", "x64", + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + } + } + [Fact] public void CanBuildUsingNativeImage() { diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNetFxSearches/BundleLatest.wxs b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNetFxSearches/BundleLatest.wxs new file mode 100644 index 00000000..1ee62d4b --- /dev/null +++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNetFxSearches/BundleLatest.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingDiscouragedVariableNames.wxs b/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingDiscouragedVariableNames.wxs deleted file mode 100644 index 68f46af8..00000000 --- a/src/ext/Util/test/WixToolsetTest.Util/TestData/BundleWithSearches/BundleUsingDiscouragedVariableNames.wxs +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - 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 @@ -470,53 +470,6 @@ namespace WixToolsetTest.Util }, results.OrderBy(s => s).ToArray()); } - [Fact] - public void CanBuildBundleWithWarningsWithSearchesUsingDiscouragedVariableNames() - { - var folder = TestData.Get("TestData", "BundleWithSearches"); - var rootFolder = TestData.Get(); - var wixext = Path.Combine(rootFolder, "WixToolset.Util.wixext.dll"); - - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var bundlePath = Path.Combine(baseFolder, @"bin\test.exe"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var result = WixRunner.Execute(false, new[] - { - "build", - Path.Combine(folder, "BundleUsingDiscouragedVariableNames.wxs"), - "-ext", wixext, - "-loc", Path.Combine(folder, "Bundle.en-us.wxl"), - "-bindpath", Path.Combine(folder, "data"), - "-intermediateFolder", intermediateFolder, - "-o", bundlePath, - }); - - var messages = result.Messages.Select(m => m.ToString()).ToList(); - messages.Sort(); - - WixAssert.CompareLineByLine(new[] - { - "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.", - }, messages.ToArray()); - - result.AssertSuccess(); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - 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]"); - WixAssert.CompareLineByLine(new[] - { - @"", - }, utilSearches); - } - } - [Fact] public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames() { -- cgit v1.2.3-55-g6feb