From 2586d9355abacc7294499dd81217012385d3d8a8 Mon Sep 17 00:00:00 2001 From: James Parsons Date: Mon, 21 Sep 2020 13:13:27 -0700 Subject: [PATCH] Update .NET Core package definitions --- src/wixlib/NetCore3.1.0_x64.wxs | 48 +++++++++++++-------------- src/wixlib/NetCore3.1.0_x86.wxs | 58 ++++++++++++++------------------- src/wixlib/NetCore3.1.1_x64.wxs | 48 +++++++++++++-------------- src/wixlib/NetCore3.1.1_x86.wxs | 58 ++++++++++++++------------------- src/wixlib/NetCore3.1.2_x64.wxs | 48 +++++++++++++-------------- src/wixlib/NetCore3.1.2_x86.wxs | 58 ++++++++++++++------------------- src/wixlib/NetCore3.1.3_x64.wxs | 45 +++++++++++++------------ src/wixlib/NetCore3.1.3_x86.wxs | 58 ++++++++++++++------------------- src/wixlib/NetCore3.1.4_x64.wxs | 58 ++++++++++++++------------------- src/wixlib/NetCore3.1.4_x86.wxs | 58 ++++++++++++++------------------- 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 281f300..cda6aed 100644 --- a/src/wixlib/NetCore3.1.0_x64.wxs +++ b/src/wixlib/NetCore3.1.0_x64.wxs @@ -11,7 +11,7 @@ - + @@ -21,7 +21,6 @@ - @@ -76,13 +74,13 @@ LogPathVariable="$(var.AspNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" + Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework" + Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8" + ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework" + Size="7811768" + Version="3.1.0.19566" /> @@ -112,13 +110,13 @@ LogPathVariable="$(var.DesktopNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" + CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" + Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" + Hash="C16F271754879BA78868947486F37871C9F0E40F" + ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" + Size="54443856" + Version="3.1.0.28315" /> diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs index 3b2d76a..92da926 100644 --- a/src/wixlib/NetCore3.1.0_x86.wxs +++ b/src/wixlib/NetCore3.1.0_x86.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ - diff --git a/src/wixlib/NetCore3.1.1_x64.wxs b/src/wixlib/NetCore3.1.1_x64.wxs index 834752b..14adbea 100644 --- a/src/wixlib/NetCore3.1.1_x64.wxs +++ b/src/wixlib/NetCore3.1.1_x64.wxs @@ -11,7 +11,7 @@ - + @@ -21,7 +21,6 @@ - @@ -76,13 +74,13 @@ LogPathVariable="$(var.AspNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" + Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework" + Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE" + ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework" + Size="7867488" + Version="3.1.1.19615"/> @@ -112,13 +110,13 @@ LogPathVariable="$(var.DesktopNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" + Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" + Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC" + ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" + Size="54211664" + Version="3.1.1.28408"/> diff --git a/src/wixlib/NetCore3.1.1_x86.wxs b/src/wixlib/NetCore3.1.1_x86.wxs index c1f3d1f..132f434 100644 --- a/src/wixlib/NetCore3.1.1_x86.wxs +++ b/src/wixlib/NetCore3.1.1_x86.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ - diff --git a/src/wixlib/NetCore3.1.2_x64.wxs b/src/wixlib/NetCore3.1.2_x64.wxs index 1cc6a5d..e63f811 100644 --- a/src/wixlib/NetCore3.1.2_x64.wxs +++ b/src/wixlib/NetCore3.1.2_x64.wxs @@ -11,7 +11,7 @@ - + @@ -21,7 +21,6 @@ - @@ -76,13 +74,13 @@ LogPathVariable="$(var.AspNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" + Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework" + Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC" + ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework" + Size="7812680" + Version="3.1.2.20068"/> @@ -112,13 +110,13 @@ LogPathVariable="$(var.DesktopNetCoreRedistLog)" Compressed="no"> + CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" + CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" + Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" + Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4" + ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" + Size="54323576" + Version="3.1.2.28517"/> diff --git a/src/wixlib/NetCore3.1.2_x86.wxs b/src/wixlib/NetCore3.1.2_x86.wxs index d9275c1..8f3c26d 100644 --- a/src/wixlib/NetCore3.1.2_x86.wxs +++ b/src/wixlib/NetCore3.1.2_x86.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ - diff --git a/src/wixlib/NetCore3.1.3_x64.wxs b/src/wixlib/NetCore3.1.3_x64.wxs index a10b19b..85887c8 100644 --- a/src/wixlib/NetCore3.1.3_x64.wxs +++ b/src/wixlib/NetCore3.1.3_x64.wxs @@ -37,13 +37,14 @@ DownloadUrl="$(var.DotNetCoreRedistLink)" LogPathVariable="$(var.DotNetCoreRedistLog)" Compressed="no"> - + @@ -72,13 +73,14 @@ DownloadUrl="$(var.AspNetCoreRedistLink)" LogPathVariable="$(var.AspNetCoreRedistLog)" Compressed="no"> - + @@ -107,13 +109,14 @@ DownloadUrl="$(var.DesktopNetCoreRedistLink)" LogPathVariable="$(var.DesktopNetCoreRedistLog)" Compressed="no"> - + diff --git a/src/wixlib/NetCore3.1.3_x86.wxs b/src/wixlib/NetCore3.1.3_x86.wxs index c9fe980..9a03865 100644 --- a/src/wixlib/NetCore3.1.3_x86.wxs +++ b/src/wixlib/NetCore3.1.3_x86.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ - diff --git a/src/wixlib/NetCore3.1.4_x64.wxs b/src/wixlib/NetCore3.1.4_x64.wxs index 39ab826..06a42c3 100644 --- a/src/wixlib/NetCore3.1.4_x64.wxs +++ b/src/wixlib/NetCore3.1.4_x64.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ - diff --git a/src/wixlib/NetCore3.1.4_x86.wxs b/src/wixlib/NetCore3.1.4_x86.wxs index 9a6e390..ea643a0 100644 --- a/src/wixlib/NetCore3.1.4_x86.wxs +++ b/src/wixlib/NetCore3.1.4_x86.wxs @@ -9,9 +9,9 @@ - - - + + + @@ -21,7 +21,6 @@ - @@ -59,7 +57,6 @@ - @@ -98,7 +93,6 @@ -