aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-04-19 16:08:21 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-04-19 18:35:15 -0500
commit96ce05107d0e01014a3264e91ecb5731a9f28cc5 (patch)
tree29c1128c0b9b0db476cedc1d446c2269bfdecf62 /src/test/burn/TestData
parent57fd164d56466a52854e825afd5fdc2b6b97f12a (diff)
downloadwix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.tar.gz
wix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.tar.bz2
wix-96ce05107d0e01014a3264e91ecb5731a9f28cc5.zip
Upgrade test BAs to net6.0 and use x64 bundles for ManagedHost tests.
Fixes 6651
Diffstat (limited to 'src/test/burn/TestData')
-rw-r--r--src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj2
-rw-r--r--src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs8
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs12
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj2
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs12
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs12
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj2
7 files changed, 25 insertions, 25 deletions
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index e09a6aa4..0199f91f 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -9,7 +9,7 @@
9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> 9 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
10 </ItemGroup> 10 </ItemGroup>
11 <ItemGroup> 11 <ItemGroup>
12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" /> 12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup> 14 <ItemGroup>
15 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 15 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
index 455ea1e1..682f0bd7 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs
@@ -4,11 +4,11 @@
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <Fragment> 5 <Fragment>
6 <BootstrapperApplication Id="BrokenDnc"> 6 <BootstrapperApplication Id="BrokenDnc">
7 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" /> 7 <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
8 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> 8 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
9 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" /> 9 <Payload Name="TestBA.runtimeconfig.json" SourceFile="bad.runtimeconfig.json" />
10 <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" /> 10 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
11 <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" /> 11 <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
12 <bal:WixDotNetCoreBootstrapperApplicationHost /> 12 <bal:WixDotNetCoreBootstrapperApplicationHost />
13 </BootstrapperApplication> 13 </BootstrapperApplication>
14 </Fragment> 14 </Fragment>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 348a0cbb..ae162050 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -2,16 +2,16 @@
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment> 3 <Fragment>
4 <BootstrapperApplication> 4 <BootstrapperApplication>
5 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" /> 5 <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
6 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> 6 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" /> 7 <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
8 <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" /> 8 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
9 <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" /> 9 <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost /> 10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 11 </BootstrapperApplication>
12 12
13 <PackageGroup Id="TestBAdnc"> 13 <PackageGroup Id="TestBAdnc">
14 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet --> 14 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
15 </PackageGroup> 15 </PackageGroup>
16 </Fragment> 16 </Fragment>
17 <Fragment> 17 <Fragment>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index fdce5ecd..1dbc4f63 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -8,7 +8,7 @@
8 <ItemGroup> 8 <ItemGroup>
9 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" /> 9 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x86" BindName="net2x86" />
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" /> 10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x86" BindName="dnc5x86" /> 11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x86" BindName="dncx86" />
12 </ItemGroup> 12 </ItemGroup>
13 <ItemGroup> 13 <ItemGroup>
14 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" /> 14 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
index 078f4f01..df058958 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/TestBA_x64.wxs
@@ -2,16 +2,16 @@
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment> 3 <Fragment>
4 <BootstrapperApplication> 4 <BootstrapperApplication>
5 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.deps.json" /> 5 <Payload SourceFile="!(bindpath.dncx64)\TestBA.deps.json" />
6 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.dll" bal:BAFactoryAssembly="yes" /> 6 <Payload SourceFile="!(bindpath.dncx64)\TestBA.dll" bal:BAFactoryAssembly="yes" />
7 <Payload SourceFile="!(bindpath.dnc5x64)\TestBA.runtimeconfig.json" /> 7 <Payload SourceFile="!(bindpath.dncx64)\TestBA.runtimeconfig.json" />
8 <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" /> 8 <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
9 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" /> 9 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost /> 10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 11 </BootstrapperApplication>
12 12
13 <PackageGroup Id="TestBAdnc_x64"> 13 <PackageGroup Id="TestBAdnc_x64">
14 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet --> 14 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
15 </PackageGroup> 15 </PackageGroup>
16 </Fragment> 16 </Fragment>
17 <Fragment> 17 <Fragment>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
index f28b6b70..bc5d4080 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/WixBA_x64.wxs
@@ -2,17 +2,17 @@
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment> 3 <Fragment>
4 <BootstrapperApplication> 4 <BootstrapperApplication>
5 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.deps.json" /> 5 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.deps.json" />
6 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" /> 6 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.dll" bal:BAFactoryAssembly="yes" />
7 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.WixBA.runtimeconfig.json" /> 7 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.WixBA.runtimeconfig.json" />
8 <Payload SourceFile="!(bindpath.dnc5x64)\mbanative.dll" /> 8 <Payload SourceFile="!(bindpath.dncx64)\mbanative.dll" />
9 <Payload SourceFile="!(bindpath.dnc5x64)\WixToolset.Mba.Core.dll" /> 9 <Payload SourceFile="!(bindpath.dncx64)\WixToolset.Mba.Core.dll" />
10 <Payload SourceFile='..\..\..\..\..\..\License.txt' /> 10 <Payload SourceFile='..\..\..\..\..\..\License.txt' />
11 <bal:WixDotNetCoreBootstrapperApplicationHost /> 11 <bal:WixDotNetCoreBootstrapperApplicationHost />
12 </BootstrapperApplication> 12 </BootstrapperApplication>
13 13
14 <PackageGroup Id="WixBAdnc_x64"> 14 <PackageGroup Id="WixBAdnc_x64">
15 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet --> 15 <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 6 packages yet -->
16 </PackageGroup> 16 </PackageGroup>
17 </Fragment> 17 </Fragment>
18</Wix> 18</Wix>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index e63eb74c..3d714c4e 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -9,7 +9,7 @@
9 <ItemGroup> 9 <ItemGroup>
10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" /> 10 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net35\win-x64" BindName="net2x64" />
11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" /> 11 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net5.0-windows\win-x64" BindName="dnc5x64" /> 12 <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net6.0-windows\win-x64" BindName="dncx64" />
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup> 14 <ItemGroup>
15 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" /> 15 <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />