diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-01-01 19:11:00 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-01-03 16:20:18 -0600 |
| commit | 73dc2706d9f151554356aaf3e69bfad5b46a21e9 (patch) | |
| tree | 5a269e528665d8503d7c1c457ede54c60a4095c1 /src/TestData/TestBA | |
| parent | 36b1a2ce73b394ca3ed7490a1392320e2f401cbd (diff) | |
| download | wix-73dc2706d9f151554356aaf3e69bfad5b46a21e9.tar.gz wix-73dc2706d9f151554356aaf3e69bfad5b46a21e9.tar.bz2 wix-73dc2706d9f151554356aaf3e69bfad5b46a21e9.zip | |
Add tests for wrong managed BA configuration.
Test out the .NET Core test BA as well.
Diffstat (limited to 'src/TestData/TestBA')
| -rw-r--r-- | src/TestData/TestBA/TestBAWixlib/TestBA.wxs | 22 | ||||
| -rw-r--r-- | src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | 3 |
2 files changed, 20 insertions, 5 deletions
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 @@ | |||
| 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 Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" /> | 5 | <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.deps.json" /> |
| 6 | <Payload SourceFile="!(bindpath.x86)\TestBA.dll" /> | 6 | <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> |
| 7 | <Payload SourceFile="!(bindpath.x86)\mbanative.dll" /> | 7 | <Payload SourceFile="!(bindpath.dnc5x86)\TestBA.runtimeconfig.json" /> |
| 8 | <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="!(bindpath.dnc5x86)\mbanative.dll" /> |
| 9 | <Payload SourceFile="!(bindpath.dnc5x86)\WixToolset.Mba.Core.dll" /> | ||
| 10 | <bal:WixDotNetCoreBootstrapperApplicationHost /> | ||
| 11 | </BootstrapperApplication> | ||
| 12 | |||
| 13 | <PackageGroup Id="TestBAdnc"> | ||
| 14 | <PackageGroupRef Id="NetFx48WebAsPrereq" /> <!-- Yes, this is wrong but we don't have .NET 5 packages yet --> | ||
| 15 | </PackageGroup> | ||
| 16 | </Fragment> | ||
| 17 | <Fragment> | ||
| 18 | <BootstrapperApplication> | ||
| 19 | <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" /> | ||
| 20 | <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" /> | ||
| 21 | <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" /> | ||
| 22 | <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" /> | ||
| 9 | <bal:WixManagedBootstrapperApplicationHost /> | 23 | <bal:WixManagedBootstrapperApplicationHost /> |
| 10 | </BootstrapperApplication> | 24 | </BootstrapperApplication> |
| 11 | 25 | ||
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 @@ | |||
| 6 | <Cultures>en-us</Cultures> | 6 | <Cultures>en-us</Cultures> |
| 7 | </PropertyGroup> | 7 | </PropertyGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="x86" /> | 9 | <BindInputPaths Include="$(OutputPath)..\net35\win-x86" BindName="net2x86" /> |
| 10 | <BindInputPaths Include="$(OutputPath)..\net5.0-windows\win-x86" BindName="dnc5x86" /> | ||
| 10 | </ItemGroup> | 11 | </ItemGroup> |
| 11 | <ItemGroup> | 12 | <ItemGroup> |
| 12 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> | 13 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> |