From 44a13ff738267fc7e1147e46cd86df6cdbba7bb3 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
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 ++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/ext/NetFx/test/WixToolsetTest.Netfx/TestData/UsingNetFxSearches/BundleLatest.wxs

(limited to 'src/ext/NetFx')

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 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <Bundle Name="NetFxPackageGroup481" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="{1A204524-03F4-4641-BDF3-2A272A34A888}">
+        <BootstrapperApplication>
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+        </BootstrapperApplication>
+
+        <util:RegistrySearchRef Id="WixNetFramework4xInstalledRelease" />
+
+        <Chain>
+            <PackageGroupRef Id="NetFx481RedistAsPrereq" />
+        </Chain>
+    </Bundle>
+</Wix>
-- 
cgit v1.2.3-55-g6feb