14 files changed, 42 insertions, 42 deletions
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
index fff23274..cb97984f 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyBurnBackendExtension.cs
@@ -37,7 +37,7 @@ namespace ForTestingUseOnly
            }
            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
-            bundleSymbol.ProviderKey = bundleSymbol.BundleId = forTestingUseOnlyBundleSymbol.BundleId;
+            bundleSymbol.ProviderKey = bundleSymbol.BundleCode = forTestingUseOnlyBundleSymbol.BundleCode;
        }
    }
 }
diff --git a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
index 4963c941..f6ff7f87 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/ForTestingUseOnlyCompiler.cs
@@ -32,7 +32,7 @@ namespace ForTestingUseOnly
        private void ParseForTestingUseOnlyBundleElement(Intermediate intermediate, IntermediateSection section, XElement element)
        {
            var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
-            string bundleId = null;
+            string bundleCode = null;
            foreach (var attrib in element.Attributes())
            {
@@ -41,7 +41,7 @@ namespace ForTestingUseOnly
                    switch (attrib.Name.LocalName)
                    {
                        case "Id":
-                            bundleId = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
+                            bundleCode = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib);
                            break;
                        default:
                            this.ParseHelper.UnexpectedAttribute(element, attrib);
@@ -54,13 +54,13 @@ namespace ForTestingUseOnly
                }
            }
-            if (null == bundleId)
+            if (null == bundleCode)
            {
                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, element.Name.LocalName, "Id"));
            }
            else
            {
-                bundleId = Guid.Parse(bundleId).ToString("B").ToUpperInvariant();
+                bundleCode = Guid.Parse(bundleCode).ToString("B").ToUpperInvariant();
            }
            this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, element);
@@ -69,7 +69,7 @@ namespace ForTestingUseOnly
            {
                section.AddSymbol(new ForTestingUseOnlyBundleSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "ForTestingUseOnlyBundle"))
                {
-                    BundleId = bundleId,
+                    BundleCode = bundleCode,
                });
            }
        }
diff --git a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
index a17dfe31..6cf9dabb 100644
--- a/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
+++ b/src/test/burn/ForTestingUseOnlyExtension/Symbols/ForTestingUseOnlyBundleSymbol.cs
@@ -11,7 +11,7 @@ namespace ForTestingUseOnly
            ForTestingUseOnlySymbolDefinitionType.ForTestingUseOnlyBundle.ToString(),
            new[]
            {
-                new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleId), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(ForTestingUseOnlyBundleSymbolFields.BundleCode), IntermediateFieldType.String),
            },
            typeof(ForTestingUseOnlyBundleSymbol));
    }
@@ -23,7 +23,7 @@ namespace ForTestingUseOnly.Symbols
    public enum ForTestingUseOnlyBundleSymbolFields
    {
-        BundleId,
+        BundleCode,
    }
    public class ForTestingUseOnlyBundleSymbol : IntermediateSymbol
@@ -38,10 +38,10 @@ namespace ForTestingUseOnly.Symbols
        public IntermediateField this[ForTestingUseOnlyBundleSymbolFields index] => this.Fields[(int)index];
-        public string BundleId
+        public string BundleCode
        {
-            get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleId].AsString();
+            get => this.Fields[(int)ForTestingUseOnlyBundleSymbolFields.BundleCode].AsString();
-            set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleId, value);
+            set => this.Set((int)ForTestingUseOnlyBundleSymbolFields.BundleCode, value);
        }
    }
 }
