diff options
Diffstat (limited to 'src/wixlib/NetCore3.1.0_x86.wxs')
-rw-r--r-- | src/wixlib/NetCore3.1.0_x86.wxs | 58 |
1 files changed, 25 insertions, 33 deletions
diff --git a/src/wixlib/NetCore3.1.0_x86.wxs b/src/wixlib/NetCore3.1.0_x86.wxs index 3b2d76af..92da9266 100644 --- a/src/wixlib/NetCore3.1.0_x86.wxs +++ b/src/wixlib/NetCore3.1.0_x86.wxs | |||
@@ -9,9 +9,9 @@ | |||
9 | <?define NetCoreVersion = 3.1.0?> | 9 | <?define NetCoreVersion = 3.1.0?> |
10 | <?include NetCore3_Platform.wxi?> | 10 | <?include NetCore3_Platform.wxi?> |
11 | 11 | ||
12 | <?define AspNetCoreRedistLink = ?> | 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 = ?> | 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 = ?> | 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 | 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 (x86)" |
45 | Hash="" | 44 | Hash="CAF456ED2F229E5CE36CEAE5C752D7C69BB4CABD" |
46 | ProductName="" | 45 | ProductName="Microsoft .NET Core Runtime - 3.1.0 (x86)" |
47 | Size="" | 46 | Size="23318984" |
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> |
@@ -59,7 +57,6 @@ | |||
59 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | 57 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> |
60 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | 58 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> |
61 | 59 | ||
62 | <!-- | ||
63 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> | 60 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> |
64 | <ExePackage | 61 | <ExePackage |
65 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | 62 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
@@ -76,18 +73,16 @@ | |||
76 | DownloadUrl="$(var.AspNetCoreRedistLink)" | 73 | DownloadUrl="$(var.AspNetCoreRedistLink)" |
77 | LogPathVariable="$(var.AspNetCoreRedistLog)" | 74 | LogPathVariable="$(var.AspNetCoreRedistLog)" |
78 | Compressed="no"> | 75 | Compressed="no"> |
79 | TODO: Get RemotePayload info | ||
80 | <RemotePayload | 76 | <RemotePayload |
81 | CertificatePublicKey="" | 77 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" |
82 | CertificateThumbprint="" | 78 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" |
83 | Description="" | 79 | Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework" |
84 | Hash="" | 80 | Hash="7616CD3453F253032DB7A56455A8429FAEC934C4" |
85 | ProductName="" | 81 | ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework" |
86 | Size="" | 82 | Size="7146408" |
87 | Version="" /> | 83 | Version="3.1.0.19566" /> |
88 | </ExePackage> | 84 | </ExePackage> |
89 | </PackageGroup> | 85 | </PackageGroup> |
90 | --> | ||
91 | </Fragment> | 86 | </Fragment> |
92 | 87 | ||
93 | <Fragment> | 88 | <Fragment> |
@@ -98,7 +93,6 @@ | |||
98 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | 93 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> |
99 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | 94 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> |
100 | 95 | ||
101 | <!-- | ||
102 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> | 96 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> |
103 | <ExePackage | 97 | <ExePackage |
104 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" | 98 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
@@ -115,17 +109,15 @@ | |||
115 | DownloadUrl="$(var.DesktopNetCoreRedistLink)" | 109 | DownloadUrl="$(var.DesktopNetCoreRedistLink)" |
116 | LogPathVariable="$(var.DesktopNetCoreRedistLog)" | 110 | LogPathVariable="$(var.DesktopNetCoreRedistLog)" |
117 | Compressed="no"> | 111 | Compressed="no"> |
118 | TODO: Get RemotePayload info | ||
119 | <RemotePayload | 112 | <RemotePayload |
120 | CertificatePublicKey="" | 113 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" |
121 | CertificateThumbprint="" | 114 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" |
122 | Description="" | 115 | Description="Microsoft Windows Desktop Runtime - 3.1.0 (x86)" |
123 | Hash="" | 116 | Hash="96FF19C3F740EA1D49376462EE336F5E5CA0ED79" |
124 | ProductName="" | 117 | ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x86)" |
125 | Size="" | 118 | Size="48703304" |
126 | Version="" /> | 119 | Version="3.1.0.28315" /> |
127 | </ExePackage> | 120 | </ExePackage> |
128 | </PackageGroup> | 121 | </PackageGroup> |
129 | --> | ||
130 | </Fragment> | 122 | </Fragment> |
131 | </Wix> | 123 | </Wix> |