From 9875a626e3b171c206fe6ae83e1c6c2d8c5dc25b Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Wed, 20 May 2020 22:55:14 +1000
Subject: Rename .NET Core files to x64. Add placeholders for missing 3.1.x
 .NET Core packages.

---
 src/wixlib/NetCore3.1.0_x64.wxs | 125 ++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.0_x86.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.1.wxs     |  86 --------------------------
 src/wixlib/NetCore3.1.1_x64.wxs | 125 ++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.1_x86.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.2.wxs     |  86 --------------------------
 src/wixlib/NetCore3.1.2_x64.wxs | 125 ++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.2_x86.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.3.wxs     | 120 ------------------------------------
 src/wixlib/NetCore3.1.3_x64.wxs | 120 ++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.3_x86.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.4_x64.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.4_x86.wxs | 131 ++++++++++++++++++++++++++++++++++++++++
 src/wixlib/NetCore3.1.wxs       |  86 --------------------------
 src/wixlib/netfx.wixproj        |  14 +++--
 15 files changed, 1291 insertions(+), 382 deletions(-)
 create mode 100644 src/wixlib/NetCore3.1.0_x64.wxs
 create mode 100644 src/wixlib/NetCore3.1.0_x86.wxs
 delete mode 100644 src/wixlib/NetCore3.1.1.wxs
 create mode 100644 src/wixlib/NetCore3.1.1_x64.wxs
 create mode 100644 src/wixlib/NetCore3.1.1_x86.wxs
 delete mode 100644 src/wixlib/NetCore3.1.2.wxs
 create mode 100644 src/wixlib/NetCore3.1.2_x64.wxs
 create mode 100644 src/wixlib/NetCore3.1.2_x86.wxs
 delete mode 100644 src/wixlib/NetCore3.1.3.wxs
 create mode 100644 src/wixlib/NetCore3.1.3_x64.wxs
 create mode 100644 src/wixlib/NetCore3.1.3_x86.wxs
 create mode 100644 src/wixlib/NetCore3.1.4_x64.wxs
 create mode 100644 src/wixlib/NetCore3.1.4_x86.wxs
 delete mode 100644 src/wixlib/NetCore3.1.wxs

