aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Parsons <japarson@microsoft.com>2020-09-21 13:13:27 -0700
committerSean Hall <r.sean.hall@gmail.com>2020-09-22 15:42:59 -0500
commit2586d9355abacc7294499dd81217012385d3d8a8 (patch)
treea374d4d9f413369676ff6d5dbec5cd9980e5b414
parentc62e6f197ce245eaadc432784ca4d119adfb750e (diff)
downloadwix-2586d9355abacc7294499dd81217012385d3d8a8.tar.gz
wix-2586d9355abacc7294499dd81217012385d3d8a8.tar.bz2
wix-2586d9355abacc7294499dd81217012385d3d8a8.zip
Update .NET Core package definitions
Diffstat
-rw-r--r--src/wixlib/NetCore3.1.0_x64.wxs48
-rw-r--r--src/wixlib/NetCore3.1.0_x86.wxs58
-rw-r--r--src/wixlib/NetCore3.1.1_x64.wxs48
-rw-r--r--src/wixlib/NetCore3.1.1_x86.wxs58
-rw-r--r--src/wixlib/NetCore3.1.2_x64.wxs48
-rw-r--r--src/wixlib/NetCore3.1.2_x86.wxs58
-rw-r--r--src/wixlib/NetCore3.1.3_x64.wxs45
-rw-r--r--src/wixlib/NetCore3.1.3_x86.wxs58
-rw-r--r--src/wixlib/NetCore3.1.4_x64.wxs58
-rw-r--r--src/wixlib/NetCore3.1.4_x86.wxs58
10 files changed, 243 insertions, 294 deletions
diff --git a/src/wixlib/NetCore3.1.0_x64.wxs b/src/wixlib/NetCore3.1.0_x64.wxs
index 281f3009..cda6aedf 100644
--- a/src/wixlib/NetCore3.1.0_x64.wxs
+++ b/src/wixlib/NetCore3.1.0_x64.wxs
@@ -11,7 +11,7 @@
11 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?> 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?> 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 = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9f010da2-d510-4271-8dcc-ad92b8b9b767/d2dd394046c20e0563ce5c45c356653f/dotnet-runtime-3.1.0-win-x64.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
43 CertificateThumbprint="" 42 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.0 (x64)"
45 Hash="" 44 Hash="DDA7CD0E851E742ACA43EFBD1361CDB382771E21"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.0 (x64)"
47 Size="" 46 Size="26061496"
48 Version=""/> 47 Version="3.1.0.28315" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -76,13 +74,13 @@
76 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
77 Compressed="no"> 75 Compressed="no">
78 <RemotePayload 76 <RemotePayload
79 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" 77 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
80 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" 78 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
81 Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework" 79 Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8" 80 Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
83 ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework" 81 ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
84 Size="7811768" 82 Size="7811768"
85 Version="3.1.0.19566" /> 83 Version="3.1.0.19566" />
86 </ExePackage> 84 </ExePackage>
87 </PackageGroup> 85 </PackageGroup>
88 </Fragment> 86 </Fragment>
@@ -112,13 +110,13 @@
112 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
113 Compressed="no"> 111 Compressed="no">
114 <RemotePayload 112 <RemotePayload
115 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" 113 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
116 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" 114 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
117 Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" 115 Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
118 Hash="C16F271754879BA78868947486F37871C9F0E40F" 116 Hash="C16F271754879BA78868947486F37871C9F0E40F"
119 ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
120 Size="54443856" 118 Size="54443856"
121 Version="3.1.0.28315" /> 119 Version="3.1.0.28315" />
122 </ExePackage> 120 </ExePackage>
123 </PackageGroup> 121 </PackageGroup>
124 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs
index 3b2d76af..92da9266 100644
--- a/src/wixlib/NetCore3.1.0_x86.wxs
+++ b/src/wixlib/NetCore3.1.0_x86.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.0?> 9 <?define NetCoreVersion = 3.1.0?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/74ed410a-d452-4057-bb89-befeccf34b2b/e11a376951914e197c50528e5b20e2ef/aspnetcore-runtime-3.1.0-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/e93147bb-7654-46d6-954a-bbd54da63b9b/cbdba4605fd04dc3886ca772d3953c53/windowsdesktop-runtime-3.1.0-win-x86.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/04356520-4cf7-4e98-b4a8-b3043e2eeca3/cdf6d3d104334dfe8f471fe135f16b07/dotnet-runtime-3.1.0-win-x86.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
43 CertificateThumbprint="" 42 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.0 (x86)"
45 Hash="" 44 Hash="CAF456ED2F229E5CE36CEAE5C752D7C69BB4CABD"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.0 (x86)"
47 Size="" 46 Size="23318984"
48 Version=""/> 47 Version="3.1.0.28315" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
82 CertificateThumbprint="" 78 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
84 Hash="" 80 Hash="7616CD3453F253032DB7A56455A8429FAEC934C4"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
86 Size="" 82 Size="7146408"
87 Version="" /> 83 Version="3.1.0.19566" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
121 CertificateThumbprint="" 114 CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
123 Hash="" 116 Hash="96FF19C3F740EA1D49376462EE336F5E5CA0ED79"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
125 Size="" 118 Size="48703304"
126 Version="" /> 119 Version="3.1.0.28315" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
diff --git a/src/wixlib/NetCore3.1.1_x64.wxs b/src/wixlib/NetCore3.1.1_x64.wxs
index 834752b0..14adbea3 100644
--- a/src/wixlib/NetCore3.1.1_x64.wxs
+++ b/src/wixlib/NetCore3.1.1_x64.wxs
@@ -11,7 +11,7 @@
11 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?> 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?> 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 = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fda71c5b-ee58-4919-95dc-4f32dbebd2cd/97ffe3880a25f5f7cae1a7e40cd3509e/dotnet-runtime-3.1.1-win-x64.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.1 (x64)"
45 Hash="" 44 Hash="B9E2166EDDEFAA4D7543F24A2E7CD76C35D4E617"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.1 (x64)"
47 Size="" 46 Size="26055096"
48 Version=""/> 47 Version="3.1.1.28408" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -76,13 +74,13 @@
76 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
77 Compressed="no"> 75 Compressed="no">
78 <RemotePayload 76 <RemotePayload
79 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
80 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
81 Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework" 79 Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE" 80 Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
83 ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework" 81 ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
84 Size="7867488" 82 Size="7867488"
85 Version="3.1.1.19615"/> 83 Version="3.1.1.19615"/>
86 </ExePackage> 84 </ExePackage>
87 </PackageGroup> 85 </PackageGroup>
88 </Fragment> 86 </Fragment>
@@ -112,13 +110,13 @@
112 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
113 Compressed="no"> 111 Compressed="no">
114 <RemotePayload 112 <RemotePayload
115 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
116 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
117 Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" 115 Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
118 Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC" 116 Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
119 ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
120 Size="54211664" 118 Size="54211664"
121 Version="3.1.1.28408"/> 119 Version="3.1.1.28408"/>
122 </ExePackage> 120 </ExePackage>
123 </PackageGroup> 121 </PackageGroup>
124 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1.1_x86.wxs b/src/wixlib/NetCore3.1.1_x86.wxs
index c1f3d1f3..132f4349 100644
--- a/src/wixlib/NetCore3.1.1_x86.wxs
+++ b/src/wixlib/NetCore3.1.1_x86.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.1?> 9 <?define NetCoreVersion = 3.1.1?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b1298310-3170-4553-ba50-153e1def5747/00ba44679959c19a67bd36b8c1eb5220/aspnetcore-runtime-3.1.1-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/662153d9-58c5-4630-a326-ed9e4e342787/1deb6ba6a2a5f5f694b784a6859b446e/windowsdesktop-runtime-3.1.1-win-x86.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3a21bd9a-8040-4277-99d4-9de7fcda6d7c/c669f1662f140cbb41fdf0c9cba221a8/dotnet-runtime-3.1.1-win-x86.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.1 (x86)"
45 Hash="" 44 Hash="4790D3117F4D4F7AF63113BBECD3BF0E8C940C2A"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.1 (x86)"
47 Size="" 46 Size="23327424"
48 Version=""/> 47 Version="3.1.1.28408" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
82 CertificateThumbprint="" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
84 Hash="" 80 Hash="65B4D07B6BA51BC7D0D1B82EC904893B8ACF639D"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
86 Size="" 82 Size="7193600"
87 Version="" /> 83 Version="3.1.1.19615" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
121 CertificateThumbprint="" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
123 Hash="" 116 Hash="A368E17FFEE5CEBFDFE981BC329CEFFACF4674CC"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
125 Size="" 118 Size="48513144"
126 Version="" /> 119 Version="3.1.1.28408" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
diff --git a/src/wixlib/NetCore3.1.2_x64.wxs b/src/wixlib/NetCore3.1.2_x64.wxs
index 1cc6a5d6..e63f8117 100644
--- a/src/wixlib/NetCore3.1.2_x64.wxs
+++ b/src/wixlib/NetCore3.1.2_x64.wxs
@@ -11,7 +11,7 @@
11 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?> 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?> 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 = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cfe420d5-084c-4590-b387-f89f3387d4c9/db4c577b995c54dee0530d8230e87145/dotnet-runtime-3.1.2-win-x64.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.2 (x64)"
45 Hash="" 44 Hash="6955F4851B42A533683824C65D7423AF22BC6710"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x64)"
47 Size="" 46 Size="26066088"
48 Version=""/> 47 Version="3.1.2.28517" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -76,13 +74,13 @@
76 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
77 Compressed="no"> 75 Compressed="no">
78 <RemotePayload 76 <RemotePayload
79 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
80 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
81 Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework" 79 Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC" 80 Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
83 ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework" 81 ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
84 Size="7812680" 82 Size="7812680"
85 Version="3.1.2.20068"/> 83 Version="3.1.2.20068"/>
86 </ExePackage> 84 </ExePackage>
87 </PackageGroup> 85 </PackageGroup>
88 </Fragment> 86 </Fragment>
@@ -112,13 +110,13 @@
112 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
113 Compressed="no"> 111 Compressed="no">
114 <RemotePayload 112 <RemotePayload
115 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
116 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
117 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" 115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
118 Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4" 116 Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
119 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
120 Size="54323576" 118 Size="54323576"
121 Version="3.1.2.28517"/> 119 Version="3.1.2.28517"/>
122 </ExePackage> 120 </ExePackage>
123 </PackageGroup> 121 </PackageGroup>
124 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1.2_x86.wxs b/src/wixlib/NetCore3.1.2_x86.wxs
index d9275c19..8f3c26d7 100644
--- a/src/wixlib/NetCore3.1.2_x86.wxs
+++ b/src/wixlib/NetCore3.1.2_x86.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.2?> 9 <?define NetCoreVersion = 3.1.2?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2c8e520e-d705-4b11-8854-518546133e27/13354ed8b42d8c2c52f75d7acffd0be4/aspnetcore-runtime-3.1.2-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/b824906f-bd6e-4067-86a6-95c61620674d/cfcdab84a01cee94fdaa31271c3d4d47/windowsdesktop-runtime-3.1.2-win-x86.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/dfedf8a5-c3cd-4b69-a5eb-8f9994e810f7/feeead4b3ae3b9e003917797c8356675/dotnet-runtime-3.1.2-win-x86.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
45 Hash="" 44 Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
47 Size="" 46 Size="23298048"
48 Version=""/> 47 Version="3.1.2.28517" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
82 CertificateThumbprint="" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
84 Hash="" 80 Hash="302D15317C3D2D0B707EAC92D943A624BBDA14D9"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
86 Size="" 82 Size="7128912"
87 Version="" /> 83 Version="3.1.2.20068" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
121 CertificateThumbprint="" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
123 Hash="" 116 Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
125 Size="" 118 Size="48525928"
126 Version="" /> 119 Version="3.1.2.28517" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
diff --git a/src/wixlib/NetCore3.1.3_x64.wxs b/src/wixlib/NetCore3.1.3_x64.wxs
index a10b19b6..85887c84 100644
--- a/src/wixlib/NetCore3.1.3_x64.wxs
+++ b/src/wixlib/NetCore3.1.3_x64.wxs
@@ -37,13 +37,14 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no"> 39 Compressed="no">
40 <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 40 <RemotePayload
41 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 Description="Microsoft .NET Core Runtime - 3.1.3 (x64)" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56" 43 Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
44 ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)" 44 Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
45 Size="26117496" 45 ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
46 Version="3.1.3.28628"/> 46 Size="26117496"
47 Version="3.1.3.28628"/>
47 </ExePackage> 48 </ExePackage>
48 </PackageGroup> 49 </PackageGroup>
49 </Fragment> 50 </Fragment>
@@ -72,13 +73,14 @@
72 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
73 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
74 Compressed="no"> 75 Compressed="no">
75 <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 76 <RemotePayload
76 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
77 Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
78 Hash="E6B175E66DE4662CEF161FF3263A97410E993D18" 79 Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
79 ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework" 80 Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
80 Size="7868592" 81 ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
81 Version="3.1.3.20163"/> 82 Size="7868592"
83 Version="3.1.3.20163"/>
82 </ExePackage> 84 </ExePackage>
83 </PackageGroup> 85 </PackageGroup>
84 </Fragment> 86 </Fragment>
@@ -107,13 +109,14 @@
107 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
108 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
109 Compressed="no"> 111 Compressed="no">
110 <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" 112 <RemotePayload
111 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
112 Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
113 Hash="9A965A63214627F2C9B3A38E402B561BFD275422" 115 Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
114 ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)" 116 Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
115 Size="54449000" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
116 Version="3.1.3.28628"/> 118 Size="54449000"
119 Version="3.1.3.28628"/>
117 </ExePackage> 120 </ExePackage>
118 </PackageGroup> 121 </PackageGroup>
119 </Fragment> 122 </Fragment>
diff --git a/src/wixlib/NetCore3.1.3_x86.wxs b/src/wixlib/NetCore3.1.3_x86.wxs
index c9fe9806..9a038650 100644
--- a/src/wixlib/NetCore3.1.3_x86.wxs
+++ b/src/wixlib/NetCore3.1.3_x86.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.3?> 9 <?define NetCoreVersion = 3.1.3?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/afec5ced-6298-4e54-add1-1d2e02d950f9/3a8064ac78eaf651c0030e8a96d4bd83/aspnetcore-runtime-3.1.3-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/7cd5c874-5d11-4e72-81f0-4a005d956708/0eb310169770c893407169fc3abaac4f/windowsdesktop-runtime-3.1.3-win-x86.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9afebfd7-7719-4612-b15b-79b67b725b42/b93c5514f58eed2e66fc30d0e88aafcb/dotnet-runtime-3.1.3-win-x86.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
45 Hash="" 44 Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
47 Size="" 46 Size="23298048"
48 Version=""/> 47 Version="3.1.2.28517" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
82 CertificateThumbprint="" 78 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
84 Hash="" 80 Hash="42F8DF6AAC1299E05A04B4D2DB3E10D0D1A8E942"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
86 Size="" 82 Size="7157720"
87 Version="" /> 83 Version="3.1.3.20163" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
121 CertificateThumbprint="" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
123 Hash="" 116 Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
125 Size="" 118 Size="48525928"
126 Version="" /> 119 Version="3.1.2.28517" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.4_x64.wxs
index 39ab8261..06a42c37 100644
--- a/src/wixlib/NetCore3.1.4_x64.wxs
+++ b/src/wixlib/NetCore3.1.4_x64.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.4?> 9 <?define NetCoreVersion = 3.1.4?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/f9598bd0-060a-46c1-b5ce-65f1663f6204/afb4dd9e1377f63a5c124d60fb119764/aspnetcore-runtime-3.1.4-win-x64.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/d8cf1fe3-21c2-4baf-988f-f0152996135e/0c00b94713ee93e7ad5b4f82e2b86607/windowsdesktop-runtime-3.1.4-win-x64.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/93d4ac87-6db0-4ddd-9bef-8050067b5e5d/605b178040bdd75b63d021d9387219ea/dotnet-runtime-3.1.4-win-x64.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
43 CertificateThumbprint="" 42 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.4 (x64)"
45 Hash="" 44 Hash="F60C08D1FB8B6D5A8AC5D008928B673AAC5D0278"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.4 (x64)"
47 Size="" 46 Size="26159064"
48 Version=""/> 47 Version="3.1.4.28821" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
82 CertificateThumbprint="" 78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
84 Hash="" 80 Hash="5CF68BFFE3377DCBE03986380098D93AB876FF13"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
86 Size="" 82 Size="7829704"
87 Version="" /> 83 Version="3.1.4.20222" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
121 CertificateThumbprint="" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
123 Hash="" 116 Hash="78BA9B86F57379D8FE20C7C06038B79C0B7051F6"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
125 Size="" 118 Size="54480864"
126 Version="" /> 119 Version="3.1.4.28821" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.4_x86.wxs
index 9a6e390b..ea643a04 100644
--- a/src/wixlib/NetCore3.1.4_x86.wxs
+++ b/src/wixlib/NetCore3.1.4_x86.wxs
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.4?> 9 <?define NetCoreVersion = 3.1.4?>
10 <?include NetCore3_Platform.wxi?> 10 <?include NetCore3_Platform.wxi?>
11 11
12 <?define AspNetCoreRedistLink = ?> 12 <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/adef45e2-4f8f-4880-b1f7-08c63edd640f/cf3e68f27ae8cb1e820af6ecafc24eee/aspnetcore-runtime-3.1.4-win-x86.exe?>
13 <?define DesktopNetCoreRedistLink = ?> 13 <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2d4b7600-5f32-4a1f-abd5-47cdb2d1362b/7b8b7635e3bb63f6b2cc9a1c624b5325/windowsdesktop-runtime-3.1.4-win-x86.exe?>
14 <?define DotNetCoreRedistLink = ?> 14 <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/03b8b6cb-c80c-43ea-9136-1156e839bb52/31c13e5a5b028a3c721a50df8f02caf0/dotnet-runtime-3.1.4-win-x86.exe?>
15 15
16 <Fragment> 16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" /> 17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
21 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" 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" /> 22 <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
23 23
24 <!--
25 <PackageGroup Id="$(var.DotNetCoreRedistId)"> 24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
26 <ExePackage 25 <ExePackage
27 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
38 DownloadUrl="$(var.DotNetCoreRedistLink)" 37 DownloadUrl="$(var.DotNetCoreRedistLink)"
39 LogPathVariable="$(var.DotNetCoreRedistLog)" 38 LogPathVariable="$(var.DotNetCoreRedistLog)"
40 Compressed="no"> 39 Compressed="no">
41 TODO: Get RemotePayload info 40 <RemotePayload
42 <RemotePayload CertificatePublicKey="" 41 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
43 CertificateThumbprint="" 42 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
44 Description="" 43 Description="Microsoft .NET Core Runtime - 3.1.4 (x86)"
45 Hash="" 44 Hash="4FA35E3F31BCFCC6B65D0CB13E21EE0FC56D1C6B"
46 ProductName="" 45 ProductName="Microsoft .NET Core Runtime - 3.1.4 (x86)"
47 Size="" 46 Size="23345544"
48 Version=""/> 47 Version="3.1.4.28821" />
49 </ExePackage> 48 </ExePackage>
50 </PackageGroup> 49 </PackageGroup>
51 -->
52 </Fragment> 50 </Fragment>
53 51
54 <Fragment> 52 <Fragment>
@@ -59,7 +57,6 @@
59 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 57 <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" /> 58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
61 59
62 <!--
63 <PackageGroup Id="$(var.AspNetCoreRedistId)"> 60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
64 <ExePackage 61 <ExePackage
65 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
76 DownloadUrl="$(var.AspNetCoreRedistLink)" 73 DownloadUrl="$(var.AspNetCoreRedistLink)"
77 LogPathVariable="$(var.AspNetCoreRedistLog)" 74 LogPathVariable="$(var.AspNetCoreRedistLog)"
78 Compressed="no"> 75 Compressed="no">
79 TODO: Get RemotePayload info
80 <RemotePayload 76 <RemotePayload
81 CertificatePublicKey="" 77 CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
82 CertificateThumbprint="" 78 CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
83 Description="" 79 Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
84 Hash="" 80 Hash="2272BF19490DA6519FC2735A2C8815F8944D3388"
85 ProductName="" 81 ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
86 Size="" 82 Size="7171864"
87 Version="" /> 83 Version="3.1.4.20222" />
88 </ExePackage> 84 </ExePackage>
89 </PackageGroup> 85 </PackageGroup>
90 -->
91 </Fragment> 86 </Fragment>
92 87
93 <Fragment> 88 <Fragment>
@@ -98,7 +93,6 @@
98 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> 93 <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" /> 94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
100 95
101 <!--
102 <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> 96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
103 <ExePackage 97 <ExePackage
104 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" 98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
115 DownloadUrl="$(var.DesktopNetCoreRedistLink)" 109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
116 LogPathVariable="$(var.DesktopNetCoreRedistLog)" 110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
117 Compressed="no"> 111 Compressed="no">
118 TODO: Get RemotePayload info
119 <RemotePayload 112 <RemotePayload
120 CertificatePublicKey="" 113 CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
121 CertificateThumbprint="" 114 CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
122 Description="" 115 Description="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
123 Hash="" 116 Hash="331BF47FD6E95174D17B63938C022A48E02CB8BF"
124 ProductName="" 117 ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
125 Size="" 118 Size="48703936"
126 Version="" /> 119 Version="3.1.4.28821" />
127 </ExePackage> 120 </ExePackage>
128 </PackageGroup> 121 </PackageGroup>
129 -->
130 </Fragment> 122 </Fragment>
131</Wix> 123</Wix>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:34:37 +0000