From 73dc2706d9f151554356aaf3e69bfad5b46a21e9 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 1 Jan 2021 19:11:00 -0600
Subject: Add tests for wrong managed BA configuration.

Test out the .NET Core test BA as well.
---
 src/TestData/MsiTransaction/BundleBv1/BundleB.wxi  |  1 -
 .../MsiTransaction/BundleBv1/BundleBv1.wxs         |  1 +
 .../MsiTransaction/BundleBv2/BundleBv2.wxs         |  1 +
 src/TestData/PrereqBa/BundleA/BundleA.wixproj      | 16 ++++++++++++++++
 src/TestData/PrereqBa/BundleA/BundleA.wxi          | 17 +++++++++++++++++
 src/TestData/PrereqBa/BundleA/BundleA.wxs          | 21 +++++++++++++++++++++
 .../PrereqBa/BundleA/bad.runtimeconfig.json        | 10 ++++++++++
 src/TestData/PrereqBa/BundleB/BundleB.wixproj      | 16 ++++++++++++++++
 src/TestData/PrereqBa/BundleB/BundleB.wxi          | 17 +++++++++++++++++
 src/TestData/PrereqBa/BundleB/BundleB.wxs          | 20 ++++++++++++++++++++
 src/TestData/PrereqBa/BundleB/bad.config           | 17 +++++++++++++++++
 src/TestData/PrereqBa/PackageA/PackageA.wixproj    |  9 +++++++++
 src/TestData/PrereqBa/PackageB/PackageB.wixproj    |  9 +++++++++
 src/TestData/PrereqBa/PackageF/PackageF.wixproj    | 12 ++++++++++++
 src/TestData/TestBA/TestBAWixlib/TestBA.wxs        | 22 ++++++++++++++++++----
 .../TestBA/TestBAWixlib/testbawixlib.wixproj       |  3 ++-
 16 files changed, 186 insertions(+), 6 deletions(-)
 create mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wixproj
 create mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wxi
 create mode 100644 src/TestData/PrereqBa/BundleA/BundleA.wxs
 create mode 100644 src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json
 create mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wixproj
 create mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wxi
 create mode 100644 src/TestData/PrereqBa/BundleB/BundleB.wxs
 create mode 100644 src/TestData/PrereqBa/BundleB/bad.config
 create mode 100644 src/TestData/PrereqBa/PackageA/PackageA.wixproj
 create mode 100644 src/TestData/PrereqBa/PackageB/PackageB.wixproj
 create mode 100644 src/TestData/PrereqBa/PackageF/PackageF.wixproj

(limited to 'src/TestData')

diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
index cb7a602d..943b8b48 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
@@ -11,7 +11,6 @@
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
 
     <Chain>
-      <PackageGroupRef Id="TestBA" />
       <PackageGroupRef Id="BundlePackages" />
     </Chain>
   </Bundle>
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
index 420d5157..1a24f53e 100644
--- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
+++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
@@ -5,6 +5,7 @@
   <?include BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
+      <PackageGroupRef Id="TestBA" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
     </PackageGroup>
   </Fragment>
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
index 39197d7d..33665860 100644
--- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
+++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
@@ -5,6 +5,7 @@
   <?include ..\BundleBv1\BundleB.wxi ?>
   <Fragment>
     <PackageGroup Id="BundlePackages">
+      <PackageGroupRef Id="TestBAdnc" />
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
       <RollbackBoundary Transaction="yes" />
       <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wixproj b/src/TestData/PrereqBa/BundleA/BundleA.wixproj
