aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-04-23 12:01:31 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-04-23 12:43:38 +1000
commitd686f0d92fc14940441dbf53c28547a975572f92 (patch)
tree4003440a0990ae09d77547c41b83da22806f4b02 /src/wixlib
parent6585189c97d73dee54a490e1c98f1872f422f7c0 (diff)
downloadwix-d686f0d92fc14940441dbf53c28547a975572f92.tar.gz
wix-d686f0d92fc14940441dbf53c28547a975572f92.tar.bz2
wix-d686f0d92fc14940441dbf53c28547a975572f92.zip
Add ManagedBootstrapperApplicationPrereqInformation element to move prereq info back to NetFx.
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/NetFx451AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx452AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx45AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx461AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx462AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx46AsPrereq.wxs34
-rw-r--r--src/wixlib/NetFx4AsPrereq.wxs71
-rw-r--r--src/wixlib/bal.wixproj7
8 files changed, 0 insertions, 282 deletions
diff --git a/src/wixlib/NetFx451AsPrereq.wxs b/src/wixlib/NetFx451AsPrereq.wxs
deleted file mode 100644
index 67c05b05..00000000
--- a/src/wixlib/NetFx451AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx451EulaLink = http://wixtoolset.org/licenses/netfx451 ?>
7 <?define NetFx451WebId = NetFx451Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx451WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx451WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx451WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx451EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx451RedistId = NetFx451Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx451RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx451RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx451EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx452AsPrereq.wxs b/src/wixlib/NetFx452AsPrereq.wxs
deleted file mode 100644
index b41a9986..00000000
--- a/src/wixlib/NetFx452AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?>
7 <?define NetFx452WebId = NetFx452Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx452WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx452WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx452EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx452RedistId = NetFx452Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx452RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx452RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx452EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx45AsPrereq.wxs b/src/wixlib/NetFx45AsPrereq.wxs
deleted file mode 100644
index b95fc8a4..00000000
--- a/src/wixlib/NetFx45AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx45EulaLink = http://go.microsoft.com/fwlink/?LinkID=260867 ?>
7 <?define NetFx45WebId = NetFx45Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx45WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx45WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx45WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx45EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx45RedistId = NetFx45Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx45RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx45RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx45EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx461AsPrereq.wxs b/src/wixlib/NetFx461AsPrereq.wxs
deleted file mode 100644
index d6b24b43..00000000
--- a/src/wixlib/NetFx461AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?>
7 <?define NetFx461WebId = NetFx461Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx461WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx461WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx461WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx461EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx461RedistId = NetFx461Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx461RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx461RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx461EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx462AsPrereq.wxs b/src/wixlib/NetFx462AsPrereq.wxs
deleted file mode 100644
index e6f6889a..00000000
--- a/src/wixlib/NetFx462AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx462EulaLink = http://referencesource.microsoft.com/license.html ?>
7 <?define NetFx462WebId = NetFx462Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx462WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx462WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx462WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx462EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx462RedistId = NetFx462Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx462RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx462RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx462EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx46AsPrereq.wxs b/src/wixlib/NetFx46AsPrereq.wxs
deleted file mode 100644
index 52880022..00000000
--- a/src/wixlib/NetFx46AsPrereq.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx46EulaLink = http://go.microsoft.com/fwlink/?LinkID=558772 ?>
7 <?define NetFx46WebId = NetFx46Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx46WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx46WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx46WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx46EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx46RedistId = NetFx46Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx46RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx46RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx46EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34</Wix>
diff --git a/src/wixlib/NetFx4AsPrereq.wxs b/src/wixlib/NetFx4AsPrereq.wxs
deleted file mode 100644
index 9b7437e5..00000000
--- a/src/wixlib/NetFx4AsPrereq.wxs
+++ /dev/null
@@ -1,71 +0,0 @@
1<?xml version='1.0' encoding='utf-8'?>
2<!-- 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. -->
3
4
5<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
6 <?define NetFx40EulaLink = http://go.microsoft.com/fwlink/?LinkID=188993 ?>
7 <?define NetFx40WebId = NetFx40Web ?>
8 <Fragment>
9 <PackageGroup Id="$(var.NetFx40WebId)AsPrereq">
10 <PackageGroupRef Id="$(var.NetFx40WebId)" />
11 </PackageGroup>
12
13 <CustomTable Id='WixMbaPrereqInformation'>
14 <Row>
15 <Data Column='PackageId'>$(var.NetFx40WebId)</Data>
16 <Data Column='LicenseUrl'>$(var.NetFx40EulaLink)</Data>
17 </Row>
18 </CustomTable>
19 </Fragment>
20
21 <?define NetFx40RedistId = NetFx40Redist ?>
22 <Fragment>
23 <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq">
24 <PackageGroupRef Id="$(var.NetFx40RedistId)" />
25 </PackageGroup>
26
27 <CustomTable Id='WixMbaPrereqInformation'>
28 <Row>
29 <Data Column='PackageId'>$(var.NetFx40RedistId)</Data>
30 <Data Column='LicenseUrl'>$(var.NetFx40EulaLink)</Data>
31 </Row>
32 </CustomTable>
33 </Fragment>
34
35 <?define NetFx40ClientWebId = NetFx40ClientWeb ?>
36 <Fragment>
37 <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq">
38 <PackageGroupRef Id="$(var.NetFx40ClientWebId)" />
39 </PackageGroup>
40
41 <CustomTable Id='WixMbaPrereqInformation'>
42 <Row>
43 <Data Column='PackageId'>$(var.NetFx40ClientWebId)</Data>
44 <Data Column='LicenseUrl'>$(var.NetFx40EulaLink)</Data>
45 </Row>
46 </CustomTable>
47 </Fragment>
48
49 <?define NetFx40ClientRedistId = NetFx40ClientRedist ?>
50 <Fragment>
51 <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq">
52 <PackageGroupRef Id="$(var.NetFx40ClientRedistId)" />
53 </PackageGroup>
54
55 <CustomTable Id='WixMbaPrereqInformation'>
56 <Row>
57 <Data Column='PackageId'>$(var.NetFx40ClientRedistId)</Data>
58 <Data Column='LicenseUrl'>$(var.NetFx40EulaLink)</Data>
59 </Row>
60 </CustomTable>
61 </Fragment>
62
63 <!-- Not sure why we have to redefine the table here. -->
64 <Fragment>
65 <CustomTable Id='WixMbaPrereqInformation' Unreal='yes'>
66 <Column Id='PackageId' Category='Identifier' Type='string' Width='72' PrimaryKey ='yes'/>
67 <Column Id='LicenseUrl' Category='Formatted' Type='string' Width='0' Nullable='yes'/>
68 <Column Id='LicenseFile' Category='Formatted' Type='string' Width='0' Nullable='yes'/>
69 </CustomTable>
70 </Fragment>
71</Wix>
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index 51268803..c33375fe 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -15,13 +15,6 @@
15 <ItemGroup> 15 <ItemGroup>
16 <Compile Include="BalExtension.wxs" /> 16 <Compile Include="BalExtension.wxs" />
17 <Compile Include="Mba.wxs" /> 17 <Compile Include="Mba.wxs" />
18 <Compile Include="NetFx4AsPrereq.wxs" />
19 <Compile Include="NetFx45AsPrereq.wxs" />
20 <Compile Include="NetFx451AsPrereq.wxs" />
21 <Compile Include="NetFx452AsPrereq.wxs" />
22 <Compile Include="NetFx46AsPrereq.wxs" />
23 <Compile Include="NetFx461AsPrereq.wxs" />
24 <Compile Include="NetFx462AsPrereq.wxs" />
25 <Compile Include="wixstdba.wxs" /> 18 <Compile Include="wixstdba.wxs" />
26 <Compile Include="wixstdba_x86.wxs" /> 19 <Compile Include="wixstdba_x86.wxs" />
27 </ItemGroup> 20 </ItemGroup>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-05 12:23:51 +0000