1 files changed, 125 insertions, 0 deletions
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_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 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
	3
	4	<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
	5	xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
	6
	7	<?define NetCorePlatform = x64?>
	8	<?define NetCoreIdVersion = 310?>
	9	<?define NetCoreVersion = 3.1.0?>
	10	<?include NetCore3_Platform.wxi?>
	11
	12	<?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
	13	<?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
	14	<?define DotNetCoreRedistLink = ?>
	15
	16	<Fragment>
	17	<util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
	18
	19	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DotNetCoreId)" Overridable="yes" />
	20	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
	21	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
	22	<WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
	23
	24	<!--
	25	<PackageGroup Id="$(var.DotNetCoreRedistId)">
	26	<ExePackage
	27	Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
	28	InstallCommand="$(var.DotNetCoreRedistInstallCommand)"
	29	RepairCommand="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
	30	UninstallCommand="$(var.DotNetCoreRedistUninstallCommand)"
	31	PerMachine="yes"
	32	DetectCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
	33	InstallCondition="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
	34	Id="$(var.DotNetCoreRedistId)"
	35	Vital="yes"
	36	Permanent="yes"
	37	Protocol="burn"
	38	DownloadUrl="$(var.DotNetCoreRedistLink)"
	39	LogPathVariable="$(var.DotNetCoreRedistLog)"
	40	Compressed="no">
	41	TODO: Get RemotePayload info
	42	<RemotePayload CertificatePublicKey=""
	43	CertificateThumbprint=""
	44	Description=""
	45	Hash=""
	46	ProductName=""
	47	Size=""
	48	Version=""/>
	49	</ExePackage>
	50	</PackageGroup>
	51	-->
	52	</Fragment>
	53
	54	<Fragment>
	55	<util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
	56
	57	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" />
	58	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
	59	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
	60	<WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
	61
	62	<PackageGroup Id="$(var.AspNetCoreRedistId)">
	63	<ExePackage
	64	Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
	65	InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
	66	RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
	67	UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
	68	PerMachine="yes"
	69	DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
	70	InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
	71	Id="$(var.AspNetCoreRedistId)"
	72	Vital="yes"
	73	Permanent="yes"
	74	Protocol="burn"
	75	DownloadUrl="$(var.AspNetCoreRedistLink)"
	76	LogPathVariable="$(var.AspNetCoreRedistLog)"
	77	Compressed="no">
	78	<RemotePayload
	79	CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
	80	CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
	81	Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
	82	Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
	83	ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
	84	Size="7811768"
	85	Version="3.1.0.19566" />
	86	</ExePackage>
	87	</PackageGroup>
	88	</Fragment>
	89
	90	<Fragment>
	91	<util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
	92
	93	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
	94	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
	95	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
	96	<WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
	97
	98	<PackageGroup Id="$(var.DesktopNetCoreRedistId)">
	99	<ExePackage
	100	Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
	101	InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
	102	RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
	103	UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
	104	PerMachine="yes"
	105	DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
	106	InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
	107	Id="$(var.DesktopNetCoreRedistId)"
	108	Vital="yes"
	109	Permanent="yes"
	110	Protocol="burn"
	111	DownloadUrl="$(var.DesktopNetCoreRedistLink)"
	112	LogPathVariable="$(var.DesktopNetCoreRedistLog)"
	113	Compressed="no">
	114	<RemotePayload
	115	CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
	116	CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
	117	Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
	118	Hash="C16F271754879BA78868947486F37871C9F0E40F"
	119	ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
	120	Size="54443856"
	121	Version="3.1.0.28315" />
	122	</ExePackage>
	123	</PackageGroup>
	124	</Fragment>
	125	</Wix>