Rename .NET Core files to x64. Add placeholders for missing 3.1.x .NET Core packages.
Rename .NET Core files to x64. Add placeholders for missing 3.1.x .NET Core packages.
Sean Hall committed
May 20, 2020 at 22:55 UTC
9875a626e3b171c206fe6ae83e1c6c2d8c5dc25b
11 files changed
+913
-4
src/wixlib/NetCore3.1.0_x64.wxs
renamed
+39
@@ -11,6 +11,45 @@
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)" />
src/wixlib/NetCore3.1.0_x86.wxs
new
+131
@@ -0,0 +1,131 @@
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 = x86?>
8
+ <?define NetCoreIdVersion = 310?>
9
+ <?define NetCoreVersion = 3.1.0?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/NetCore3.1.1_x64.wxs
renamed
+39
@@ -11,6 +11,45 @@
11
12
<?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
13
<?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
14
+ <?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)" />
src/wixlib/NetCore3.1.1_x86.wxs
new
+131
@@ -0,0 +1,131 @@
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 = x86?>
8
+ <?define NetCoreIdVersion = 311?>
9
+ <?define NetCoreVersion = 3.1.1?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/NetCore3.1.2_x64.wxs
renamed
+39
@@ -11,6 +11,45 @@
11
12
<?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
13
<?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-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)" />
src/wixlib/NetCore3.1.2_x86.wxs
new
+131
@@ -0,0 +1,131 @@
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 = x86?>
8
+ <?define NetCoreIdVersion = 312?>
9
+ <?define NetCoreVersion = 3.1.2?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/NetCore3.1.3_x64.wxs
renamed
src/wixlib/NetCore3.1.3_x86.wxs
new
+131
@@ -0,0 +1,131 @@
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 = x86?>
8
+ <?define NetCoreIdVersion = 313?>
9
+ <?define NetCoreVersion = 3.1.3?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/NetCore3.1.4_x64.wxs
new
+131
@@ -0,0 +1,131 @@
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 = 314?>
9
+ <?define NetCoreVersion = 3.1.4?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/NetCore3.1.4_x86.wxs
new
+131
@@ -0,0 +1,131 @@
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 = x86?>
8
+ <?define NetCoreIdVersion = 314?>
9
+ <?define NetCoreVersion = 3.1.4?>
10
+ <?include NetCore3_Platform.wxi?>
11
+
12
+ <?define AspNetCoreRedistLink = ?>
13
+ <?define DesktopNetCoreRedistLink = ?>
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
+ <!--
63
+ <PackageGroup Id="$(var.AspNetCoreRedistId)">
64
+ <ExePackage
65
+ Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
66
+ InstallCommand="$(var.AspNetCoreRedistInstallCommand)"
67
+ RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
68
+ UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)"
69
+ PerMachine="yes"
70
+ DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
71
+ InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
72
+ Id="$(var.AspNetCoreRedistId)"
73
+ Vital="yes"
74
+ Permanent="yes"
75
+ Protocol="burn"
76
+ DownloadUrl="$(var.AspNetCoreRedistLink)"
77
+ LogPathVariable="$(var.AspNetCoreRedistLog)"
78
+ Compressed="no">
79
+ TODO: Get RemotePayload info
80
+ <RemotePayload
81
+ CertificatePublicKey=""
82
+ CertificateThumbprint=""
83
+ Description=""
84
+ Hash=""
85
+ ProductName=""
86
+ Size=""
87
+ Version="" />
88
+ </ExePackage>
89
+ </PackageGroup>
90
+ -->
91
+ </Fragment>
92
+
93
+ <Fragment>
94
+ <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" />
95
+
96
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" />
97
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" />
98
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
99
+ <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100
+
101
+ <!--
102
+ <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103
+ <ExePackage
104
+ Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105
+ InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)"
106
+ RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)"
107
+ UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)"
108
+ PerMachine="yes"
109
+ DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)"
110
+ InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)"
111
+ Id="$(var.DesktopNetCoreRedistId)"
112
+ Vital="yes"
113
+ Permanent="yes"
114
+ Protocol="burn"
115
+ DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116
+ LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117
+ Compressed="no">
118
+ TODO: Get RemotePayload info
119
+ <RemotePayload
120
+ CertificatePublicKey=""
121
+ CertificateThumbprint=""
122
+ Description=""
123
+ Hash=""
124
+ ProductName=""
125
+ Size=""
126
+ Version="" />
127
+ </ExePackage>
128
+ </PackageGroup>
129
+ -->
130
+ </Fragment>
131
+</Wix>
src/wixlib/netfx.wixproj
+10
-4
@@ -27,10 +27,16 @@
27
<Compile Include="NetFx461.wxs" />
28
<Compile Include="NetFx462.wxs" />
29
<Compile Include="NetFxExtension_x86.wxs" />
30
- <Compile Include="NetCore3.1.wxs" />
31
- <Compile Include="NetCore3.1.1.wxs" />
32
- <Compile Include="NetCore3.1.2.wxs" />
33
- <Compile Include="NetCore3.1.3.wxs" />
30
+ <Compile Include="NetCore3.1.0_x64.wxs" />
31
+ <Compile Include="NetCore3.1.0_x86.wxs" />
32
+ <Compile Include="NetCore3.1.1_x64.wxs" />
33
+ <Compile Include="NetCore3.1.1_x86.wxs" />
34
+ <Compile Include="NetCore3.1.2_x64.wxs" />
35
+ <Compile Include="NetCore3.1.2_x86.wxs" />
36
+ <Compile Include="NetCore3.1.3_x64.wxs" />
37
+ <Compile Include="NetCore3.1.3_x86.wxs" />
38
+ <Compile Include="NetCore3.1.4_x64.wxs" />
39
+ <Compile Include="NetCore3.1.4_x86.wxs" />
40
<Compile Include="NetCoreShared.wxs" />
41
</ItemGroup>
42
<ItemGroup>