@joebigelow / wix-1 / commits / f26403f1

Fix AsPrereq package groups to include the referenced package.

Sean Hall committed Dec 19, 2020 at 21:23 UTC f26403f12ba828f188673decaedb360843a3e6a7
11 files changed +71 -34
src/wixlib/NetCore3_Platform.wxi
+11 -7
@@ -57,22 +57,26 @@
57 After="$(var.DotNetHomeId)" />
58 </Fragment>
59
60 - <!--
60 <Fragment>
62 - <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq" />
61 + <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq">
62 + <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
63 + </PackageGroup>
64
64 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" />
65 + <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
66 </Fragment>
67
68 <Fragment>
68 - <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq" />
69 + <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq">
70 + <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
71 + </PackageGroup>
72
70 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" />
73 + <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
74 </Fragment>
72 - -->
75
76 <Fragment>
75 - <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq" />
77 + <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq">
78 + <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
79 + </PackageGroup>
80
81 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
82 </Fragment>
src/wixlib/NetFx4.5.wxs
+6 -2
@@ -73,7 +73,9 @@
73 </Fragment>
74
75 <Fragment>
76 - <PackageGroup Id="$(var.NetFx45WebId)AsPrereq" />
76 + <PackageGroup Id="$(var.NetFx45WebId)AsPrereq">
77 + <PackageGroupRef Id="$(var.NetFx45WebId)" />
78 + </PackageGroup>
79
80 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
81 </Fragment>
@@ -114,7 +116,9 @@
116 </Fragment>
117
118 <Fragment>
117 - <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq" />
119 + <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq">
120 + <PackageGroupRef Id="$(var.NetFx45RedistId)" />
121 + </PackageGroup>
122
123 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
124 </Fragment>
src/wixlib/NetFx4.wxs
+12 -4
@@ -70,7 +70,9 @@
70 </Fragment>
71
72 <Fragment>
73 - <PackageGroup Id="$(var.NetFx40WebId)AsPrereq" />
73 + <PackageGroup Id="$(var.NetFx40WebId)AsPrereq">
74 + <PackageGroupRef Id="$(var.NetFx40WebId)" />
75 + </PackageGroup>
76
77 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
78 </Fragment>
@@ -105,7 +107,9 @@
107 </Fragment>
108
109 <Fragment>
108 - <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq" />
110 + <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq">
111 + <PackageGroupRef Id="$(var.NetFx40RedistId)" />
112 + </PackageGroup>
113
114 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
115 </Fragment>
@@ -150,7 +154,9 @@
154 </Fragment>
155
156 <Fragment>
153 - <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq" />
157 + <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq">
158 + <PackageGroupRef Id="$(var.NetFx40ClientWebId)" />
159 + </PackageGroup>
160
161 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
162 </Fragment>
@@ -185,7 +191,9 @@
191 </Fragment>
192
193 <Fragment>
188 - <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq" />
194 + <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq">
195 + <PackageGroupRef Id="$(var.NetFx40ClientRedistId)" />
196 + </PackageGroup>
197
198 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
199 </Fragment>
src/wixlib/NetFx451.wxs
+6 -2
@@ -63,7 +63,9 @@
63 </Fragment>
64
65 <Fragment>
66 - <PackageGroup Id="$(var.NetFx451WebId)AsPrereq" />
66 + <PackageGroup Id="$(var.NetFx451WebId)AsPrereq">
67 + <PackageGroupRef Id="$(var.NetFx451WebId)" />
68 + </PackageGroup>
69
70 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
71 </Fragment>
@@ -104,7 +106,9 @@
106 </Fragment>
107
108 <Fragment>
107 - <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq" />
109 + <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq">
110 + <PackageGroupRef Id="$(var.NetFx451RedistId)" />
111 + </PackageGroup>
112
113 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
114 </Fragment>
src/wixlib/NetFx452.wxs
+6 -2
@@ -61,7 +61,9 @@
61 </Fragment>
62
63 <Fragment>
64 - <PackageGroup Id="$(var.NetFx452WebId)AsPrereq" />
64 + <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
65 + <PackageGroupRef Id="$(var.NetFx452WebId)" />
66 + </PackageGroup>
67
68 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
69 </Fragment>
@@ -102,7 +104,9 @@
104 </Fragment>
105
106 <Fragment>
105 - <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq" />
107 + <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
108 + <PackageGroupRef Id="$(var.NetFx452RedistId)" />
109 + </PackageGroup>
110
111 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
112 </Fragment>
src/wixlib/NetFx46.wxs
+6 -2
@@ -63,7 +63,9 @@
63 </Fragment>
64
65 <Fragment>
66 - <PackageGroup Id="$(var.NetFx46WebId)AsPrereq" />
66 + <PackageGroup Id="$(var.NetFx46WebId)AsPrereq">
67 + <PackageGroupRef Id="$(var.NetFx46WebId)" />
68 + </PackageGroup>
69
70 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
71 </Fragment>
@@ -104,7 +106,9 @@
106 </Fragment>
107
108 <Fragment>
107 - <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq" />
109 + <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq">
110 + <PackageGroupRef Id="$(var.NetFx46RedistId)" />
111 + </PackageGroup>
112
113 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
114 </Fragment>
src/wixlib/NetFx461.wxs
+6 -2
@@ -62,7 +62,9 @@
62 </Fragment>
63
64 <Fragment>
65 - <PackageGroup Id="$(var.NetFx461WebId)AsPrereq" />
65 + <PackageGroup Id="$(var.NetFx461WebId)AsPrereq">
66 + <PackageGroupRef Id="$(var.NetFx461WebId)" />
67 + </PackageGroup>
68
69 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
70 </Fragment>
@@ -103,7 +105,9 @@
105 </Fragment>
106
107 <Fragment>
106 - <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq" />
108 + <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq">
109 + <PackageGroupRef Id="$(var.NetFx461RedistId)" />
110 + </PackageGroup>
111
112 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
113 </Fragment>
src/wixlib/NetFx462.wxs
+6 -2
@@ -62,7 +62,9 @@
62 </Fragment>
63
64 <Fragment>
65 - <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" />
65 + <PackageGroup Id="$(var.NetFx462WebId)AsPrereq">
66 + <PackageGroupRef Id="$(var.NetFx462WebId)" />
67 + </PackageGroup>
68
69 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
70 </Fragment>
@@ -103,7 +105,9 @@
105 </Fragment>
106
107 <Fragment>
106 - <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq" />
108 + <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq">
109 + <PackageGroupRef Id="$(var.NetFx462RedistId)" />
110 + </PackageGroup>
111
112 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
113 </Fragment>
src/wixlib/NetFx472.wxs
+6 -2
@@ -60,7 +60,9 @@
60 </Fragment>
61
62 <Fragment>
63 - <PackageGroup Id="$(var.NetFx472WebId)AsPrereq" />
63 + <PackageGroup Id="$(var.NetFx472WebId)AsPrereq">
64 + <PackageGroupRef Id="$(var.NetFx472WebId)" />
65 + </PackageGroup>
66
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
68 </Fragment>
@@ -101,7 +103,9 @@
103 </Fragment>
104
105 <Fragment>
104 - <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq" />
106 + <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq">
107 + <PackageGroupRef Id="$(var.NetFx472RedistId)" />
108 + </PackageGroup>
109
110 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
111 </Fragment>
src/wixlib/NetFx48.wxs
+6 -2
@@ -60,7 +60,9 @@
60 </Fragment>
61
62 <Fragment>
63 - <PackageGroup Id="$(var.NetFx48WebId)AsPrereq" />
63 + <PackageGroup Id="$(var.NetFx48WebId)AsPrereq">
64 + <PackageGroupRef Id="$(var.NetFx48WebId)" />
65 + </PackageGroup>
66
67 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
68 </Fragment>
@@ -101,7 +103,9 @@
103 </Fragment>
104
105 <Fragment>
104 - <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq" />
106 + <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq">
107 + <PackageGroupRef Id="$(var.NetFx48RedistId)" />
108 + </PackageGroup>
109
110 <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
111 </Fragment>
src/wixlib/packages.config deleted
-7
@@ -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