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/TestBA/TestBAWixlib | |
| 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/TestBA/TestBAWixlib')
| -rw-r--r-- | src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs | 12 | ||||
| -rw-r--r-- | src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | 2 |
2 files changed, 7 insertions, 7 deletions
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" /> |