1 files changed, 23 insertions, 25 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 @@
    <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe?>
    <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe?>
-    <?define DotNetCoreRedistLink = ?>
+    <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/9f010da2-d510-4271-8dcc-ad92b8b9b767/d2dd394046c20e0563ce5c45c356653f/dotnet-runtime-3.1.0-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="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
-                               CertificateThumbprint=""
+                    CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
-                               Description=""
+                    Description="Microsoft .NET Core Runtime - 3.1.0 (x64)"
-                               Hash=""
+                    Hash="DDA7CD0E851E742ACA43EFBD1361CDB382771E21"
-                               ProductName=""
+                    ProductName="Microsoft .NET Core Runtime - 3.1.0 (x64)"
-                               Size=""
+                    Size="26061496"
-                               Version=""/>
+                    Version="3.1.0.28315" />
            </ExePackage>
        </PackageGroup>
-        -->
    </Fragment>
    <Fragment>
@@ -76,13 +74,13 @@
                LogPathVariable="$(var.AspNetCoreRedistLog)"
                Compressed="no">
                <RemotePayload
-                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
+                    CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
-                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
+                    CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
-                  Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
+                    Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
-                  Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
+                    Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8"
-                  ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
+                    ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework"
-                  Size="7811768"
+                    Size="7811768"
-                  Version="3.1.0.19566" />
+                    Version="3.1.0.19566" />
            </ExePackage>
        </PackageGroup>
    </Fragment>
@@ -112,13 +110,13 @@
                LogPathVariable="$(var.DesktopNetCoreRedistLog)"
                Compressed="no">
                <RemotePayload
-                  CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
+                    CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D"
-                  CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
+                    CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34"
-                  Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
-                  Hash="C16F271754879BA78868947486F37871C9F0E40F"
+                    Hash="C16F271754879BA78868947486F37871C9F0E40F"
-                  ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)"
-                  Size="54443856"
+                    Size="54443856"
-                  Version="3.1.0.28315" />
+                    Version="3.1.0.28315" />
            </ExePackage>
        </PackageGroup>
    </Fragment>

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>