Handle lack of scope for pre-v7 bundles.

Fixes https://github.com/wixtoolset/issues/issues/9274

3 files changed, 16 insertions, 1 deletions

diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs
index e170667b..eb2a74ac 100644
--- a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/Bundle.wxs
@@ -1,9 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
-  <Bundle Id="PerMachineBundle" Name="PerMachineBundle" Manufacturer="Acme" Version="1.0.0.0">
+  <Bundle Id="PerMachineBundle" Name="PerMachineBundle" Manufacturer="Acme" Version="$(Version)">
     <BootstrapperApplication>
       <bal:WixStandardBootstrapperApplication LicenseUrl="https://www.example.com/license" Theme="hyperlinkLicense" />
     </BootstrapperApplication>
 
+    <Variable Name="TestBundleId" Value="PerMachineBundle v$(Version)" />
+
     <Chain>
       <MsiPackage SourceFile="PerMachinePkg.msi" />
     </Chain>
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj
index ade65220..ed15dedf 100644
--- a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundle.wixproj
@@ -1,6 +1,7 @@
 <Project Sdk="WixToolset.Sdk">
   <PropertyGroup>
     <OutputType>Bundle</OutputType>
+    <DefineConstants>$(DefineConstants);Version=1.0.0.0</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
diff --git a/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundleV2.wixproj b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundleV2.wixproj
new file mode 100644
index 00000000..fcdbae05
--- /dev/null
+++ b/src/test/burn/TestData/ConfigurableScopeTests/PerMachineBundle/PerMachineBundleV2.wixproj
@@ -0,0 +1,12 @@
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <DefineConstants>$(DefineConstants);Version=2.0.0.0</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PerMachinePkg\PerMachinePkg.wixproj" />
+  </ItemGroup>
+</Project>
\ No newline at end of file