1 files changed, 72 insertions, 55 deletions
diff --git a/src/wixlib/NetCore3.1.3.wxs b/src/wixlib/NetCore3.1.3.wxs
index 8f4cba15..a10b19b6 100644
--- a/src/wixlib/NetCore3.1.3.wxs
+++ b/src/wixlib/NetCore3.1.3.wxs
@@ -1,29 +1,42 @@
 <?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 = 313?>
+    <?define NetCoreVersion = 3.1.3?>
+    <?include NetCore3_Platform.wxi?>
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe?>
    <Fragment>
-        <Variable Name="DotNetRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.NETCore.App\3.1.3"/>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-        <util:DirectorySearch Id="DotNetRuntime31Installed" Path="[DotNetRuntime31InstallDir]" Variable="DotNetRuntime31Installed" Result="exists"/>
-        <WixVariable Id="DotNetRuntime31WebDetectCondition" Value="DotNetRuntime31Installed" Overridable="yes"/>
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
-        <WixVariable Id="DotNetRuntime31WebInstallCondition" Value="" Overridable="yes"/>
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-        <PackageGroup Id="DotNetRuntime31Web">
+        <PackageGroup Id="$(var.DotNetCoreRedistId)">
            <ExePackage
-              Name="dotnet-runtime-3.1.3-win-x64.exe"
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-              InstallCommand="/install /quiet /norestart /log &quot;[DotNetRuntime31Log]&quot;"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
-              RepairCommand="/repair /quiet /norestart /log &quot;[DotNetRuntime31Log]&quot;"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-              UninstallCommand="/uninstall /quiet /norestart /log &quot;[DotNetRuntime31Log]&quot;"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
-              PerMachine="yes"
+                PerMachine="yes"
-              DetectCondition="!(wix.DotNetRuntime31WebDetectCondition)"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-              InstallCondition="!(wix.DotNetRuntime31WebInstallCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-              Vital="yes"
+                Id="$(var.DotNetCoreRedistId)"
-              Permanent="yes"
+                Vital="yes"
-              Protocol="burn"
+                Permanent="yes"
-              DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe"
+                Protocol="burn"
-              LogPathVariable="DotNetRuntime31Log"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
-              Compressed="no">
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
                               Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
@@ -36,27 +49,29 @@
    </Fragment>
    <Fragment>
-        <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.3"/>
+        <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.3-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/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe"
+                Protocol="burn"
-              LogPathVariable="AspNetCoreRuntime31Log"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
-              Compressed="no">
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
                               Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
@@ -69,27 +84,29 @@
    </Fragment>
    <Fragment>
-        <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.3"/>
+        <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.3-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/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe"
+                Protocol="burn"
-              LogPathVariable="WindowsDesktopRuntime31Log"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-              Compressed="no">
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
                               Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"

diff --git a/src/wixlib/NetCore3.1.3.wxs b/src/wixlib/NetCore3.1.3.wxs index 8f4cba15..a10b19b6 100644 --- a/src/wixlib/NetCore3.1.3.wxs +++ b/src/wixlib/NetCore3.1.3.wxs
@@ -1,29 +1,42 @@
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 = 313?>
		9	<?define NetCoreVersion = 3.1.3?>
		10	<?include NetCore3_Platform.wxi?>
		11
		12	<?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe?>
		13	<?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe?>
		14	<?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe?>
		15
5	<Fragment>	16	<Fragment>
6	<Variable Name="DotNetRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.NETCore.App\3.1.3"/>	17	<util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
7	<util:DirectorySearch Id="DotNetRuntime31Installed" Path="[DotNetRuntime31InstallDir]" Variable="DotNetRuntime31Installed" Result="exists"/>
8		18
9	<WixVariable Id="DotNetRuntime31WebDetectCondition" Value="DotNetRuntime31Installed" Overridable="yes"/>	19	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
10	<WixVariable Id="DotNetRuntime31WebInstallCondition" Value="" Overridable="yes"/>	20	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
		21	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
		22	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
