9 files changed, 160 insertions, 7 deletions

diff --git a/nuget.config b/nuget.config
index dd67462a..0d7536b8 100644
--- a/nuget.config
+++ b/nuget.config
@@ -4,6 +4,7 @@
     <clear />
     <add key="wixtoolset-balutil" value="https://ci.appveyor.com/nuget/wixtoolset-balutil" />
     <add key="wixtoolset-bal-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-bal-wixext" />
+    <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
     <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
     <add key="wixtoolset-netfx-wixext" value="https://ci.appveyor.com/nuget/wixtoolset-netfx-wixext" />
     <add key="wixtoolset-tools" value="https://ci.appveyor.com/nuget/wixtoolset-tools" />
diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..45127b23
--- /dev/null
+++ b/src/TestData/BasicFunctionality/BundleA/BundleA.wixproj
@@ -0,0 +1,12 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxi b/src/TestData/BasicFunctionality/BundleA/BundleA.wxi
new file mode 100644
index 00000000..0bad694e
--- /dev/null
+++ b/src/TestData/BasicFunctionality/BundleA/BundleA.wxi
@@ -0,0 +1,21 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+<?ifndef Version?>
+<?define Version = 1.0.0.0?>
+<?endif?>
+
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{8C7E2C47-1EE7-4BBE-99A2-EAB7F3693F48}" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_BundleA" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <BootstrapperApplication>
+        <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+
+    <Chain>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Include>
diff --git a/src/TestData/BasicFunctionality/BundleA/BundleA.wxs b/src/TestData/BasicFunctionality/BundleA/BundleA.wxs
new file mode 100644
index 00000000..0506f05a
--- /dev/null
+++ b/src/TestData/BasicFunctionality/BundleA/BundleA.wxs
@@ -0,0 +1,11 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?include BundleA.wxi ?>
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj b/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..9943717c
--- /dev/null
+++ b/src/TestData/BasicFunctionality/PackageA/PackageA.wixproj
@@ -0,0 +1,10 @@
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <CabPrefix>a</CabPrefix>
+    <UpgradeCode>{7FD50F1B-D134-4365-923C-DFA160F74738}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Wix.Build.props b/src/Wix.Build.props
index 050ec6d5..3f3aaf8f 100644
--- a/src/Wix.Build.props
+++ b/src/Wix.Build.props
@@ -2,6 +2,7 @@
 <Project>
   <PropertyGroup>
     <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
+    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
     <OutputPath>$(OutputPath)$(TestGroupName)\</OutputPath>
   </PropertyGroup>
 </Project>
