diff options
Diffstat (limited to 'src/wixlib/NetCore3.1.wxs')
-rw-r--r-- | src/wixlib/NetCore3.1.wxs | 70 |
1 files changed, 41 insertions, 29 deletions
diff --git a/src/wixlib/NetCore3.1.wxs b/src/wixlib/NetCore3.1.wxs index 7f1cd2f9..4ca554fa 100644 --- a/src/wixlib/NetCore3.1.wxs +++ b/src/wixlib/NetCore3.1.wxs | |||
@@ -1,30 +1,41 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
5 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
6 | |||
7 | <?define NetCorePlatform = x64?> | ||
8 | <?define NetCoreIdVersion = 310?> | ||
9 | <?define NetCoreVersion = 3.1.0?> | ||
10 | <?include NetCore3_Platform.wxi?> | ||
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?> | ||
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 | |||
5 | <Fragment> | 15 | <Fragment> |
6 | <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.0" /> | 16 | <util:DirectorySearchRef Id="$(var.AspNetCoreId)" /> |
7 | <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists" /> | ||
8 | 17 | ||
9 | <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes" /> | 18 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.AspNetCoreId)" Overridable="yes" /> |
10 | <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes" /> | 19 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> |
20 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
21 | <WixVariable Id="AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
11 | 22 | ||
12 | <PackageGroup Id="AspNetCoreRuntime31Web"> | 23 | <PackageGroup Id="$(var.AspNetCoreRedistId)"> |
13 | <ExePackage | 24 | <ExePackage |
14 | Name="aspnetcore-runtime-3.1.0-win-x64.exe" | 25 | Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
15 | InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | 26 | InstallCommand="$(var.AspNetCoreRedistInstallCommand)" |
16 | RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | 27 | RepairCommand="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" |
17 | UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | 28 | UninstallCommand="$(var.AspNetCoreRedistUninstallCommand)" |
18 | PerMachine="yes" | 29 | PerMachine="yes" |
19 | DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)" | 30 | DetectCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" |
20 | InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)" | 31 | InstallCondition="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" |
32 | Id="$(var.AspNetCoreRedistId)" | ||
21 | Vital="yes" | 33 | Vital="yes" |
22 | Permanent="yes" | 34 | Permanent="yes" |
23 | Protocol="burn" | 35 | Protocol="burn" |
24 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a16689d1-0872-4ef9-a592-406d3038d8f7/cf4f84504385a599f0cb6a5c113ccb34/aspnetcore-runtime-3.1.0-win-x64.exe" | 36 | DownloadUrl="$(var.AspNetCoreRedistLink)" |
25 | LogPathVariable="AspNetCoreRuntime31Log" | 37 | LogPathVariable="$(var.AspNetCoreRedistLog)" |
26 | Compressed="no"> | 38 | Compressed="no"> |
27 | <!-- heat.exe payload "aspnetcore-runtime-3.1.0-win-x64.exe" -o "aspnetcore-runtime.wxs" --> | ||
28 | <RemotePayload | 39 | <RemotePayload |
29 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" | 40 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" |
30 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" | 41 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" |
@@ -38,28 +49,29 @@ | |||
38 | </Fragment> | 49 | </Fragment> |
39 | 50 | ||
40 | <Fragment> | 51 | <Fragment> |
41 | <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.0" /> | 52 | <util:DirectorySearchRef Id="$(var.DesktopNetCoreId)" /> |
42 | <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists" /> | ||
43 | 53 | ||
44 | <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes" /> | 54 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition" Value="$(var.DesktopNetCoreId)" Overridable="yes" /> |
45 | <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes" /> | 55 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition" Value="" Overridable="yes" /> |
56 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory" Value="redist\" Overridable="yes" /> | ||
57 | <WixVariable Id="DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand" Value="" Overridable="yes" /> | ||
46 | 58 | ||
47 | <PackageGroup Id="WindowsDesktopRuntime31Web"> | 59 | <PackageGroup Id="$(var.DesktopNetCoreRedistId)"> |
48 | <ExePackage | 60 | <ExePackage |
49 | Name="windowsdesktop-runtime-3.1.0-win-x64.exe" | 61 | Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe" |
50 | InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | 62 | InstallCommand="$(var.DesktopNetCoreRedistInstallCommand)" |
51 | RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | 63 | RepairCommand="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairCommand)" |
52 | UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | 64 | UninstallCommand="$(var.DesktopNetCoreRedistUninstallCommand)" |
53 | PerMachine="yes" | 65 | PerMachine="yes" |
54 | DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)" | 66 | DetectCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)DetectCondition)" |
55 | InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)" | 67 | InstallCondition="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)InstallCondition)" |
68 | Id="$(var.DesktopNetCoreRedistId)" | ||
56 | Vital="yes" | 69 | Vital="yes" |
57 | Permanent="yes" | 70 | Permanent="yes" |
58 | Protocol="burn" | 71 | Protocol="burn" |
59 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1510e74-b31a-4434-b8a0-8074ff31fb3f/b7de8ecba4a14d8312551cfdc745dea1/windowsdesktop-runtime-3.1.0-win-x64.exe" | 72 | DownloadUrl="$(var.DesktopNetCoreRedistLink)" |
60 | LogPathVariable="WindowsDesktopRuntime31Log" | 73 | LogPathVariable="$(var.DesktopNetCoreRedistLog)" |
61 | Compressed="no"> | 74 | Compressed="no"> |
62 | <!-- heat.exe payload "windowsdesktop-runtime-3.1.0-win-x64.exe" -o "windowsdesktop-runtime.wxs" --> | ||
63 | <RemotePayload | 75 | <RemotePayload |
64 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" | 76 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" |
65 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" | 77 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" |