Port EnableFeatureSelection tests from v3 repo, add a new one, fix them

Fixes 4616

13 files changed, 288 insertions, 5 deletions

diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp
index edbf4d45..2c1b0d4f 100644
--- a/src/burn/engine/msiengine.cpp
+++ b/src/burn/engine/msiengine.cpp
@@ -448,12 +448,15 @@ extern "C" HRESULT MsiEngineDetectPackage(
     VERUTIL_VERSION* pVersion = NULL;
     UINT uLcid = 0;
     BOOL fPerMachine = FALSE;
+    BOOL fDetectFeatures = FALSE;
 
     // detect self by product code
     // TODO: what to do about MSIINSTALLCONTEXT_USERMANAGED?
     hr = WiuGetProductInfoEx(pPackage->Msi.sczProductCode, NULL, pPackage->fPerMachine ? MSIINSTALLCONTEXT_MACHINE : MSIINSTALLCONTEXT_USERUNMANAGED, INSTALLPROPERTY_VERSIONSTRING, &sczInstalledVersion);
     if (SUCCEEDED(hr))
     {
+        fDetectFeatures = TRUE;
+
         hr = VerParseVersion(sczInstalledVersion, 0, FALSE, &pVersion);
         ExitOnFailure(hr, "Failed to parse installed version: '%ls' for ProductCode: %ls", sczInstalledVersion, pPackage->Msi.sczProductCode);
 
@@ -661,7 +664,7 @@ extern "C" HRESULT MsiEngineDetectPackage(
             BURN_MSIFEATURE* pFeature = &pPackage->Msi.rgFeatures[i];
 
             // Try to detect features state if the product is present on the machine.
-            if (BOOTSTRAPPER_PACKAGE_STATE_PRESENT <= pPackage->currentState)
+            if (fDetectFeatures)
             {
                 hr = WiuQueryFeatureState(pPackage->Msi.sczProductCode, pFeature->sczId, &installState);
                 ExitOnFailure(hr, "Failed to query feature state.");
@@ -864,8 +867,9 @@ extern "C" HRESULT MsiEnginePlanCalculatePackage(
 
     if (pPackage->Msi.cFeatures)
     {
-        // If the package is present and we're repairing it.
-        BOOL fRepairingPackage = (BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState && BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested);
+        // If the package is present and we're repairing it, or we're doing a minor update.
+        BOOL fRepairingPackage = (BOOTSTRAPPER_PACKAGE_STATE_ABSENT < pPackage->currentState && BOOTSTRAPPER_REQUEST_STATE_REPAIR == pPackage->requested) ||
+                                 BOOTSTRAPPER_RELATED_OPERATION_MINOR_UPDATE == pPackage->Msi.operation;
 
         // plan features
         for (DWORD i = 0; i < pPackage->Msi.cFeatures; ++i)
@@ -1282,10 +1286,10 @@ extern "C" HRESULT MsiEngineExecutePackage(
     hr = ConcatPatchProperty(pCache, pPackage, fRollback, &sczObfuscatedProperties);
     ExitOnFailure(hr, "Failed to add patch properties to obfuscated argument string.");
 
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, !pPackage->Msi.cFeatures, &sczProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, &sczProperties);
     ExitOnFailure(hr, "Failed to add action property to argument string.");
 
-    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, !pPackage->Msi.cFeatures, &sczObfuscatedProperties);
+    hr = MsiEngineConcatBurnProperties(pExecuteAction->msiPackage.action, pExecuteAction->msiPackage.actionMsiProperty, pExecuteAction->msiPackage.fileVersioning, TRUE, 0 != pPackage->Msi.cFeatures, &sczObfuscatedProperties);
     ExitOnFailure(hr, "Failed to add action property to obfuscated argument string.");
 
     LogId(REPORT_STANDARD, MSG_APPLYING_PACKAGE, LoggingRollbackOrExecute(fRollback), pPackage->sczId, LoggingActionStateToString(pExecuteAction->msiPackage.action), sczMsiPath, sczObfuscatedProperties ? sczObfuscatedProperties : L"");
diff --git a/src/test/burn/TestBA/TestBA.cs b/src/test/burn/TestBA/TestBA.cs
index e73c907e..087219af 100644
--- a/src/test/burn/TestBA/TestBA.cs
+++ b/src/test/burn/TestBA/TestBA.cs
@@ -320,6 +320,8 @@ namespace WixToolset.Test.BA
             {
                 args.State = state;
             }
+
+            this.Log("OnPlanMsiFeature() - id: {0}, defaultState: {1}, requestedState: {2}", args.PackageId, args.RecommendedState, args.State);
         }
 
         protected override void OnPlanComplete(PlanCompleteEventArgs args)
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props
new file mode 100644
index 00000000..dcfcbc82
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleA.props
@@ -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. -->
+<Project>
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <BundleName>BundleA</BundleName>
+    <UpgradeCode>{0A6EDDC7-236F-4367-97EF-EFB0F0B478DE}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
new file mode 100644
index 00000000..8a5c9594
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wixproj
@@ -0,0 +1,16 @@
+<!-- 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">
+  <Import Project="BundleA.props" />
+  <PropertyGroup>
+    <Version>1.0.0.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wxs b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wxs
new file mode 100644
index 00000000..0fa01755
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1/BundleAv1.wxs
@@ -0,0 +1,9 @@
+<!-- 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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" EnableFeatureSelection="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
new file mode 100644
index 00000000..4c6a0993
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
@@ -0,0 +1,16 @@
+<!-- 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">
+  <Import Project="..\BundleAv1\BundleA.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
+    <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="WixToolset.NetFx.wixext" />
+    <PackageReference Include="WixToolset.Util.wixext" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wxs b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wxs
new file mode 100644
index 00000000..68802a47
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/BundleAv1_0_1/BundleAv1_0_1.wxs
@@ -0,0 +1,9 @@
+<!-- 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">
+  <Fragment>
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" Name="PackageAv1.msi" SourceFile="$(var.PackageAv1_0_1.TargetPath)" EnableFeatureSelection="yes" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
new file mode 100644
index 00000000..20ce503a
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1/Package.wxs
@@ -0,0 +1,64 @@
+<!-- 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?>
+
+<?ifndef ProductCode?>
+<?define ProductCode = *?>
+<?endif?>
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="WixToolset" UpgradeCode="$(var.UpgradeCode)" Compressed="yes" ProductCode="$(var.ProductCode)">
+    <MediaTemplate EmbedCab="yes" />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+
+    <PropertyRef Id="TestVersion" />
+
+    <Feature Id="Complete" Level="1">
+      <ComponentRef Id="RegistryComponent"/>
+
+      <!-- Not installed by default. -->
+      <Feature Id="Test" Level="100">
+        <ComponentRef Id="FileComponent"/>
+        <ComponentRef Id="RegistryComponent2"/>
+      </Feature>
+    </Feature>
+  </Package>
+
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="WixDir" Name="~Test WiX">
+        <Directory Id="TestDir" Name="$(var.TestGroupName)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.PackageName)" />
+        </Directory>
+      </Directory>
+    </StandardDirectory>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="FileComponent" Guid="{771E78AA-850D-4E08-AA6D-3F31E30ED140}" Directory="INSTALLFOLDER">
+      <File Source="$(sys.SOURCEFILEPATH)" />
+      <File Name="notkeypath.file" Source="$(sys.SOURCEFILEPATH)" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)" Value="!(bind.Property.TestVersion)" Type="string" />
+      <Provides Key="WiX.$(var.TestGroupName).A,v1.0" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="RegistryComponent2" Directory="INSTALLFOLDER">
+      <RegistryValue Root="HKLM" Key="Software\WiX\Tests\$(var.TestGroupName)" Name="$(var.PackageName)2" Value="!(bind.Property.TestVersion)" Type="string" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <Property Id="TestVersion" Value="$(var.Version)" />
+  </Fragment>
+</Wix>
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props
new file mode 100644
index 00000000..a7c721c1
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageA.props
@@ -0,0 +1,7 @@
+<!-- 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>
+  <PropertyGroup>
+    <PackageName>PackageA</PackageName>
+    <UpgradeCode>{6E3370C1-12DE-4E1C-8AE6-C15113FCE22B}</UpgradeCode>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props
new file mode 100644
index 00000000..0b0bb2c4
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.props
@@ -0,0 +1,7 @@
+<!-- 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>
+  <Import Project="PackageA.props" />
+  <PropertyGroup>
+    <ProductCode>{DD17AA83-3B58-4C97-859A-78F228D0B680}</ProductCode>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj
new file mode 100644
index 00000000..e85be384
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1/PackageAv1.wixproj
@@ -0,0 +1,4 @@
+<!-- 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">
+  <Import Project="PackageAv1.props" />
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
new file mode 100644
index 00000000..74d94a41
--- /dev/null
+++ b/src/test/burn/TestData/FeatureTests/PackageAv1_0_1/PackageAv1_0_1.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">
+  <Import Project="..\PackageAv1\PackageAv1.props" />
+  <PropertyGroup>
+    <Version>1.0.1.0</Version>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\PackageAv1\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs b/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs
new file mode 100644
index 00000000..b3d0dfe1
--- /dev/null
+++ b/src/test/burn/WixToolsetTest.BurnE2E/FeatureTests.cs
@@ -0,0 +1,124 @@
+// 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 WixTestTools;
+    using WixToolset.Mba.Core;
+    using Xunit;
+    using Xunit.Abstractions;
+
+    public class FeatureTests : BurnE2ETests
+    {
+        public FeatureTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
+
+        [RuntimeFact]
+        public void CanControlFeatureSelectionDuringInstallAndModify()
+        {
+            var packageA = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleAv1");
+            var testBAController = this.CreateTestBAController();
+
+            // Install the bundle without the optional feature present
+            testBAController.SetPackageFeatureState("PackageA", "Complete", FeatureState.Local);
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Absent);
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+
+            string packageSourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
+            Assert.False(File.Exists(packageSourceCodeInstalled), String.Concat("Should not have found Package A payload installed at: ", packageSourceCodeInstalled));
+            packageA.VerifyTestRegistryValue("PackageA", "1.0.0.0");
+
+            // Now turn on the feature.
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Local);
+
+            bundleA.Modify();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageSourceCodeInstalled), String.Concat("Should have found Package A payload installed at: ", packageSourceCodeInstalled));
+
+            // Turn the feature back off.
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Absent);
+            bundleA.Modify();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.False(File.Exists(packageSourceCodeInstalled), String.Concat("Should have removed Package A payload from: ", packageSourceCodeInstalled));
+
+            // Uninstall everything.
+            testBAController.ResetPackageStates("PackageA");
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageSourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageSourceCodeInstalled));
+            packageA.VerifyTestRegistryRootDeleted();
+        }
+
+        [RuntimeFact]
+        public void CanControlFeatureSelectionDuringRepair()
+        {
+            var packageA = this.CreatePackageInstaller("PackageAv1");
+            var bundleA = this.CreateBundleInstaller("BundleAv1");
+            var testBAController = this.CreateTestBAController();
+
+            // Install the bundle with the optional feature present
+            testBAController.SetPackageFeatureState("PackageA", "Complete", FeatureState.Local);
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Local);
+            bundleA.Install();
+            bundleA.VerifyRegisteredAndInPackageCache();
+
+            string packageSourceCodeInstalled = packageA.GetInstalledFilePath("Package.wxs");
+            string packageNotKeyPathFile = packageA.GetInstalledFilePath("notkeypath.file");
+
+            Assert.True(File.Exists(packageSourceCodeInstalled), String.Concat("Should have found Package A keyfile installed at: ", packageSourceCodeInstalled));
+            Assert.True(File.Exists(packageNotKeyPathFile), String.Concat("Should have found Package A non-keyfile installed at: ", packageNotKeyPathFile));
+
+            // Delete the non-keypath source file.
+            File.Delete(packageNotKeyPathFile);
+
+            // Now repair without repairing the feature to verify the non-keyfile doesn't come back.
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Unknown);
+            bundleA.Repair();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageSourceCodeInstalled), String.Concat("Should have found Package A keyfile installed at: ", packageSourceCodeInstalled));
+            Assert.False(File.Exists(packageNotKeyPathFile), String.Concat("Should have not found Package A non-keyfile installed at: ", packageNotKeyPathFile));
+
+            // Now repair and include the feature this time.
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Local);
+            bundleA.Repair();
+            bundleA.VerifyRegisteredAndInPackageCache();
+            Assert.True(File.Exists(packageSourceCodeInstalled), String.Concat("Should have found Package A keyfile installed at: ", packageSourceCodeInstalled));
+            Assert.True(File.Exists(packageNotKeyPathFile), String.Concat("Should have repaired Package A non-keyfile installed at: ", packageNotKeyPathFile));
+
+            // Uninstall everything.
+            testBAController.ResetPackageStates("PackageA");
+            bundleA.Uninstall();
+            bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
+            Assert.False(File.Exists(packageSourceCodeInstalled), String.Concat("Package A payload should have been removed by uninstall from: ", packageSourceCodeInstalled));
+            packageA.VerifyTestRegistryRootDeleted();
+        }
+
+        [RuntimeFact]
+        public void CanControlFeatureSelectionDuringMinorUpgrade()
+        {
+            var packageAv1 = this.CreatePackageInstaller("PackageAv1");
+            var packageAv1_0_1 = this.CreatePackageInstaller("PackageAv1_0_1");
+            var bundleAv1 = this.CreateBundleInstaller("BundleAv1");
+            var bundleAv1_0_1 = this.CreateBundleInstaller("BundleAv1_0_1");
+            var testBAController = this.CreateTestBAController();
+
+            // Install v1 with the optional feature turned on.
+            testBAController.SetPackageFeatureState("PackageA", "Complete", FeatureState.Local);
+            testBAController.SetPackageFeatureState("PackageA", "Test", FeatureState.Local);
+            bundleAv1.Install();
+            bundleAv1.VerifyRegisteredAndInPackageCache();
+
+            packageAv1.VerifyInstalledWithVersion(true);
+            packageAv1.VerifyTestRegistryValue("PackageA", "1.0.0.0");
+
+            // Install v1.0.1 with the optional feature still turned on.
+            bundleAv1_0_1.Install();
+            bundleAv1_0_1.VerifyRegisteredAndInPackageCache();
+
+            packageAv1_0_1.VerifyInstalledWithVersion(true);
+            packageAv1_0_1.VerifyTestRegistryValue("PackageA", "1.0.1.0");
+        }
+    }
+}