1 files changed, 23 insertions, 25 deletions
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 @@
    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe?>
    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe?>
-    <?define DotNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cfe420d5-084c-4590-b387-f89f3387d4c9/db4c577b995c54dee0530d8230e87145/dotnet-runtime-3.1.2-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.2 (x64)"
-                               Hash=""
+                    Hash="6955F4851B42A533683824C65D7423AF22BC6710"
-                               ProductName=""
+                    ProductName="Microsoft .NET Core Runtime - 3.1.2 (x64)"
-                               Size=""
+                    Size="26066088"
-                               Version=""/>
+                    Version="3.1.2.28517" />
            </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.2 - Shared Framework"
+                    Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
-                  Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
+                    Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC"
-                  ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
+                    ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework"
-                  Size="7812680"
+                    Size="7812680"
-                  Version="3.1.2.20068"/>
+                    Version="3.1.2.20068"/>
            </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.2 (x64)"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
-                  Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
+                    Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)"
-                  Size="54323576"
+                    Size="54323576"
-                  Version="3.1.2.28517"/>
+                    Version="3.1.2.28517"/>
            </ExePackage>
        </PackageGroup>
    </Fragment>

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>