new file mode 100644
index 00000000..ab4c0499
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.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">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageA\PackageA.wixproj" />
+    <ProjectReference Include="..\PackageF\PackageF.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/PrereqBa/BundleA/BundleA.wxi b/src/TestData/PrereqBa/BundleA/BundleA.wxi
new file mode 100644
index 00000000..23623ffb
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.wxi
@@ -0,0 +1,17 @@
+<!-- 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">
+  <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{A4456636-916A-43A0-87BF-A897C2717A00}" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_BundleA" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <Chain>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Include>
diff --git a/src/TestData/PrereqBa/BundleA/BundleA.wxs b/src/TestData/PrereqBa/BundleA/BundleA.wxs
new file mode 100644
index 00000000..53139834
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/BundleA.wxs
@@ -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. -->
+
+
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <?include BundleA.wxi ?>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json b/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json
new file mode 100644
index 00000000..07a1a830
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleA/bad.runtimeconfig.json
@@ -0,0 +1,10 @@
+{
+  "runtimeOptions": {
+    "tfm": "net5.5",
+    "rollForward": "Disable",
+    "framework": {
+      "name": "Microsoft.WindowsDesktop.App",
+      "version": "5.5.0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wixproj b/src/TestData/PrereqBa/BundleB/BundleB.wixproj
new file mode 100644
index 00000000..7d4d1ebd
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.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">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PackageB\PackageB.wixproj" />
+    <ProjectReference Include="..\PackageF\PackageF.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/PrereqBa/BundleB/BundleB.wxi b/src/TestData/PrereqBa/BundleB/BundleB.wxi
new file mode 100644
index 00000000..6bfeb213
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.wxi
@@ -0,0 +1,17 @@
+<!-- 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">
+  <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{157A1FBA-3825-4AAA-B13D-F45435A79D64}" Compressed="yes">
+    <Log Prefix="~$(var.TestGroupName)_BundleB" />
+
+    <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
+
+    <Chain>
+      <PackageGroupRef Id="BundlePackages" />
+    </Chain>
+  </Bundle>
+</Include>
diff --git a/src/TestData/PrereqBa/BundleB/BundleB.wxs b/src/TestData/PrereqBa/BundleB/BundleB.wxs
new file mode 100644
index 00000000..57d8a552
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/BundleB.wxs
@@ -0,0 +1,20 @@
+<!-- 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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <?include BundleB.wxi ?>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="bad.config" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixManagedBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="BundlePackages">
+      <MsiPackage Id="PackageB" SourceFile="$(var.PackageB.TargetPath)" bal:PrereqPackage="yes" Permanent="yes" />
+      <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
+    </PackageGroup>
+  </Fragment>
+</Wix>
diff --git a/src/TestData/PrereqBa/BundleB/bad.config b/src/TestData/PrereqBa/BundleB/bad.config
new file mode 100644
index 00000000..1512e59a
--- /dev/null
+++ b/src/TestData/PrereqBa/BundleB/bad.config
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+
+<configuration>
+    <configSections>
+        <sectionGroup name="wix.bootstrapper" type="WixToolset.Mba.Host.BootstrapperSectionGroup, WixToolset.Mba.Host">
+            <section name="host" type="WixToolset.Mba.Host.HostSection, WixToolset.Mba.Host" />
+        </sectionGroup>
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v5.8" />
+    </startup>
+    <wix.bootstrapper>
+        <host assemblyName="TestBA" />
+    </wix.bootstrapper>
+</configuration>
diff --git a/src/TestData/PrereqBa/PackageA/PackageA.wixproj b/src/TestData/PrereqBa/PackageA/PackageA.wixproj
new file mode 100644
index 00000000..d46982fa
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageA/PackageA.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{A13BFF68-61DF-4015-9AD1-03854B5E0212}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/PackageB/PackageB.wixproj b/src/TestData/PrereqBa/PackageB/PackageB.wixproj
new file mode 100644
index 00000000..d5edf338
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageB/PackageB.wixproj
@@ -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. -->
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <UpgradeCode>{3DD4621A-F7AB-4548-89A8-6DCB0A9BC954}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/PrereqBa/PackageF/PackageF.wixproj b/src/TestData/PrereqBa/PackageF/PackageF.wixproj
new file mode 100644
index 00000000..3d52e939
--- /dev/null
+++ b/src/TestData/PrereqBa/PackageF/PackageF.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>
+    <UpgradeCode>{7DEEE928-CD7F-49AD-8000-2ED6339D8A78}</UpgradeCode>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Util.wixext" Version="4.0.66" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 56ddd1aa..348a0cbb 100644
--- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -2,10 +2,24 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <Fragment>
     <BootstrapperApplication>
-      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" />
-      <Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
-      <Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
-      <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" />
+      <bal:WixDotNetCoreBootstrapperApplicationHost />
+    </BootstrapperApplication>
+
+    <PackageGroup Id="TestBAdnc">
+      <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet -->
+    </PackageGroup>
+  </Fragment>
+  <Fragment>
+    <BootstrapperApplication>
+      <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" />
+      <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
+      <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
       <bal:WixManagedBootstrapperApplicationHost />
     </BootstrapperApplication>
 
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index ee63707e..7dd1798c 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -6,7 +6,8 @@
     <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="x86" />
+    <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" />
+    <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
-- 
cgit v1.2.3-55-g6feb