diff --git a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
index ba559b05..e65ac5ca 100644
--- a/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
+++ b/src/test/burn/TestData/BAFunctionsTests/BafRelatedBundleVariableTesting/BafRelatedBundleVariableTesting.cpp
@@ -14,7 +14,7 @@ public: // IBAFunctions
 public: //IBootstrapperApplication
    virtual STDMETHODIMP OnDetectRelatedBundle(
-        __in_z LPCWSTR wzBundleId,
+        __in_z LPCWSTR wzBundleCode,
        __in BOOTSTRAPPER_RELATION_TYPE relationType,
        __in_z LPCWSTR wzBundleTag,
        __in BOOL fPerMachine,
@@ -27,15 +27,15 @@ public: //IBootstrapperApplication
        HRESULT hr = S_OK;
        LPWSTR wzValue = NULL;
-        hr = BalGetRelatedBundleVariable(wzBundleId, STRING_VARIABLE, &wzValue);
+        hr = BalGetRelatedBundleVariable(wzBundleCode, STRING_VARIABLE, &wzValue);
        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: AString = %ws, Error: 0x%x", wzValue, hr);
-        hr = BalGetRelatedBundleVariable(wzBundleId, NUMBER_VARIABLE, &wzValue);
+        hr = BalGetRelatedBundleVariable(wzBundleCode, NUMBER_VARIABLE, &wzValue);
        BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Retrieved related bundle variable with BAFunctions: ANumber = %ws, Error: 0x%x", wzValue, hr);
-        hr = __super::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
+        hr = __super::OnDetectRelatedBundle(wzBundleCode, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
        ReleaseStr(wzValue);
        return hr;
diff --git a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
index a0f42ee9..0d05700f 100644
--- a/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
+++ b/src/test/burn/TestData/BundlePackageTests/MultipleBundlePackagesWithRemoteBundle/MultipleBundlePackagesWithRemoteBundle.wxs
@@ -6,13 +6,13 @@
    <PackageGroup Id="BundlePackages">
      <BundlePackage Id="ASP.Net_Core_6.0" Permanent="yes">
        <BundlePackagePayload Id="ASP.Net_Core_6.0" Name="aspnetcore-runtime-6.0.10-win-x64.exe" ProductName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" Description="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/2370bcad-45b1-4ccb-bc61-21ffd7116d63/1aa8efcabfb60ee778b913a5eb237a56/aspnetcore-runtime-6.0.10-win-x64.exe" Hash="4AF8DA7DE85BCB1D079A85CD3F4AAFDFC4E4D441B87DFCDFFC27C820D9F69513341BE5ACC987C47CACDC597CBC0CC89C7D746050E6D40AE02DB7391E8214352D" Size="8997144" Version="6.0.10.22476">
-          <RemoteBundle BundleId="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" />
+          <RemoteBundle BundleCode="{5D69246A-5874-401D-9879-ECC18D5A1BAB}" DisplayName="Microsoft ASP.NET Core 6.0.10 - Shared Framework (x64)" InstallSize="22958021" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{5d69246a-5874-401d-9879-ecc18d5a1bab}" ProtocolVersion="1" Version="6.0.10.22476" Win64="no" UpgradeCode="{B7C4CC53-CE40-39E9-9F43-81CE9F5CD47C}" />
        </BundlePackagePayload>
      </BundlePackage>
      <BundlePackage Id="Dotnet_Runtime_6.0" Permanent="yes">
        <BundlePackagePayload Id="Dotnet_Runtime_6.0" Name="dotnet-runtime-6.0.10-win-x64.exe" ProductName="Microsoft .NET Runtime - 6.0.10 (x64)" Description="Microsoft .NET Runtime - 6.0.10 (x64)" DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/50336bc7-7fd1-4a12-b5a2-81ce0219edf9/8d862413975808de0d835888e41e49a7/dotnet-runtime-6.0.10-win-x64.exe" Hash="23E4C862AFEF34A2C0D6476A93274CE0158D28F1609E0404737663E4BE17263E61E5A8760382FB125D288A0965394E3D04B9E1C77F99DE80A2C590DD295B8732" Size="27912752" Version="6.0.10.31726">
-          <RemoteBundle BundleId="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
+          <RemoteBundle BundleCode="{9A89127E-80A4-45FB-AD62-58F72634274A}" DisplayName="Microsoft .NET Runtime - 6.0.10 (x64)" InstallSize="71462036" ManifestNamespace="http://schemas.microsoft.com/wix/2008/Burn" PerMachine="yes" ProviderKey="{9a89127e-80a4-45fb-ad62-58f72634274a}" ProtocolVersion="1" Version="6.0.10.31726" Win64="no" UpgradeCode="{B19A028F-5C89-7AF4-5102-0F8ED67CCACA}" />
        </BundlePackagePayload>
      </BundlePackage>
    </PackageGroup>
diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
index cfeda6c4..51d6c508 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wxs
@@ -3,18 +3,18 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
  <Fragment>
    <fortestinguseonly:ForTestingUseOnlyBundle Id="{5E9D5B04-41EA-4196-954C-1F7357C31FB0}" />
-    <RelatedBundle Id="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{AAAAAAAA-0000-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{BBBBBBBB-0000-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{CCCCCCCC-0000-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{DDDDDDDD-0000-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{AAAAAAAA-1111-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{BBBBBBBB-1111-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{CCCCCCCC-1111-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{DDDDDDDD-1111-0000-0000-000000000000}" Action="detect" />
-    <RelatedBundle Id="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
+    <RelatedBundle Code="{AAAAAAAA-2222-0000-0000-000000000000}" Action="addon" />
-    <RelatedBundle Id="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
+    <RelatedBundle Code="{BBBBBBBB-2222-0000-0000-000000000000}" Action="patch" />
-    <RelatedBundle Id="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
+    <RelatedBundle Code="{CCCCCCCC-2222-0000-0000-000000000000}" Action="upgrade" />
-    <RelatedBundle Id="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
+    <RelatedBundle Code="{DDDDDDDD-2222-0000-0000-000000000000}" Action="detect" />
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
index 78c5493d..a808b124 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
  <Fragment>
    <fortestinguseonly:ForTestingUseOnlyBundle Id="{FE6B19EC-D52F-4F77-88E5-87FAE11E95D6}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
    <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
index 5da954ea..24379a56 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wxs
@@ -5,7 +5,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" xmlns:fortestinguseonly="http://wixtoolset.org/schemas/v4/wxs/fortestinguseonly">
  <Fragment>
    <fortestinguseonly:ForTestingUseOnlyBundle Id="{B774BF3B-3E89-4D42-9D29-AFAB27C5772D}" />
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="addon" />
    <util:RegistrySearch Root="HKLM" Key="$(var.TestExeRegistryKey)" Value="Version" Variable="ExeA_Version" />
    <PackageGroup Id="BundlePackages">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
index e23c9f88..6458fc08 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
index b1f60b31..495798b5 100644
--- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-    <RelatedBundle Id="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
+    <RelatedBundle Code="{EC2B2B3F-E57C-45A4-A0E8-762156DAD99D}" Action="patch" />
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)" PerMachine="yes">
diff --git a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
index 509047d6..5dfff3e8 100644
--- a/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleFv2/BundleFv2.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-    <RelatedBundle Id="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
+    <RelatedBundle Code="583B5ECB-04E6-4837-A30C-A1ADCBE24235" Action="detect" />
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
index 5207be28..febf46ea 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="detect" />
    <PackageGroup Id="BundlePackages">
      <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
index 3af7bbf2..889fdfbc 100644
--- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
+++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wxs
@@ -4,7 +4,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
  <Fragment>
-    <RelatedBundle Id="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
+    <RelatedBundle Code="{B1617DA6-F824-4B9F-B9B2-A6AFD07A652D}" Action="patch" />
    <PackageGroup Id="BundlePackages">
      <MspPackage Id="PatchA" SourceFile="$(var.PatchA.TargetPath)">
diff --git a/src/test/burn/WixTestTools/BundleVerifier.cs b/src/test/burn/WixTestTools/BundleVerifier.cs
index b750c80c..da61d96e 100644
--- a/src/test/burn/WixTestTools/BundleVerifier.cs
+++ b/src/test/burn/WixTestTools/BundleVerifier.cs
@@ -62,7 +62,7 @@ namespace WixTestTools
        public string GetExpectedCachedBundlePath()
        {
            var bundleSymbol = this.GetBundleSymbol();
-            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleId, bundleSymbol.PerMachine);
+            var cachePath = this.GetPackageCachePathForCacheId(bundleSymbol.BundleCode, bundleSymbol.PerMachine);
            return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
        }
