From f26403f12ba828f188673decaedb360843a3e6a7 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 19 Dec 2020 21:23:01 -0600
Subject: Fix AsPrereq package groups to include the referenced package.

---
 src/wixlib/NetCore3_Platform.wxi | 18 +++++++++++-------
 src/wixlib/NetFx4.5.wxs          |  8 ++++++--
 src/wixlib/NetFx4.wxs            | 16 ++++++++++++----
 src/wixlib/NetFx451.wxs          |  8 ++++++--
 src/wixlib/NetFx452.wxs          |  8 ++++++--
 src/wixlib/NetFx46.wxs           |  8 ++++++--
 src/wixlib/NetFx461.wxs          |  8 ++++++--
 src/wixlib/NetFx462.wxs          |  8 ++++++--
 src/wixlib/NetFx472.wxs          |  8 ++++++--
 src/wixlib/NetFx48.wxs           |  8 ++++++--
 src/wixlib/packages.config       |  7 -------
 11 files changed, 71 insertions(+), 34 deletions(-)
 delete mode 100644 src/wixlib/packages.config

(limited to 'src')

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 @@
         After="$(var.DotNetHomeId)" />
   </Fragment>
 
-  <!--
   <Fragment>
-    <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq" />
+    <PackageGroup Id="$(var.AspNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.AspNetCoreRedistId)" />
+    </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" />
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.AspNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq" />
+    <PackageGroup Id="$(var.DesktopNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DesktopNetCoreRedistId)" />
+    </PackageGroup>
 
-    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" />
+    <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DesktopNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </Fragment>
-  -->
 
   <Fragment>
-    <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq" />
+    <PackageGroup Id="$(var.DotNetCoreRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.DotNetCoreRedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.DotNetCoreRedistId)" LicenseUrl="$(var.NetCoreEulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx45WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx45WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx45WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
   </Fragment>
@@ -114,7 +116,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx45RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx40WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx40WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx40WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
   </Fragment>
@@ -105,7 +107,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx40RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
   </Fragment>
@@ -150,7 +154,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx40ClientWebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
   </Fragment>
@@ -185,7 +191,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx40ClientRedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx451WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx451WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx451WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
   </Fragment>
@@ -104,7 +106,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx451RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx452WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx452WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx452WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452WebId)" LicenseUrl="$(var.NetFx452EulaLink)" />
   </Fragment>
@@ -102,7 +104,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx452RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx452RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx452RedistId)" LicenseUrl="$(var.NetFx452EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx46WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx46WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx46WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" />
   </Fragment>
@@ -104,7 +106,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx46RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx461WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx461WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx461WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461WebId)" LicenseUrl="$(var.NetFx461EulaLink)" />
   </Fragment>
@@ -103,7 +105,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx461RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx461RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx461RedistId)" LicenseUrl="$(var.NetFx461EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx462WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx462WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx462WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462WebId)" LicenseUrl="$(var.NetFx462EulaLink)" />
   </Fragment>
@@ -103,7 +105,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx462RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx462RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx462RedistId)" LicenseUrl="$(var.NetFx462EulaLink)" />
   </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 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx472WebId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx472WebId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx472WebId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472WebId)" LicenseUrl="$(var.NetFx472EulaLink)" />
   </Fragment>
@@ -101,7 +103,9 @@
   </Fragment>
 
   <Fragment>
-    <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq" />
+    <PackageGroup Id="$(var.NetFx472RedistId)AsPrereq">
+      <PackageGroupRef Id="$(var.NetFx472RedistId)" />
+    </PackageGroup>
 
     <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx472RedistId)" LicenseUrl="$(var.NetFx472EulaLink)" />
   </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 @@
     </Fragment>
 
     <Fragment>
-        <PackageGroup Id="$(var.NetFx48WebId)AsPrereq" />
+        <PackageGroup Id="$(var.NetFx48WebId)AsPrereq">
+            <PackageGroupRef Id="$(var.NetFx48WebId)" />
+        </PackageGroup>
 
         <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48WebId)" LicenseUrl="$(var.NetFx48EulaLink)" />
     </Fragment>
@@ -101,7 +103,9 @@
     </Fragment>
 
     <Fragment>
-        <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq" />
+        <PackageGroup Id="$(var.NetFx48RedistId)AsPrereq">
+            <PackageGroupRef Id="$(var.NetFx48RedistId)" />
+        </PackageGroup>
 
         <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx48RedistId)" LicenseUrl="$(var.NetFx48EulaLink)" />
     </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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="3.3.37" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.MSBuild" version="4.0.0-build-0133" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.Bal.wixext" version="4.0.40" targetFramework="net40" />
-  <package id="WixToolset.Util.wixext" version="4.0.36" targetFramework="net40" />
-</packages>
\ No newline at end of file
-- 
cgit v1.2.3-55-g6feb