aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-19 21:23:01 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-19 22:15:24 -0600
commitf26403f12ba828f188673decaedb360843a3e6a7 (patch)
treed209a87ae9a89fea7b34516ec8d415edd31de34f
parent13e438a69daa9830ec25689d75be1637bb0bb99f (diff)
downloadwix-f26403f12ba828f188673decaedb360843a3e6a7.tar.gz
wix-f26403f12ba828f188673decaedb360843a3e6a7.tar.bz2
wix-f26403f12ba828f188673decaedb360843a3e6a7.zip
Fix AsPrereq package groups to include the referenced package.
Diffstat
-rw-r--r--src/wixlib/NetCore3_Platform.wxi18
-rw-r--r--src/wixlib/NetFx4.5.wxs8
-rw-r--r--src/wixlib/NetFx4.wxs16
-rw-r--r--src/wixlib/NetFx451.wxs8
-rw-r--r--src/wixlib/NetFx452.wxs8
-rw-r--r--src/wixlib/NetFx46.wxs8
-rw-r--r--src/wixlib/NetFx461.wxs8
-rw-r--r--src/wixlib/NetFx462.wxs8
-rw-r--r--src/wixlib/NetFx472.wxs8
-rw-r--r--src/wixlib/NetFx48.wxs8
-rw-r--r--src/wixlib/packages.config7
11 files changed, 71 insertions, 34 deletions
diff --git a/src/wixlib/NetCore3_Platform.wxi b/src/wixlib/NetCore3_Platform.wxi
index 67d75e27..2079b5c4 100644
--- a/src/wixlib/NetCore3_Platform.wxi
+++ b/src/wixlib/NetCore3_Platform.wxi
@@ -57,22 +57,26 @@
57 After="$(var.DotNetHomeId)" /> 57 After="$(var.DotNetHomeId)" />
58 </Fragment> 58 </Fragment>
59 59
60 <!--
61 <Fragment> 60 <Fragment>
62 <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq" /> 61 <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq">
62 <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
63 </PackageGroup>
63 64
64 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" /> 65 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
65 </Fragment> 66 </Fragment>
66 67
67 <Fragment> 68 <Fragment>
68 <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq" /> 69 <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq">
70 <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
71 </PackageGroup>
69 72
70 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" /> 73 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
71 </Fragment> 74 </Fragment>
72 -->
73 75
74 <Fragment> 76 <Fragment>
75 <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq" /> 77 <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq">
78 <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
79 </PackageGroup>
76 80
77 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" /> 81 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
78 </Fragment> 82 </Fragment>
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs
index ace065e2..ea8b66c5 100644
--- a/src/wixlib/NetFx4.5.wxs
+++ b/src/wixlib/NetFx4.5.wxs
@@ -73,7 +73,9 @@
73 </Fragment> 73 </Fragment>
74 74
75 <Fragment> 75 <Fragment>
76 <PackageGroup Id="$(var.NetFx45WebId)AsPrereq" /> 76 <PackageGroup Id="$(var.NetFx45WebId)AsPrereq">
77 <PackageGroupRef Id="$(var.NetFx45WebId)" />
78 </PackageGroup>
77 79
78 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" /> 80 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
79 </Fragment> 81 </Fragment>
@@ -114,7 +116,9 @@
114 </Fragment> 116 </Fragment>
115 117
116 <Fragment> 118 <Fragment>
117 <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq" /> 119 <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq">
120 <PackageGroupRef Id="$(var.NetFx45RedistId)" />
121 </PackageGroup>
118 122
119 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" /> 123 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
120 </Fragment> 124 </Fragment>
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs
index 047915b9..ac463c3c 100644
--- a/src/wixlib/NetFx4.wxs
+++ b/src/wixlib/NetFx4.wxs
@@ -70,7 +70,9 @@
70 </Fragment> 70 </Fragment>
71 71
72 <Fragment> 72 <Fragment>
73 <PackageGroup Id="$(var.NetFx40WebId)AsPrereq" /> 73 <PackageGroup Id="$(var.NetFx40WebId)AsPrereq">
74 <PackageGroupRef Id="$(var.NetFx40WebId)" />
75 </PackageGroup>
74 76
75 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" /> 77 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
76 </Fragment> 78 </Fragment>
@@ -105,7 +107,9 @@
105 </Fragment> 107 </Fragment>
106 108
107 <Fragment> 109 <Fragment>
108 <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq" /> 110 <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq">
111 <PackageGroupRef Id="$(var.NetFx40RedistId)" />
112 </PackageGroup>
109 113
110 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" /> 114 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
111 </Fragment> 115 </Fragment>
@@ -150,7 +154,9 @@
150 </Fragment> 154 </Fragment>
151 155
152 <Fragment> 156 <Fragment>
153 <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq" /> 157 <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq">
158 <PackageGroupRef Id="$(var.NetFx40ClientWebId)" />
159 </PackageGroup>
154 160
155 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" /> 161 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
156 </Fragment> 162 </Fragment>
@@ -185,7 +191,9 @@
185 </Fragment> 191 </Fragment>
186 192
187 <Fragment> 193 <Fragment>
188 <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq" /> 194 <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq">
195 <PackageGroupRef Id="$(var.NetFx40ClientRedistId)" />
196 </PackageGroup>
189 197
190 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" /> 198 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
191 </Fragment> 199 </Fragment>
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs
index 36b6bab9..145de6d9 100644
--- a/src/wixlib/NetFx451.wxs
+++ b/src/wixlib/NetFx451.wxs
@@ -63,7 +63,9 @@
63 </Fragment> 63 </Fragment>
64 64
65 <Fragment> 65 <Fragment>
66 <PackageGroup Id="$(var.NetFx451WebId)AsPrereq" /> 66 <PackageGroup Id="$(var.NetFx451WebId)AsPrereq">
67 <PackageGroupRef Id="$(var.NetFx451WebId)" />
68 </PackageGroup>
67 69
68 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" /> 70 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
69 </Fragment> 71 </Fragment>
@@ -104,7 +106,9 @@
104 </Fragment> 106 </Fragment>
105 107
106 <Fragment> 108 <Fragment>
107 <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq" /> 109 <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq">
110 <PackageGroupRef Id="$(var.NetFx451RedistId)" />
111 </PackageGroup>
108 112
109 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" /> 113 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
110 </Fragment> 114 </Fragment>
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 8dbdd9b3..1dfa6600 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -61,7 +61,9 @@
61 </Fragment> 61 </Fragment>
62 62
63 <Fragment> 63 <Fragment>
64 <PackageGroup Id="$(var.NetFx452WebId)AsPrereq" /> 64 <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
65 <PackageGroupRef Id="$(var.NetFx452WebId)" />
66 </PackageGroup>
65 67
66 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" /> 68 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
67 </Fragment> 69 </Fragment>
@@ -102,7 +104,9 @@
102 </Fragment> 104 </Fragment>
103 105
104 <Fragment> 106 <Fragment>
105 <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq" /> 107 <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
108 <PackageGroupRef Id="$(var.NetFx452RedistId)" />
109 </PackageGroup>
106 110
107 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" /> 111 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
108 </Fragment> 112 </Fragment>
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs
index 5c875d09..c185f339 100644
--- a/src/wixlib/NetFx46.wxs
+++ b/src/wixlib/NetFx46.wxs
@@ -63,7 +63,9 @@
63 </Fragment> 63 </Fragment>
64 64
65 <Fragment> 65 <Fragment>
66 <PackageGroup Id="$(var.NetFx46WebId)AsPrereq" /> 66 <PackageGroup Id="$(var.NetFx46WebId)AsPrereq">
67 <PackageGroupRef Id="$(var.NetFx46WebId)" />
68 </PackageGroup>
67 69
68 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" /> 70 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
69 </Fragment> 71 </Fragment>
@@ -104,7 +106,9 @@
104 </Fragment> 106 </Fragment>
105 107
106 <Fragment> 108 <Fragment>
107 <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq" /> 109 <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq">
110 <PackageGroupRef Id="$(var.NetFx46RedistId)" />
111 </PackageGroup>
108 112
109 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" /> 113 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
110 </Fragment> 114 </Fragment>
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs
index ec5a405c..5a43929f 100644
--- a/src/wixlib/NetFx461.wxs
+++ b/src/wixlib/NetFx461.wxs
@@ -62,7 +62,9 @@
62 </Fragment> 62 </Fragment>
63 63
64 <Fragment> 64 <Fragment>
65 <PackageGroup Id="$(var.NetFx461WebId)AsPrereq" /> 65 <PackageGroup Id="$(var.NetFx461WebId)AsPrereq">
66 <PackageGroupRef Id="$(var.NetFx461WebId)" />
67 </PackageGroup>
66 68
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" /> 69 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
68 </Fragment> 70 </Fragment>
@@ -103,7 +105,9 @@
103 </Fragment> 105 </Fragment>
104 106
105 <Fragment> 107 <Fragment>
106 <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq" /> 108 <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq">
109 <PackageGroupRef Id="$(var.NetFx461RedistId)" />
110 </PackageGroup>
107 111
108 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" /> 112 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
109 </Fragment> 113 </Fragment>
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs
index fc3aa158..75321147 100644
--- a/src/wixlib/NetFx462.wxs
+++ b/src/wixlib/NetFx462.wxs
@@ -62,7 +62,9 @@
62 </Fragment> 62 </Fragment>
63 63
64 <Fragment> 64 <Fragment>
65 <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" /> 65 <PackageGroup Id="$(var.NetFx462WebId)AsPrereq">
66 <PackageGroupRef Id="$(var.NetFx462WebId)" />
67 </PackageGroup>
66 68
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" /> 69 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
68 </Fragment> 70 </Fragment>
@@ -103,7 +105,9 @@
103 </Fragment> 105 </Fragment>
104 106
105 <Fragment> 107 <Fragment>
106 <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq" /> 108 <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq">
109 <PackageGroupRef Id="$(var.NetFx462RedistId)" />
110 </PackageGroup>
107 111
108 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" /> 112 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
109 </Fragment> 113 </Fragment>
diff --git a/src/wixlib/NetFx472.wxs b/src/wixlib/NetFx472.wxs
index 5aaa1976..f17e9997 100644
--- a/src/wixlib/NetFx472.wxs
+++ b/src/wixlib/NetFx472.wxs
@@ -60,7 +60,9 @@
60 </Fragment> 60 </Fragment>
61 61
62 <Fragment> 62 <Fragment>
63 <PackageGroup Id="$(var.NetFx472WebId)AsPrereq" /> 63 <PackageGroup Id="$(var.NetFx472WebId)AsPrereq">
64 <PackageGroupRef Id="$(var.NetFx472WebId)" />
65 </PackageGroup>
64 66
65 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" /> 67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
66 </Fragment> 68 </Fragment>
@@ -101,7 +103,9 @@
101 </Fragment> 103 </Fragment>
102 104
103 <Fragment> 105 <Fragment>
104 <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq" /> 106 <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq">
107 <PackageGroupRef Id="$(var.NetFx472RedistId)" />
108 </PackageGroup>
105 109
106 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" /> 110 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
107 </Fragment> 111 </Fragment>
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs
index acc79a31..9a5dd8bf 100644
--- a/src/wixlib/NetFx48.wxs
+++ b/src/wixlib/NetFx48.wxs
@@ -60,7 +60,9 @@
60 </Fragment> 60 </Fragment>
61 61
62 <Fragment> 62 <Fragment>
63 <PackageGroup Id="$(var.NetFx48WebId)AsPrereq" /> 63 <PackageGroup Id="$(var.NetFx48WebId)AsPrereq">
64 <PackageGroupRef Id="$(var.NetFx48WebId)" />
65 </PackageGroup>
64 66
65 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" /> 67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
66 </Fragment> 68 </Fragment>
@@ -101,7 +103,9 @@
101 </Fragment> 103 </Fragment>
102 104
103 <Fragment> 105 <Fragment>
104 <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq" /> 106 <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq">
107 <PackageGroupRef Id="$(var.NetFx48RedistId)" />
108 </PackageGroup>
105 109
106 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" /> 110 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
107 </Fragment> 111 </Fragment>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
deleted file mode 100644
index 89d73c36..00000000
--- a/src/wixlib/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
4 <package id="WixToolset.MSBuild" version="4.0.0-build-0133" developmentDependency="true" targetFramework="net40" />
5 <package id="WixToolset.Bal.wixext" version="4.0.40" targetFramework="net40" />
6 <package id="WixToolset.Util.wixext" version="4.0.36" targetFramework="net40" />
7</packages> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-29 13:17:55 +0000