11		23
12	<PackageGroup Id="DotNetRuntime31Web">	24	<PackageGroup Id="$(var.DotNetCoreRedistId)">
13	<ExePackage	25	<ExePackage
14	Name="dotnet-runtime-3.1.3-win-x64.exe"	26	Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
15	InstallCommand="/install /quiet /norestart /log "[DotNetRuntime31Log]""	27	InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
16	RepairCommand="/repair /quiet /norestart /log "[DotNetRuntime31Log]""	28	RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
17	UninstallCommand="/uninstall /quiet /norestart /log "[DotNetRuntime31Log]""	29	UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
18	PerMachine="yes"	30	PerMachine="yes"
19	DetectCondition="!(wix.DotNetRuntime31WebDetectCondition)"	31	DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
20	InstallCondition="!(wix.DotNetRuntime31WebInstallCondition)"	32	InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
21	Vital="yes"	33	Id="$(var.DotNetCoreRedistId)"
22	Permanent="yes"	34	Vital="yes"
23	Protocol="burn"	35	Permanent="yes"
24	DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe"	36	Protocol="burn"
25	LogPathVariable="DotNetRuntime31Log"	37	DownloadUrl="$(var.DotNetCoreRedistLink)"
26	Compressed="no">	38	LogPathVariable="$(var.DotNetCoreRedistLog)"
		39	Compressed="no">
27	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"	40	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
28	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"	41	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
29	Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"	42	Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
@@ -36,27 +49,29 @@
36	</Fragment>	49	</Fragment>
37		50
38	<Fragment>	51	<Fragment>
39	<Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.3"/>	52	<util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
40	<util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/>
41		53
42	<WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/>	54	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
43	<WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/>	55	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
		56	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
		57	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
44		58
45	<PackageGroup Id="AspNetCoreRuntime31Web">	59	<PackageGroup Id="$(var.AspNetCoreRedistId)">
46	<ExePackage	60	<ExePackage
47	Name="aspnetcore-runtime-3.1.3-win-x64.exe"	61	Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
48	InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]""	62	InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
49	RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]""	63	RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
50	UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]""	64	UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
51	PerMachine="yes"	65	PerMachine="yes"
52	DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)"	66	DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
53	InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)"	67	InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
54	Vital="yes"	68	Id="$(var.AspNetCoreRedistId)"
55	Permanent="yes"	69	Vital="yes"
56	Protocol="burn"	70	Permanent="yes"
57	DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe"	71	Protocol="burn"
58	LogPathVariable="AspNetCoreRuntime31Log"	72	DownloadUrl="$(var.AspNetCoreRedistLink)"
59	Compressed="no">	73	LogPathVariable="$(var.AspNetCoreRedistLog)"
		74	Compressed="no">
60	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"	75	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
61	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"	76	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
62	Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"	77	Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
@@ -69,27 +84,29 @@
69	</Fragment>	84	</Fragment>
70		85
71	<Fragment>	86	<Fragment>
72	<Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.3"/>	87	<util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
73	<util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/>
74		88
75	<WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/>	89	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
76	<WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/>	90	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
		91	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
		92	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
77		93
78	<PackageGroup Id="WindowsDesktopRuntime31Web">	94	<PackageGroup Id="$(var.DesktopNetCoreRedistId)">
79	<ExePackage	95	<ExePackage
80	Name="windowsdesktop-runtime-3.1.3-win-x64.exe"	96	Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
81	InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	97	InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
82	RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	98	RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
83	UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]""	99	UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
84	PerMachine="yes"	100	PerMachine="yes"
85	DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)"	101	DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
86	InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)"	102	InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
87	Vital="yes"	103	Id="$(var.DesktopNetCoreRedistId)"
88	Permanent="yes"	104	Vital="yes"
89	Protocol="burn"	105	Permanent="yes"
90	DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe"	106	Protocol="burn"
91	LogPathVariable="WindowsDesktopRuntime31Log"	107	DownloadUrl="$(var.DesktopNetCoreRedistLink)"
92	Compressed="no">	108	LogPathVariable="$(var.DesktopNetCoreRedistLog)"
		109	Compressed="no">
93	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"	110	<RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
94	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"	111	CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
95	Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"	112	Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"