1 files changed, 23 insertions, 25 deletions
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 @@
    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe?>
    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe?>
-    <?define DotNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/fda71c5b-ee58-4919-95dc-4f32dbebd2cd/97ffe3880a25f5f7cae1a7e40cd3509e/dotnet-runtime-3.1.1-win-x64.exe?>
    <Fragment>
        <util:DirectorySearchRef Id="$(var.DotNetCoreId)" />
@@ -21,7 +21,6 @@
        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" />
        <WixVariable Id="DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" />
-        <!--
        <PackageGroup Id="$(var.DotNetCoreRedistId)">
            <ExePackage
                Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
@@ -38,17 +37,16 @@
                DownloadUrl="$(var.DotNetCoreRedistLink)"
                LogPathVariable="$(var.DotNetCoreRedistLog)"
                Compressed="no">
-                TODO: Get RemotePayload info
+                <RemotePayload
-                <RemotePayload CertificatePublicKey=""
+                    CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                               CertificateThumbprint=""
+                    CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                               Description=""
+                    Description="Microsoft .NET Core Runtime - 3.1.1 (x64)"
-                               Hash=""
+                    Hash="B9E2166EDDEFAA4D7543F24A2E7CD76C35D4E617"
-                               ProductName=""
+                    ProductName="Microsoft .NET Core Runtime - 3.1.1 (x64)"
-                               Size=""
+                    Size="26055096"
-                               Version=""/>
+                    Version="3.1.1.28408" />
            </ExePackage>
        </PackageGroup>
-        -->
    </Fragment>
    <Fragment>
@@ -76,13 +74,13 @@
                LogPathVariable="$(var.AspNetCoreRedistLog)"
                Compressed="no">
                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                    CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                    CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
+                    Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
-                  Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
+                    Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE"
-                  ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
+                    ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework"
-                  Size="7867488"
+                    Size="7867488"
-                  Version="3.1.1.19615"/>
+                    Version="3.1.1.19615"/>
            </ExePackage>
        </PackageGroup>
    </Fragment>
@@ -112,13 +110,13 @@
                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
                Compressed="no">
                <RemotePayload
-                  CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
+                    CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457"
-                  CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
+                    CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32"
-                  Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
-                  Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
+                    Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)"
-                  Size="54211664"
+                    Size="54211664"
-                  Version="3.1.1.28408"/>
+                    Version="3.1.1.28408"/>
            </ExePackage>
        </PackageGroup>
    </Fragment>

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>