@joebigelow / wix / commits / 2586d935

Update .NET Core package definitions

James Parsons committed Sep 21, 2020 at 13:13 UTC 2586d9355abacc7294499dd81217012385d3d8a8
10 files changed +243 -294
src/wixlib/NetCore3.1.0_x64.wxs
+23 -25
@@ -11,7 +11,7 @@
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 = ?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
42 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
43 + Description="Microsoft .NET Core Runtime - 3.1.0 (x64)"
44 + Hash="DDA7CD0E851E742ACA43EFBD1361CDB382771E21"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.0 (x64)"
46 + Size="26061496"
47 + Version="3.1.0.28315" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -76,13 +74,13 @@
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
79 - CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
80 - CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
81 - Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 - Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
83 - ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
84 - Size="7811768"
85 - Version="3.1.0.19566" />
77 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
78 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
79 + Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
80 + Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
81 + ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 + Size="7811768"
83 + Version="3.1.0.19566" />
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
@@ -112,13 +110,13 @@
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
115 - CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
116 - CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
117 - Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
118 - Hash="C16F271754879BA78868947486F37871C9F0E40F"
119 - ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
120 - Size="54443856"
121 - Version="3.1.0.28315" />
113 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
114 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
116 + Hash="C16F271754879BA78868947486F37871C9F0E40F"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
118 + Size="54443856"
119 + Version="3.1.0.28315" />
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
src/wixlib/NetCore3.1.0_x86.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.0?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/e93147bb-7654-46d6-954a-bbd54da63b9b/cbdba4605fd04dc3886ca772d3953c53/windowsdesktop-runtime-3.1.0-win-x86.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
42 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
43 + Description="Microsoft .NET Core Runtime - 3.1.0 (x86)"
44 + Hash="CAF456ED2F229E5CE36CEAE5C752D7C69BB4CABD"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.0 (x86)"
46 + Size="23318984"
47 + Version="3.1.0.28315" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
78 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
79 + Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
80 + Hash="7616CD3453F253032DB7A56455A8429FAEC934C4"
81 + ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
82 + Size="7146408"
83 + Version="3.1.0.19566" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
114 + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
116 + Hash="96FF19C3F740EA1D49376462EE336F5E5CA0ED79"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x86)"
118 + Size="48703304"
119 + Version="3.1.0.28315" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>
src/wixlib/NetCore3.1.1_x64.wxs
+23 -25
@@ -11,7 +11,7 @@
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 = ?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.1 (x64)"
44 + Hash="B9E2166EDDEFAA4D7543F24A2E7CD76C35D4E617"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.1 (x64)"
46 + Size="26055096"
47 + Version="3.1.1.28408" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -76,13 +74,13 @@
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
79 - CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
80 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
81 - Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 - Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
83 - ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
84 - Size="7867488"
85 - Version="3.1.1.19615"/>
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
80 + Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
81 + ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 + Size="7867488"
83 + Version="3.1.1.19615"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
@@ -112,13 +110,13 @@
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
115 - CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
116 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
117 - Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
118 - Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
119 - ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
120 - Size="54211664"
121 - Version="3.1.1.28408"/>
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
116 + Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
118 + Size="54211664"
119 + Version="3.1.1.28408"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
src/wixlib/NetCore3.1.1_x86.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.1?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/662153d9-58c5-4630-a326-ed9e4e342787/1deb6ba6a2a5f5f694b784a6859b446e/windowsdesktop-runtime-3.1.1-win-x86.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.1 (x86)"
44 + Hash="4790D3117F4D4F7AF63113BBECD3BF0E8C940C2A"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.1 (x86)"
46 + Size="23327424"
47 + Version="3.1.1.28408" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
80 + Hash="65B4D07B6BA51BC7D0D1B82EC904893B8ACF639D"
81 + ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
82 + Size="7193600"
83 + Version="3.1.1.19615" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
116 + Hash="A368E17FFEE5CEBFDFE981BC329CEFFACF4674CC"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x86)"
118 + Size="48513144"
119 + Version="3.1.1.28408" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>
src/wixlib/NetCore3.1.2_x64.wxs
+23 -25
@@ -11,7 +11,7 @@
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 = ?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.2 (x64)"
44 + Hash="6955F4851B42A533683824C65D7423AF22BC6710"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.2 (x64)"
46 + Size="26066088"
47 + Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -76,13 +74,13 @@
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
76 <RemotePayload
79 - CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
80 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
81 - Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 - Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
83 - ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
84 - Size="7812680"
85 - Version="3.1.2.20068"/>
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
80 + Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
81 + ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 + Size="7812680"
83 + Version="3.1.2.20068"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
@@ -112,13 +110,13 @@
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
112 <RemotePayload
115 - CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
116 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
117 - Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
118 - Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
119 - ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
120 - Size="54323576"
121 - Version="3.1.2.28517"/>
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
116 + Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
118 + Size="54323576"
119 + Version="3.1.2.28517"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
src/wixlib/NetCore3.1.2_x86.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.2?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/b824906f-bd6e-4067-86a6-95c61620674d/cfcdab84a01cee94fdaa31271c3d4d47/windowsdesktop-runtime-3.1.2-win-x86.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
44 + Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
46 + Size="23298048"
47 + Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
80 + Hash="302D15317C3D2D0B707EAC92D943A624BBDA14D9"
81 + ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
82 + Size="7128912"
83 + Version="3.1.2.20068" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
116 + Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
118 + Size="48525928"
119 + Version="3.1.2.28517" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>
src/wixlib/NetCore3.1.3_x64.wxs
+24 -21
@@ -37,13 +37,14 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
40 - <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
41 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
42 - Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
43 - Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
44 - ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
45 - Size="26117496"
46 - Version="3.1.3.28628"/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.3 (x64)"
44 + Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)"
46 + Size="26117496"
47 + Version="3.1.3.28628"/>
48 </ExePackage>
49 </PackageGroup>
50 </Fragment>
@@ -72,13 +73,14 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
75 - <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
76 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
77 - Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
78 - Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
79 - ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
80 - Size="7868592"
81 - Version="3.1.3.20163"/>
76 + <RemotePayload
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
80 + Hash="E6B175E66DE4662CEF161FF3263A97410E993D18"
81 + ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
82 + Size="7868592"
83 + Version="3.1.3.20163"/>
84 </ExePackage>
85 </PackageGroup>
86 </Fragment>
@@ -107,13 +109,14 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
110 - <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
111 - CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
112 - Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
113 - Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
114 - ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
115 - Size="54449000"
116 - Version="3.1.3.28628"/>
112 + <RemotePayload
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
116 + Hash="9A965A63214627F2C9B3A38E402B561BFD275422"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)"
118 + Size="54449000"
119 + Version="3.1.3.28628"/>
120 </ExePackage>
121 </PackageGroup>
122 </Fragment>
src/wixlib/NetCore3.1.3_x86.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.3?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/7cd5c874-5d11-4e72-81f0-4a005d956708/0eb310169770c893407169fc3abaac4f/windowsdesktop-runtime-3.1.3-win-x86.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.2 (x86)"
44 + Hash="3A53B9646B32B15D20B0B4EDC8EF9787E00EF490"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.2 (x86)"
46 + Size="23298048"
47 + Version="3.1.2.28517" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
78 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
79 + Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
80 + Hash="42F8DF6AAC1299E05A04B4D2DB3E10D0D1A8E942"
81 + ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework"
82 + Size="7157720"
83 + Version="3.1.3.20163" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
116 + Hash="53E9F596F3333EB8576CC237396B5D6A26F98EBE"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x86)"
118 + Size="48525928"
119 + Version="3.1.2.28517" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>
src/wixlib/NetCore3.1.4_x64.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.4?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/d8cf1fe3-21c2-4baf-988f-f0152996135e/0c00b94713ee93e7ad5b4f82e2b86607/windowsdesktop-runtime-3.1.4-win-x64.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
42 + CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
43 + Description="Microsoft .NET Core Runtime - 3.1.4 (x64)"
44 + Hash="F60C08D1FB8B6D5A8AC5D008928B673AAC5D0278"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.4 (x64)"
46 + Size="26159064"
47 + Version="3.1.4.28821" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 + CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 + Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
80 + Hash="5CF68BFFE3377DCBE03986380098D93AB876FF13"
81 + ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
82 + Size="7829704"
83 + Version="3.1.4.20222" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
116 + Hash="78BA9B86F57379D8FE20C7C06038B79C0B7051F6"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x64)"
118 + Size="54480864"
119 + Version="3.1.4.28821" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>
src/wixlib/NetCore3.1.4_x86.wxs
+25 -33
@@ -9,9 +9,9 @@
9 <?define NetCoreVersion = 3.1.4?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = ?>
13 - <?define DesktopNetCoreRedistLink = ?>
14 - <?define DotNetCoreRedistLink = ?>
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 = https://download.visualstudio.microsoft.com/download/pr/2d4b7600-5f32-4a1f-abd5-47cdb2d1362b/7b8b7635e3bb63f6b2cc9a1c624b5325/windowsdesktop-runtime-3.1.4-win-x86.exe?>
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
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
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 - <!--
24 <PackageGroup Id="$(var.DotNetCoreRedistId)">
25 <ExePackage
26 Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
37 DownloadUrl="$(var.DotNetCoreRedistLink)"
38 LogPathVariable="$(var.DotNetCoreRedistLog)"
39 Compressed="no">
41 - TODO: Get RemotePayload info
42 - <RemotePayload CertificatePublicKey=""
43 - CertificateThumbprint=""
44 - Description=""
45 - Hash=""
46 - ProductName=""
47 - Size=""
48 - Version=""/>
40 + <RemotePayload
41 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
42 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
43 + Description="Microsoft .NET Core Runtime - 3.1.4 (x86)"
44 + Hash="4FA35E3F31BCFCC6B65D0CB13E21EE0FC56D1C6B"
45 + ProductName="Microsoft .NET Core Runtime - 3.1.4 (x86)"
46 + Size="23345544"
47 + Version="3.1.4.28821" />
48 </ExePackage>
49 </PackageGroup>
51 - -->
50 </Fragment>
51
52 <Fragment>
@@ -59,7 +57,6 @@
57 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
58 <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
59
62 - <!--
60 <PackageGroup Id="$(var.AspNetCoreRedistId)">
61 <ExePackage
62 Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -76,18 +73,16 @@
73 DownloadUrl="$(var.AspNetCoreRedistLink)"
74 LogPathVariable="$(var.AspNetCoreRedistLog)"
75 Compressed="no">
79 - TODO: Get RemotePayload info
76 <RemotePayload
81 - CertificatePublicKey=""
82 - CertificateThumbprint=""
83 - Description=""
84 - Hash=""
85 - ProductName=""
86 - Size=""
87 - Version="" />
77 + CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
78 + CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
79 + Description="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
80 + Hash="2272BF19490DA6519FC2735A2C8815F8944D3388"
81 + ProductName="Microsoft ASP.NET Core 3.1.4 - Shared Framework"
82 + Size="7171864"
83 + Version="3.1.4.20222" />
84 </ExePackage>
85 </PackageGroup>
90 - -->
86 </Fragment>
87
88 <Fragment>
@@ -98,7 +93,6 @@
93 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
94 <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
95
101 - <!--
96 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
97 <ExePackage
98 Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -115,17 +109,15 @@
109 DownloadUrl="$(var.DesktopNetCoreRedistLink)"
110 LogPathVariable="$(var.DesktopNetCoreRedistLog)"
111 Compressed="no">
118 - TODO: Get RemotePayload info
112 <RemotePayload
120 - CertificatePublicKey=""
121 - CertificateThumbprint=""
122 - Description=""
123 - Hash=""
124 - ProductName=""
125 - Size=""
126 - Version="" />
113 + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
114 + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
115 + Description="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
116 + Hash="331BF47FD6E95174D17B63938C022A48E02CB8BF"
117 + ProductName="Microsoft Windows Desktop Runtime - 3.1.4 (x86)"
118 + Size="48703936"
119 + Version="3.1.4.28821" />
120 </ExePackage>
121 </PackageGroup>
129 - -->
122 </Fragment>
123 </Wix>