2 files changed, 48 insertions, 0 deletions

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
@@ -109,6 +109,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()
         {
             var folder = TestData.Get(@"TestData\UsingNativeImage");
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>