diff --git a/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
new file mode 100644
index 00000000..4982d733
--- /dev/null
+++ b/src/WixToolsetTest.BurnE2E/BasicFunctionalityTests.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolsetTest.BurnE2E
+{
+    using System;
+    using System.IO;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class BasicFunctionalityTests : BurnE2ETests
+    {
+        public BasicFunctionalityTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper, "BasicFunctionality") { }
+
+        [Fact]
+        public void CanInstallAndUninstallSimpleBundle()
+        {
+            var packageA = this.CreatePackageInstaller("PackageA");
+
+            var bundleA = this.CreateBundleInstaller("BundleA");
+
+            var packageASourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
+
+            // Source file should *not* be installed
+            Assert.False(File.Exists(packageASourceCodeInstalled), $"Package A payload should not be there on test start: {packageASourceCodeInstalled}");
+
+            bundleA.Install();
+
+            var cachedBundlePath = bundleA.VerifyRegisteredAndInPackageCache();
+
+            // Source file should be installed
+            Assert.True(File.Exists(packageASourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageASourceCodeInstalled));
+
+            bundleA.Uninstall(cachedBundlePath);
+
+            // Source file should *not* be installed
+            Assert.False(File.Exists(packageASourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageASourceCodeInstalled));
+
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache(cachedBundlePath);
+        }
+    }
+}
diff --git a/src/WixToolsetTest.BurnE2E/BundleInstaller.cs b/src/WixToolsetTest.BurnE2E/BundleInstaller.cs
index b708db40..c85646bb 100644
--- a/src/WixToolsetTest.BurnE2E/BundleInstaller.cs
+++ b/src/WixToolsetTest.BurnE2E/BundleInstaller.cs
@@ -4,19 +4,30 @@ namespace WixToolsetTest.BurnE2E
 {
     using System;
     using System.IO;
+    using System.Linq;
     using System.Text;
+    using Microsoft.Win32;
+    using WixToolset.Data;
+    using WixToolset.Data.Symbols;
+    using Xunit;
 
     public class BundleInstaller : IDisposable
     {
+        public const string BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY = "SOFTWARE\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
+        public const string BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH = "BundleCachePath";
+
         public BundleInstaller(WixTestContext testContext, string name)
         {
             this.Bundle = Path.Combine(testContext.TestDataFolder, $"{name}.exe");
+            this.BundlePdb = Path.Combine(testContext.TestDataFolder, $"{name}.wixpdb");
             this.TestGroupName = testContext.TestGroupName;
             this.TestName = testContext.TestName;
         }
 
         public string Bundle { get; }
 
+        public string BundlePdb { get; }
+
         public string TestGroupName { get; }
 
         public string TestName { get; }
@@ -66,15 +77,27 @@ namespace WixToolsetTest.BurnE2E
         }
 
         /// <summary>
+        /// Uninstalls the bundle at the given path with optional arguments.
+        /// </summary>
+        /// <param name="bundlePath">This should be the bundle in the package cache.</param>
+        /// <param name="expectedExitCode">Expected exit code, defaults to success.</param>
+        /// <param name="arguments">Optional arguments to pass to the tool.</param>
+        /// <returns>Path to the generated log file.</returns>
+        public string Uninstall(string bundlePath, int expectedExitCode = (int)MSIExec.MSIExecReturnCode.SUCCESS, params string[] arguments)
+        {
+            return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Uninstall, arguments, bundlePath: bundlePath);
+        }
+
+        /// <summary>
         /// Executes the bundle with optional arguments.
         /// </summary>
         /// <param name="expectedExitCode">Expected exit code.</param>
         /// <param name="mode">Install mode.</param>
         /// <param name="arguments">Optional arguments to pass to the tool.</param>
         /// <returns>Path to the generated log file.</returns>
-        private string RunBundleWithArguments(int expectedExitCode, MSIExec.MSIExecMode mode, string[] arguments, bool assertOnError = true)
+        private string RunBundleWithArguments(int expectedExitCode, MSIExec.MSIExecMode mode, string[] arguments, bool assertOnError = true, string bundlePath = null)
         {
-            TestTool bundle = new TestTool(this.Bundle);
+            TestTool bundle = new TestTool(bundlePath ?? this.Bundle);
             var sb = new StringBuilder();
 
             // Be sure to run silent.
@@ -119,6 +142,41 @@ namespace WixToolsetTest.BurnE2E
             return logFile;
         }
 
+        public string VerifyRegisteredAndInPackageCache()
+        {
+            using var wixOutput = WixOutput.Read(this.BundlePdb);
+            var intermediate = Intermediate.Load(wixOutput);
+            var section = intermediate.Sections.Single();
+            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
+            var bundleId = bundleSymbol.BundleId;
+            var registrationKeyPath = $"{BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY}\\{bundleId}";
+
+            using var testKey = Registry.LocalMachine.OpenSubKey(registrationKeyPath);
+            Assert.NotNull(testKey);
+
+            var cachePathValue = testKey.GetValue(BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH);
+            Assert.NotNull(cachePathValue);
+            var cachePath = Assert.IsType<string>(cachePathValue);
+            Assert.True(File.Exists(cachePath));
+
+            return cachePath;
+        }
+
+        public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
+        {
+            using var wixOutput = WixOutput.Read(this.BundlePdb);
+            var intermediate = Intermediate.Load(wixOutput);
+            var section = intermediate.Sections.Single();
+            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
+            var bundleId = bundleSymbol.BundleId;
+            var registrationKeyPath = $"{BURN_REGISTRATION_REGISTRY_UNINSTALL_KEY}\\{bundleId}";
+
+            using var testKey = Registry.LocalMachine.OpenSubKey(registrationKeyPath);
+            Assert.Null(testKey);
+
+            Assert.False(File.Exists(cachedBundlePath));
+        }
+
         public void Dispose()
         {
             string[] args = { "-burn.ignoredependencies=ALL" };
diff --git a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index 78dbaf74..988834b2 100644
--- a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -4,16 +4,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
-    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
+    <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
+    <PackageReference Include="WixToolset.Data" Version="4.0.177" />
   </ItemGroup>
 
   <ItemGroup>