diff --git a/src/wixlib/NetCore3.1.0_x64.wxs b/src/wixlib/NetCore3.1.0_x64.wxs
new file mode 100644
index 00000000..281f3009
--- /dev/null
+++ b/src/wixlib/NetCore3.1.0_x64.wxs
@@ -0,0 +1,125 @@
+<?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">
+
+    <?define NetCorePlatform = x64?>
+    <?define NetCoreIdVersion = 310?>
+    <?define NetCoreVersion = 3.1.0?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
+                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
+                  Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
+                  Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
+                  ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
+                  Size="7811768"
+                  Version="3.1.0.19566" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
+                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
+                  Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
+                  Hash="C16F271754879BA78868947486F37871C9F0E40F"
+                  ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
+                  Size="54443856"
+                  Version="3.1.0.28315" />
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs
new file mode 100644
index 00000000..3b2d76af
--- /dev/null
+++ b/src/wixlib/NetCore3.1.0_x86.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 310?>
+    <?define NetCoreVersion = 3.1.0?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.1.wxs b/src/wixlib/NetCore3.1.1.wxs
deleted file mode 100644
index 50e4eae2..00000000
--- a/src/wixlib/NetCore3.1.1.wxs
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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">
-
-    <?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>
-        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.AspNetCoreRedistLink)"
-                LogPathVariable="$(var.AspNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
-                  Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
-                  ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
-                  Size="7867488"
-                  Version="3.1.1.19615"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
-                  Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
-                  Size="54211664"
-                  Version="3.1.1.28408"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.1_x64.wxs b/src/wixlib/NetCore3.1.1_x64.wxs
new file mode 100644
index 00000000..834752b0
--- /dev/null
+++ b/src/wixlib/NetCore3.1.1_x64.wxs
@@ -0,0 +1,125 @@
+<?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">
+
+    <?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?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                  Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
+                  Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
+                  ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
+                  Size="7867488"
+                  Version="3.1.1.19615"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                  Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
+                  Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
+                  ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
+                  Size="54211664"
+                  Version="3.1.1.28408"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.1_x86.wxs b/src/wixlib/NetCore3.1.1_x86.wxs
new file mode 100644
index 00000000..c1f3d1f3
--- /dev/null
+++ b/src/wixlib/NetCore3.1.1_x86.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 311?>
+    <?define NetCoreVersion = 3.1.1?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.2.wxs b/src/wixlib/NetCore3.1.2.wxs
deleted file mode 100644
index db70f693..00000000
--- a/src/wixlib/NetCore3.1.2.wxs
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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">
-
-    <?define NetCorePlatform = x64?>
-    <?define NetCoreIdVersion = 312?>
-    <?define NetCoreVersion = 3.1.2?>
-    <?include NetCore3_Platform.wxi?>
-
-    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
-    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe?>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.AspNetCoreRedistLink)"
-                LogPathVariable="$(var.AspNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
-                  Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
-                  ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
-                  Size="7812680"
-                  Version="3.1.2.20068"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
-                  Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
-                  Size="54323576"
-                  Version="3.1.2.28517"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.2_x64.wxs b/src/wixlib/NetCore3.1.2_x64.wxs
new file mode 100644
index 00000000..1cc6a5d6
--- /dev/null
+++ b/src/wixlib/NetCore3.1.2_x64.wxs
@@ -0,0 +1,125 @@
+<?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">
+
+    <?define NetCorePlatform = x64?>
+    <?define NetCoreIdVersion = 312?>
+    <?define NetCoreVersion = 3.1.2?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
+    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                  Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
+                  Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
+                  ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
+                  Size="7812680"
+                  Version="3.1.2.20068"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload
+                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                  Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
+                  Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
+                  ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
+                  Size="54323576"
+                  Version="3.1.2.28517"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.2_x86.wxs b/src/wixlib/NetCore3.1.2_x86.wxs
new file mode 100644
index 00000000..d9275c19
--- /dev/null
+++ b/src/wixlib/NetCore3.1.2_x86.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 312?>
+    <?define NetCoreVersion = 3.1.2?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.3.wxs b/src/wixlib/NetCore3.1.3.wxs
deleted file mode 100644
index a10b19b6..00000000
--- a/src/wixlib/NetCore3.1.3.wxs
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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">
-
-    <?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>
-        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
-
-        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DotNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.DotNetCoreRedistLink)"
-                LogPathVariable="$(var.DotNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                               Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
-                               Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
-                               ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
-                               Size="26117496"
-                               Version="3.1.3.28628"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.AspNetCoreRedistLink)"
-                LogPathVariable="$(var.AspNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                               Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
-                               Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
-                               ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
-                               Size="7868592"
-                               Version="3.1.3.20163"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                               Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
-                               Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
-                               ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
-                               Size="54449000"
-                               Version="3.1.3.28628"/>
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/wixlib/NetCore3.1.3_x64.wxs b/src/wixlib/NetCore3.1.3_x64.wxs
new file mode 100644
index 00000000..a10b19b6
--- /dev/null
+++ b/src/wixlib/NetCore3.1.3_x64.wxs
@@ -0,0 +1,120 @@
+<?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">
+
+    <?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>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                               Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
+                               Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
+                               ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
+                               Size="26117496"
+                               Version="3.1.3.28628"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                               Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
+                               Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
+                               ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
+                               Size="7868592"
+                               Version="3.1.3.20163"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                               CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                               Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
+                               Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
+                               ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
+                               Size="54449000"
+                               Version="3.1.3.28628"/>
+            </ExePackage>
+        </PackageGroup>
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.3_x86.wxs b/src/wixlib/NetCore3.1.3_x86.wxs
new file mode 100644
index 00000000..c9fe9806
--- /dev/null
+++ b/src/wixlib/NetCore3.1.3_x86.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 313?>
+    <?define NetCoreVersion = 3.1.3?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.4_x64.wxs
new file mode 100644
index 00000000..39ab8261
--- /dev/null
+++ b/src/wixlib/NetCore3.1.4_x64.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x64?>
+    <?define NetCoreIdVersion = 314?>
+    <?define NetCoreVersion = 3.1.4?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.4_x86.wxs
new file mode 100644
index 00000000..9a6e390b
--- /dev/null
+++ b/src/wixlib/NetCore3.1.4_x86.wxs
@@ -0,0 +1,131 @@
+<?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">
+
+    <?define NetCorePlatform = x86?>
+    <?define NetCoreIdVersion = 314?>
+    <?define NetCoreVersion = 3.1.4?>
+    <?include NetCore3_Platform.wxi?>
+
+    <?define AspNetCoreRedistLink = ?>
+    <?define DesktopNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = ?>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
+
+        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" 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="$(var.DotNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DotNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DotNetCoreRedistLink)"
+                LogPathVariable="$(var.DotNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload CertificatePublicKey=""
+                               CertificateThumbprint=""
+                               Description=""
+                               Hash=""
+                               ProductName=""
+                               Size=""
+                               Version=""/>
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
+
+        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.AspNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.AspNetCoreRedistLink)"
+                LogPathVariable="$(var.AspNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+
+    <Fragment>
+        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
+
+        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
+            <ExePackage
+                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
+                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
+                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
+                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
+                PerMachine="yes"
+                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
+                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
+                Id="$(var.DesktopNetCoreRedistId)"
+                Vital="yes"
+                Permanent="yes"
+                Protocol="burn"
+                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
+                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
+                Compressed="no">
+                TODO: Get RemotePayload info
+                <RemotePayload
+                  CertificatePublicKey=""
+                  CertificateThumbprint=""
+                  Description=""
+                  Hash=""
+                  ProductName=""
+                  Size=""
+                  Version="" />
+            </ExePackage>
+        </PackageGroup>
+        -->
+    </Fragment>
+</Wix>
diff --git a/src/wixlib/NetCore3.1.wxs b/src/wixlib/NetCore3.1.wxs
deleted file mode 100644
index 4ca554fa..00000000
--- a/src/wixlib/NetCore3.1.wxs
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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">
-
-    <?define NetCorePlatform = x64?>
-    <?define NetCoreIdVersion = 310?>
-    <?define NetCoreVersion = 3.1.0?>
-    <?include NetCore3_Platform.wxi?>
-
-    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
-    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
-
-        <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" 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="$(var.AspNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.AspNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.AspNetCoreRedistLink)"
-                LogPathVariable="$(var.AspNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
-                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
-                  Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
-                  Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
-                  ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
-                  Size="7811768"
-                  Version="3.1.0.19566" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-
-    <Fragment>
-        <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
-
-        <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" 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="$(var.DesktopNetCoreRedistId)">
-            <ExePackage
-                Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
-                InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
-                RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
-                UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
-                PerMachine="yes"
-                DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
-                InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
-                Id="$(var.DesktopNetCoreRedistId)"
-                Vital="yes"
-                Permanent="yes"
-                Protocol="burn"
-                DownloadUrl="$(var.DesktopNetCoreRedistLink)"
-                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
-                Compressed="no">
-                <RemotePayload
-                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
-                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
-                  Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
-                  Hash="C16F271754879BA78868947486F37871C9F0E40F"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
-                  Size="54443856"
-                  Version="3.1.0.28315" />
-            </ExePackage>
-        </PackageGroup>
-    </Fragment>
-</Wix>
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index 78ca93f7..371ee24d 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -27,10 +27,16 @@
     <Compile Include="NetFx461.wxs" />
     <Compile Include="NetFx462.wxs" />
     <Compile Include="NetFxExtension_x86.wxs" />
-    <Compile Include="NetCore3.1.wxs" />
-    <Compile Include="NetCore3.1.1.wxs" />
-    <Compile Include="NetCore3.1.2.wxs" />
-    <Compile Include="NetCore3.1.3.wxs" />
+    <Compile Include="NetCore3.1.0_x64.wxs" />
+    <Compile Include="NetCore3.1.0_x86.wxs" />
+    <Compile Include="NetCore3.1.1_x64.wxs" />
+    <Compile Include="NetCore3.1.1_x86.wxs" />
+    <Compile Include="NetCore3.1.2_x64.wxs" />
+    <Compile Include="NetCore3.1.2_x86.wxs" />
+    <Compile Include="NetCore3.1.3_x64.wxs" />
+    <Compile Include="NetCore3.1.3_x86.wxs" />
+    <Compile Include="NetCore3.1.4_x64.wxs" />
+    <Compile Include="NetCore3.1.4_x86.wxs" />
     <Compile Include="NetCoreShared.wxs" />
   </ItemGroup>
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb