1 files changed, 51 insertions, 39 deletions
diff --git a/src/wixlib/NetCore3.1.1.wxs b/src/wixlib/NetCore3.1.1.wxs
index 109d4f6b..50e4eae2 100644
--- a/src/wixlib/NetCore3.1.1.wxs
+++ b/src/wixlib/NetCore3.1.1.wxs
@@ -1,30 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+    <?define NetCorePlatform = x64?>
+    <?define NetCoreIdVersion = 311?>
+    <?define NetCoreVersion = 3.1.1?>
+    <?include NetCore3_Platform.wxi?>
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
    <Fragment>
-        <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.1"/>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-        <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
-        <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
-        <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-        <PackageGroup Id="AspNetCoreRuntime31Web">
+        <PackageGroup Id="$(var.AspNetCoreRedistId)">
            <ExePackage
-              Name="aspnetcore-runtime-3.1.1-win-x64.exe"
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-              InstallCommand="/install /quiet /norestart /log &quot;[AspNetCoreRuntime31Log]&quot;"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-              RepairCommand="/repair /quiet /norestart /log &quot;[AspNetCoreRuntime31Log]&quot;"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-              UninstallCommand="/uninstall /quiet /norestart /log &quot;[AspNetCoreRuntime31Log]&quot;"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
-              PerMachine="yes"
+                PerMachine="yes"
-              DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-              InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-              Vital="yes"
+                Id="$(var.AspNetCoreRedistId)"
-              Permanent="yes"
+                Vital="yes"
-              Protocol="burn"
+                Permanent="yes"
-              DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe"
+                Protocol="burn"
-              LogPathVariable="AspNetCoreRuntime31Log"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
-              Compressed="no">
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
-                <!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.1-win-x64.exe" -o "aspnetcore-runtime.wxs" -->
+                Compressed="no">
                <RemotePayload
                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
@@ -38,28 +49,29 @@
    </Fragment>
    <Fragment>
-        <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.1"/>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-        <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
-        <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
-        <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-        <PackageGroup Id="WindowsDesktopRuntime31Web">
+        <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
            <ExePackage
-              Name="windowsdesktop-runtime-3.1.1-win-x64.exe"
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-              InstallCommand="/install /quiet /norestart /log &quot;[WindowsDesktopRuntime31Log]&quot;"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-              RepairCommand="/repair /quiet /norestart /log &quot;[WindowsDesktopRuntime31Log]&quot;"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-              UninstallCommand="/uninstall /quiet /norestart /log &quot;[WindowsDesktopRuntime31Log]&quot;"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
-              PerMachine="yes"
+                PerMachine="yes"
-              DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-              InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-              Vital="yes"
+                Id="$(var.DesktopNetCoreRedistId)"
-              Permanent="yes"
+                Vital="yes"
-              Protocol="burn"
+                Permanent="yes"
-              DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe"
+                Protocol="burn"
-              LogPathVariable="WindowsDesktopRuntime31Log"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-              Compressed="no">
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
-                <!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.1-win-x64.exe" -o "windowsdesktop-runtime.wxs" -->
+                Compressed="no">
                <RemotePayload
                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"

diff --git a/src/wixlib/NetCore3.1.1.wxs b/src/wixlib/NetCore3.1.1.wxs index 109d4f6b..50e4eae2 100644 --- a/src/wixlib/NetCore3.1.1.wxs +++ b/src/wixlib/NetCore3.1.1.wxs
@@ -1,30 +1,41 @@
1	<?xml version="1.0" encoding="utf-8"?>	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. -->	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		3
4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
		5	xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
		6
		7	<?define NetCorePlatform = x64?>
		8	<?define NetCoreIdVersion = 311?>
		9	<?define NetCoreVersion = 3.1.1?>
		10	<?include NetCore3_Platform.wxi?>
		11
		12	<?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
		13	<?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
		14
5	<Fragment>	15	<Fragment>
6	<Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.1"/>	16	<util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
7	<util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
8		17
9	<WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>	18	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
10	<WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>	19	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
		20	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
		21	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
11		22
12	<PackageGroup Id="AspNetCoreRuntime31Web">	23	<PackageGroup Id="$(var.AspNetCoreRedistId)">
13	<ExePackage	24	<ExePackage
14	Name="aspnetcore-runtime-3.1.1-win-x64.exe"	25	Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
15	InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""	26	InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
16	RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""	27	RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
17	UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""	28	UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
18	PerMachine="yes"	29	PerMachine="yes"
19	DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"	30	DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
20	InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"	31	InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
21	Vital="yes"	32	Id="$(var.AspNetCoreRedistId)"
22	Permanent="yes"	33	Vital="yes"
23	Protocol="burn"	34	Permanent="yes"
24	DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe"	35	Protocol="burn"
25	LogPathVariable="AspNetCoreRuntime31Log"	36	DownloadUrl="$(var.AspNetCoreRedistLink)"
26	Compressed="no">	37	LogPathVariable="$(var.AspNetCoreRedistLog)"
27	<!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.1-win-x64.exe" -o "aspnetcore-runtime.wxs" -->	38	Compressed="no">
28	<RemotePayload	39	<RemotePayload
29	CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"	40	CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
30	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"	41	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
@@ -38,28 +49,29 @@
38	</Fragment>	49	</Fragment>
39		50
40	<Fragment>	51	<Fragment>
41	<Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.1"/>	52	<util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
42	<util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
43		53
44	<WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>	54	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
45	<WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>	55	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
		56	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
		57	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
46		58
47	<PackageGroup Id="WindowsDesktopRuntime31Web">	59	<PackageGroup Id="$(var.DesktopNetCoreRedistId)">
48	<ExePackage	60	<ExePackage
49	Name="windowsdesktop-runtime-3.1.1-win-x64.exe"	61	Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
50	InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	62	InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
51	RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	63	RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
52	UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	64	UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
53	PerMachine="yes"	65	PerMachine="yes"
54	DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"	66	DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
55	InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"	67	InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
56	Vital="yes"	68	Id="$(var.DesktopNetCoreRedistId)"
57	Permanent="yes"	69	Vital="yes"
58	Protocol="burn"	70	Permanent="yes"
59	DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe"	71	Protocol="burn"
60	LogPathVariable="WindowsDesktopRuntime31Log"	72	DownloadUrl="$(var.DesktopNetCoreRedistLink)"
61	Compressed="no">	73	LogPathVariable="$(var.DesktopNetCoreRedistLog)"
62	<!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.1-win-x64.exe" -o "windowsdesktop-runtime.wxs" -->	74	Compressed="no">
63	<RemotePayload	75	<RemotePayload
64	CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"	76	CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
65	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"	77	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"