diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 16:08:21 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 18:35:15 -0500 |
| commit | 96ce05107d0e01014a3264e91ecb5731a9f28cc5 (patch) | |
| tree | 29c1128c0b9b0db476cedc1d446c2269bfdecf62 /src/test/burn/TestData/PrereqBaTests | |
| parent | 57fd164d56466a52854e825afd5fdc2b6b97f12a (diff) | |
| download | wix-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/PrereqBaTests')
| -rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj | 2 | ||||
| -rw-r--r-- | src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wxs | 8 |
2 files changed, 5 insertions, 5 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> |