@@ -107,14 +107,14 @@ namespace WixTestTools
        {
            var bundleSymbol = this.GetBundleSymbol();
            var x64 = bundleSymbol.Platform != Platform.X86;
-            var bundleId = bundleSymbol.BundleId;
+            var bundleCode = bundleSymbol.BundleCode;
            if (bundleSymbol.PerMachine)
            {
-                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleId, x64, out registration);
+                return BundleRegistration.TryGetPerMachineBundleRegistrationById(bundleCode, x64, out registration);
            }
            else
            {
-                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleId, out registration);
+                return BundleRegistration.TryGetPerUserBundleRegistrationById(bundleCode, out registration);
            }
        }
@@ -141,8 +141,8 @@ namespace WixTestTools
        public void VerifyUnregisteredAndRemovedFromPackageCache(string cachedBundlePath)
        {
-            Assert.False(this.TryGetRegistration(out _));
+            Assert.False(this.TryGetRegistration(out _), $"Bundle cached at '{cachedBundlePath}' should not still be registered.");
-            Assert.False(File.Exists(cachedBundlePath));
+            Assert.False(File.Exists(cachedBundlePath), $"Cached bundle should have been removed from package cache at '{cachedBundlePath}'.");
        }
        public void RemovePackageFromCache(string packageId)