aboutsummaryrefslogtreecommitdiff
path: root/src/test/burn/TestData/TestBA/TestBAWixlib
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-01-11 18:26:20 -0800
committerRob Mensching <rob@firegiant.com>2024-03-06 18:03:38 -0800
commit0d3d54992104288e9ee0c834d0b96e8502fd2d42 (patch)
tree9efa49c4983cd2ba1becab64bd1f2faccac88acf /src/test/burn/TestData/TestBA/TestBAWixlib
parent2824298d9dd817a47527c920363556b54ead5d5d (diff)
downloadwix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.gz
wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.tar.bz2
wix-0d3d54992104288e9ee0c834d0b96e8502fd2d42.zip
Move the BootstrapperApplication out of proc
Diffstat (limited to 'src/test/burn/TestData/TestBA/TestBAWixlib')
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi8
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs11
-rw-r--r--src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs6
3 files changed, 10 insertions, 15 deletions
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
index c09c3624..e3458815 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/NetCore6_Platform.wxi
@@ -35,7 +35,7 @@
35 <PackageGroupRef Id="$(var.AspNetCoreRedistId)" /> 35 <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
36 </PackageGroup> 36 </PackageGroup>
37 37
38 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> 38 <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
39 </Fragment> 39 </Fragment>
40 40
41 <Fragment> 41 <Fragment>
@@ -43,7 +43,7 @@
43 <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" /> 43 <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
44 </PackageGroup> 44 </PackageGroup>
45 45
46 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> 46 <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
47 </Fragment> 47 </Fragment>
48 48
49 <Fragment> 49 <Fragment>
@@ -51,7 +51,7 @@
51 <PackageGroupRef Id="$(var.DotNetCoreRedistId)" /> 51 <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
52 </PackageGroup> 52 </PackageGroup>
53 53
54 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> 54 <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
55 </Fragment> 55 </Fragment>
56 56
57 <Fragment> 57 <Fragment>
@@ -59,6 +59,6 @@
59 <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" /> 59 <PackageGroupRef Id="$(var.DotNetCoreSdkRedistId)" />
60 </PackageGroup> 60 </PackageGroup>
61 61
62 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> 62 <bal:BootstrapperApplicationPrerequisiteInformation PackageId="$(var.DotNetCoreSdkRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
63 </Fragment> 63 </Fragment>
64</Include> 64</Include>
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
index 2db22e4b..98c3acb2 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/TestBA.wxs
@@ -1,13 +1,12 @@
1<!-- 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. --> 1<!-- 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. -->
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 SourceFile="!(bindpath.dncx86)\TestBA.exe">
5 <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" /> 5 <Payload SourceFile="!(bindpath.dncx86)\TestBA.deps.json" />
6 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" bal:BAFactoryAssembly="yes" /> 6 <Payload SourceFile="!(bindpath.dncx86)\TestBA.dll" />
7 <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" /> 7 <Payload SourceFile="!(bindpath.dncx86)\TestBA.runtimeconfig.json" />
8 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" /> 8 <Payload SourceFile="!(bindpath.dncx86)\mbanative.dll" />
9 <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" /> 9 <Payload SourceFile="!(bindpath.dncx86)\WixToolset.Mba.Core.dll" />
10 <bal:WixDotNetCoreBootstrapperApplicationHost />
11 </BootstrapperApplication> 10 </BootstrapperApplication>
12 11
13 <PackageGroup Id="TestBAdnc"> 12 <PackageGroup Id="TestBAdnc">
@@ -15,12 +14,10 @@
15 </PackageGroup> 14 </PackageGroup>
16 </Fragment> 15 </Fragment>
17 <Fragment> 16 <Fragment>
18 <BootstrapperApplication> 17 <BootstrapperApplication SourceFile="!(bindpath.net2x86)\TestBA.exe">
19 <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net2x86)\TestBA.BootstrapperCore.config" /> 18 <Payload SourceFile="!(bindpath.net2x86)\TestBA.exe.config" />
20 <Payload SourceFile="!(bindpath.net2x86)\TestBA.dll" />
21 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" /> 19 <Payload SourceFile="!(bindpath.net2x86)\mbanative.dll" />
22 <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" /> 20 <Payload SourceFile="!(bindpath.net2x86)\WixToolset.Mba.Core.dll" />
23 <bal:WixManagedBootstrapperApplicationHost />
24 </BootstrapperApplication> 21 </BootstrapperApplication>
25 22
26 <PackageGroup Id="TestBA"> 23 <PackageGroup Id="TestBA">
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
index c6da2a17..3d4eb274 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/WixBA.wxs
@@ -1,13 +1,11 @@
1<!-- 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. --> 1<!-- 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. -->
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 SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe">
5 <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.net4x86)\WixBA.BootstrapperCore.config" /> 5 <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.exe.config" />
6 <Payload SourceFile="!(bindpath.net4x86)\WixToolset.WixBA.dll" />
7 <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" /> 6 <Payload SourceFile="!(bindpath.net4x86)\mbanative.dll" />
8 <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" /> 7 <Payload SourceFile="!(bindpath.net4x86)\WixToolset.Mba.Core.dll" />
9 <Payload SourceFile='..\..\..\..\..\..\License.txt' /> 8 <Payload SourceFile='..\..\..\..\..\..\License.txt' />
10 <bal:WixManagedBootstrapperApplicationHost />
11 </BootstrapperApplication> 9 </BootstrapperApplication>
12 10
13 <PackageGroup Id="WixBA"> 11 <PackageGroup Id="WixBA">
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-26 11:03:56 +0000