diff options
author | William Kent <wjk@users.noreply.github.com> | 2020-05-18 20:48:06 -0400 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-20 16:34:39 +1000 |
commit | 037243df84151413db9666c78526fc60ff5e3b53 (patch) | |
tree | 3844dd6905bb921f8f652285453e02d79672ee6d | |
parent | 91c46b53b80172a9fe1419ac67500ad55b52c16c (diff) | |
download | wix-037243df84151413db9666c78526fc60ff5e3b53.tar.gz wix-037243df84151413db9666c78526fc60ff5e3b53.tar.bz2 wix-037243df84151413db9666c78526fc60ff5e3b53.zip |
Add predefined payload for .NET Core 3.1.x
-rw-r--r-- | src/wixlib/NetCore3.1.1.wxs | 74 | ||||
-rw-r--r-- | src/wixlib/NetCore3.1.2.wxs | 74 | ||||
-rw-r--r-- | src/wixlib/NetCore3.1.3.wxs | 103 | ||||
-rw-r--r-- | src/wixlib/NetCore3.1.wxs | 74 | ||||
-rw-r--r-- | src/wixlib/netfx.wixproj | 4 |
5 files changed, 329 insertions, 0 deletions
diff --git a/src/wixlib/NetCore3.1.1.wxs b/src/wixlib/NetCore3.1.1.wxs new file mode 100644 index 00000000..109d4f6b --- /dev/null +++ b/src/wixlib/NetCore3.1.1.wxs | |||
@@ -0,0 +1,74 @@ | |||
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. --> | ||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
5 | <Fragment> | ||
6 | <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.1"/> | ||
7 | <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/> | ||
8 | |||
9 | <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/> | ||
10 | <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
11 | |||
12 | <PackageGroup Id="AspNetCoreRuntime31Web"> | ||
13 | <ExePackage | ||
14 | Name="aspnetcore-runtime-3.1.1-win-x64.exe" | ||
15 | InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
16 | RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
17 | UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
18 | PerMachine="yes" | ||
19 | DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)" | ||
20 | InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)" | ||
21 | Vital="yes" | ||
22 | Permanent="yes" | ||
23 | Protocol="burn" | ||
24 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/fa469b98-e312-4744-9dab-a46d2242b0ab/ae5e1eb530e312d68b501b7dd03d4c00/aspnetcore-runtime-3.1.1-win-x64.exe" | ||
25 | LogPathVariable="AspNetCoreRuntime31Log" | ||
26 | Compressed="no"> | ||
27 | <!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.1-win-x64.exe" -o "aspnetcore-runtime.wxs" --> | ||
28 | <RemotePayload | ||
29 | CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
30 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
31 | Description="Microsoft ASP.NET Core 3.1.1 - Shared Framework" | ||
32 | Hash="6614D5792D9335632D66C3EB7DE942A7AE10D6BE" | ||
33 | ProductName="Microsoft ASP.NET Core 3.1.1 - Shared Framework" | ||
34 | Size="7867488" | ||
35 | Version="3.1.1.19615"/> | ||
36 | </ExePackage> | ||
37 | </PackageGroup> | ||
38 | </Fragment> | ||
39 | |||
40 | <Fragment> | ||
41 | <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.1"/> | ||
42 | <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/> | ||
43 | |||
44 | <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/> | ||
45 | <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
46 | |||
47 | <PackageGroup Id="WindowsDesktopRuntime31Web"> | ||
48 | <ExePackage | ||
49 | Name="windowsdesktop-runtime-3.1.1-win-x64.exe" | ||
50 | InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
51 | RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
52 | UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
53 | PerMachine="yes" | ||
54 | DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)" | ||
55 | InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)" | ||
56 | Vital="yes" | ||
57 | Permanent="yes" | ||
58 | Protocol="burn" | ||
59 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/a1d41522-4da0-42bc-b3f2-e4b7d842974d/03101425368c87c55c1fe7cafbb4e0fb/windowsdesktop-runtime-3.1.1-win-x64.exe" | ||
60 | LogPathVariable="WindowsDesktopRuntime31Log" | ||
61 | Compressed="no"> | ||
62 | <!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.1-win-x64.exe" -o "windowsdesktop-runtime.wxs" --> | ||
63 | <RemotePayload | ||
64 | CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
65 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
66 | Description="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" | ||
67 | Hash="AE723619D9CD6407F3D4B4948DF4F026A99781DC" | ||
68 | ProductName="Microsoft Windows Desktop Runtime - 3.1.1 (x64)" | ||
69 | Size="54211664" | ||
70 | Version="3.1.1.28408"/> | ||
71 | </ExePackage> | ||
72 | </PackageGroup> | ||
73 | </Fragment> | ||
74 | </Wix> | ||
diff --git a/src/wixlib/NetCore3.1.2.wxs b/src/wixlib/NetCore3.1.2.wxs new file mode 100644 index 00000000..f8a5a7b5 --- /dev/null +++ b/src/wixlib/NetCore3.1.2.wxs | |||
@@ -0,0 +1,74 @@ | |||
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. --> | ||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
5 | <Fragment> | ||
6 | <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.2"/> | ||
7 | <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/> | ||
8 | |||
9 | <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/> | ||
10 | <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
11 | |||
12 | <PackageGroup Id="AspNetCoreRuntime31Web"> | ||
13 | <ExePackage | ||
14 | Name="aspnetcore-runtime-3.1.2-win-x64.exe" | ||
15 | InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
16 | RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
17 | UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
18 | PerMachine="yes" | ||
19 | DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)" | ||
20 | InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)" | ||
21 | Vital="yes" | ||
22 | Permanent="yes" | ||
23 | Protocol="burn" | ||
24 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/326b33d1-6bbd-4149-ba35-c94784700674/c06386c2b09401fa94f9595617899d5d/aspnetcore-runtime-3.1.2-win-x64.exe" | ||
25 | LogPathVariable="AspNetCoreRuntime31Log" | ||
26 | Compressed="no"> | ||
27 | <!-- "%WIX%\bin\heat.exe" payload "aspnetcore-runtime-3.1.2-win-x64.exe" -o "aspnetcore-runtime.wxs" --> | ||
28 | <RemotePayload | ||
29 | CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
30 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
31 | Description="Microsoft ASP.NET Core 3.1.2 - Shared Framework" | ||
32 | Hash="B8EDDD91C0DFD9E47EB7DD7EFED9541340607ADC" | ||
33 | ProductName="Microsoft ASP.NET Core 3.1.2 - Shared Framework" | ||
34 | Size="7812680" | ||
35 | Version="3.1.2.20068"/> | ||
36 | </ExePackage> | ||
37 | </PackageGroup> | ||
38 | </Fragment> | ||
39 | |||
40 | <Fragment> | ||
41 | <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.2"/> | ||
42 | <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/> | ||
43 | |||
44 | <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/> | ||
45 | <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
46 | |||
47 | <PackageGroup Id="WindowsDesktopRuntime31Web"> | ||
48 | <ExePackage | ||
49 | Name="windowsdesktop-runtime-3.1.2-win-x64.exe" | ||
50 | InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
51 | RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
52 | UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
53 | PerMachine="yes" | ||
54 | DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)" | ||
55 | InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)" | ||
56 | Vital="yes" | ||
57 | Permanent="yes" | ||
58 | Protocol="burn" | ||
59 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/3240250e-6fe0-4258-af69-85abef6c00de/e01ee0af6c65d894f4a02bdf6705ec7b/windowsdesktop-runtime-3.1.2-win-x64.exe" | ||
60 | LogPathVariable="WindowsDesktopRuntime31Log" | ||
61 | Compressed="no"> | ||
62 | <!-- "%WIX%\bin\heat.exe" payload "windowsdesktop-runtime-3.1.2-win-x64.exe" -o "windowsdesktop-runtime.wxs" --> | ||
63 | <RemotePayload | ||
64 | CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
65 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
66 | Description="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" | ||
67 | Hash="C3A76B6C91FB28EFD95422EF82523A73DED322C4" | ||
68 | ProductName="Microsoft Windows Desktop Runtime - 3.1.2 (x64)" | ||
69 | Size="54323576" | ||
70 | Version="3.1.2.28517"/> | ||
71 | </ExePackage> | ||
72 | </PackageGroup> | ||
73 | </Fragment> | ||
74 | </Wix> | ||
diff --git a/src/wixlib/NetCore3.1.3.wxs b/src/wixlib/NetCore3.1.3.wxs new file mode 100644 index 00000000..8f4cba15 --- /dev/null +++ b/src/wixlib/NetCore3.1.3.wxs | |||
@@ -0,0 +1,103 @@ | |||
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. --> | ||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
5 | <Fragment> | ||
6 | <Variable Name="DotNetRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.NETCore.App\3.1.3"/> | ||
7 | <util:DirectorySearch Id="DotNetRuntime31Installed" Path="[DotNetRuntime31InstallDir]" Variable="DotNetRuntime31Installed" Result="exists"/> | ||
8 | |||
9 | <WixVariable Id="DotNetRuntime31WebDetectCondition" Value="DotNetRuntime31Installed" Overridable="yes"/> | ||
10 | <WixVariable Id="DotNetRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
11 | |||
12 | <PackageGroup Id="DotNetRuntime31Web"> | ||
13 | <ExePackage | ||
14 | Name="dotnet-runtime-3.1.3-win-x64.exe" | ||
15 | InstallCommand="/install /quiet /norestart /log "[DotNetRuntime31Log]"" | ||
16 | RepairCommand="/repair /quiet /norestart /log "[DotNetRuntime31Log]"" | ||
17 | UninstallCommand="/uninstall /quiet /norestart /log "[DotNetRuntime31Log]"" | ||
18 | PerMachine="yes" | ||
19 | DetectCondition="!(wix.DotNetRuntime31WebDetectCondition)" | ||
20 | InstallCondition="!(wix.DotNetRuntime31WebInstallCondition)" | ||
21 | Vital="yes" | ||
22 | Permanent="yes" | ||
23 | Protocol="burn" | ||
24 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/945df1ae-989b-4909-9d40-6b93e34cfa94/91f6c347203ad24bed374bf692e3a379/dotnet-runtime-3.1.3-win-x64.exe" | ||
25 | LogPathVariable="DotNetRuntime31Log" | ||
26 | Compressed="no"> | ||
27 | <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
28 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
29 | Description="Microsoft .NET Core Runtime - 3.1.3 (x64)" | ||
30 | Hash="AE0F5F1E87D687FDFE9FBE0A3BB1B9573FF9DD56" | ||
31 | ProductName="Microsoft .NET Core Runtime - 3.1.3 (x64)" | ||
32 | Size="26117496" | ||
33 | Version="3.1.3.28628"/> | ||
34 | </ExePackage> | ||
35 | </PackageGroup> | ||
36 | </Fragment> | ||
37 | |||
38 | <Fragment> | ||
39 | <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.3"/> | ||
40 | <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists"/> | ||
41 | |||
42 | <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes"/> | ||
43 | <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
44 | |||
45 | <PackageGroup Id="AspNetCoreRuntime31Web"> | ||
46 | <ExePackage | ||
47 | Name="aspnetcore-runtime-3.1.3-win-x64.exe" | ||
48 | InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
49 | RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
50 | UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
51 | PerMachine="yes" | ||
52 | DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)" | ||
53 | InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)" | ||
54 | Vital="yes" | ||
55 | Permanent="yes" | ||
56 | Protocol="burn" | ||
57 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/4b970ea4-cae6-4e36-a0a1-86a7efa9958e/0633df1e7f959795278c0c55afc2daa3/aspnetcore-runtime-3.1.3-win-x64.exe" | ||
58 | LogPathVariable="AspNetCoreRuntime31Log" | ||
59 | Compressed="no"> | ||
60 | <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
61 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
62 | Description="Microsoft ASP.NET Core 3.1.3 - Shared Framework" | ||
63 | Hash="E6B175E66DE4662CEF161FF3263A97410E993D18" | ||
64 | ProductName="Microsoft ASP.NET Core 3.1.3 - Shared Framework" | ||
65 | Size="7868592" | ||
66 | Version="3.1.3.20163"/> | ||
67 | </ExePackage> | ||
68 | </PackageGroup> | ||
69 | </Fragment> | ||
70 | |||
71 | <Fragment> | ||
72 | <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.3"/> | ||
73 | <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists"/> | ||
74 | |||
75 | <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes"/> | ||
76 | <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes"/> | ||
77 | |||
78 | <PackageGroup Id="WindowsDesktopRuntime31Web"> | ||
79 | <ExePackage | ||
80 | Name="windowsdesktop-runtime-3.1.3-win-x64.exe" | ||
81 | InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
82 | RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
83 | UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
84 | PerMachine="yes" | ||
85 | DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)" | ||
86 | InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)" | ||
87 | Vital="yes" | ||
88 | Permanent="yes" | ||
89 | Protocol="burn" | ||
90 | DownloadUrl="https://download.visualstudio.microsoft.com/download/pr/5954c748-86a1-4823-9e7d-d35f6039317a/169e82cbf6fdeb678c5558c5d0a83834/windowsdesktop-runtime-3.1.3-win-x64.exe" | ||
91 | LogPathVariable="WindowsDesktopRuntime31Log" | ||
92 | Compressed="no"> | ||
93 | <RemotePayload CertificatePublicKey="6ADD0C9D1AC70DA3668644B1C78884E82E3F3457" | ||
94 | CertificateThumbprint="711AF71DC4C4952C8ED65BB4BA06826ED3922A32" | ||
95 | Description="Microsoft Windows Desktop Runtime - 3.1.3 (x64)" | ||
96 | Hash="9A965A63214627F2C9B3A38E402B561BFD275422" | ||
97 | ProductName="Microsoft Windows Desktop Runtime - 3.1.3 (x64)" | ||
98 | Size="54449000" | ||
99 | Version="3.1.3.28628"/> | ||
100 | </ExePackage> | ||
101 | </PackageGroup> | ||
102 | </Fragment> | ||
103 | </Wix> | ||
diff --git a/src/wixlib/NetCore3.1.wxs b/src/wixlib/NetCore3.1.wxs new file mode 100644 index 00000000..7f1cd2f9 --- /dev/null +++ b/src/wixlib/NetCore3.1.wxs | |||
@@ -0,0 +1,74 @@ | |||
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. --> | ||
3 | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | ||
5 | <Fragment> | ||
6 | <Variable Name="AspNetCoreRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.AspNetCore.App\3.1.0" /> | ||
7 | <util:DirectorySearch Id="AspNetCoreRuntime31Installed" Path="[AspNetCoreRuntime31InstallDir]" Variable="AspNetCoreRuntime31Installed" Result="exists" /> | ||
8 | |||
9 | <WixVariable Id="AspNetCoreRuntime31WebDetectCondition" Value="AspNetCoreRuntime31Installed" Overridable="yes" /> | ||
10 | <WixVariable Id="AspNetCoreRuntime31WebInstallCondition" Value="" Overridable="yes" /> | ||
11 | |||
12 | <PackageGroup Id="AspNetCoreRuntime31Web"> | ||
13 | <ExePackage | ||
14 | Name="aspnetcore-runtime-3.1.0-win-x64.exe" | ||
15 | InstallCommand="/install /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
16 | RepairCommand="/repair /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
17 | UninstallCommand="/uninstall /quiet /norestart /log "[AspNetCoreRuntime31Log]"" | ||
18 | PerMachine="yes" | ||
19 | DetectCondition="!(wix.AspNetCoreRuntime31WebDetectCondition)" | ||
20 | InstallCondition="!(wix.AspNetCoreRuntime31WebInstallCondition)" | ||
21 | Vital="yes" | ||
22 | Permanent="yes" | ||
23 | 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" | ||
25 | LogPathVariable="AspNetCoreRuntime31Log" | ||
26 | Compressed="no"> | ||
27 | <!-- heat.exe payload "aspnetcore-runtime-3.1.0-win-x64.exe" -o "aspnetcore-runtime.wxs" --> | ||
28 | <RemotePayload | ||
29 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" | ||
30 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" | ||
31 | Description="Microsoft ASP.NET Core 3.1.0 - Shared Framework" | ||
32 | Hash="2DFD4F9EA2E174A7199C40ED3A826886F1E19EF8" | ||
33 | ProductName="Microsoft ASP.NET Core 3.1.0 - Shared Framework" | ||
34 | Size="7811768" | ||
35 | Version="3.1.0.19566" /> | ||
36 | </ExePackage> | ||
37 | </PackageGroup> | ||
38 | </Fragment> | ||
39 | |||
40 | <Fragment> | ||
41 | <Variable Name="WindowsDesktopRuntime31InstallDir" Value="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App\3.1.0" /> | ||
42 | <util:DirectorySearch Id="WindowsDesktopRuntime31Installed" Path="[WindowsDesktopRuntime31InstallDir]" Variable="WindowsDesktopRuntime31Installed" Result="exists" /> | ||
43 | |||
44 | <WixVariable Id="WindowsDesktopRuntime31WebDetectCondition" Value="WindowsDesktopRuntime31Installed" Overridable="yes" /> | ||
45 | <WixVariable Id="WindowsDesktopRuntime31WebInstallCondition" Value="" Overridable="yes" /> | ||
46 | |||
47 | <PackageGroup Id="WindowsDesktopRuntime31Web"> | ||
48 | <ExePackage | ||
49 | Name="windowsdesktop-runtime-3.1.0-win-x64.exe" | ||
50 | InstallCommand="/install /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
51 | RepairCommand="/repair /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
52 | UninstallCommand="/uninstall /quiet /norestart /log "[WindowsDesktopRuntime31Log]"" | ||
53 | PerMachine="yes" | ||
54 | DetectCondition="!(wix.WindowsDesktopRuntime31WebDetectCondition)" | ||
55 | InstallCondition="!(wix.WindowsDesktopRuntime31WebInstallCondition)" | ||
56 | Vital="yes" | ||
57 | Permanent="yes" | ||
58 | 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" | ||
60 | LogPathVariable="WindowsDesktopRuntime31Log" | ||
61 | Compressed="no"> | ||
62 | <!-- heat.exe payload "windowsdesktop-runtime-3.1.0-win-x64.exe" -o "windowsdesktop-runtime.wxs" --> | ||
63 | <RemotePayload | ||
64 | CertificatePublicKey="6608A9DBA86701156A4C17CE63BA99BE8B932F8D" | ||
65 | CertificateThumbprint="62009AAABDAE749FD47D19150958329BF6FF4B34" | ||
66 | Description="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" | ||
67 | Hash="C16F271754879BA78868947486F37871C9F0E40F" | ||
68 | ProductName="Microsoft Windows Desktop Runtime - 3.1.0 (x64)" | ||
69 | Size="54443856" | ||
70 | Version="3.1.0.28315" /> | ||
71 | </ExePackage> | ||
72 | </PackageGroup> | ||
73 | </Fragment> | ||
74 | </Wix> | ||
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj index e9b95422..a9df9790 100644 --- a/src/wixlib/netfx.wixproj +++ b/src/wixlib/netfx.wixproj | |||
@@ -27,6 +27,10 @@ | |||
27 | <Compile Include="NetFx461.wxs" /> | 27 | <Compile Include="NetFx461.wxs" /> |
28 | <Compile Include="NetFx462.wxs" /> | 28 | <Compile Include="NetFx462.wxs" /> |
29 | <Compile Include="NetFxExtension_x86.wxs" /> | 29 | <Compile Include="NetFxExtension_x86.wxs" /> |
30 | <Compile Include="NetCore3.1.wxs" /> | ||
31 | <Compile Include="NetCore3.1.1.wxs" /> | ||
32 | <Compile Include="NetCore3.1.2.wxs" /> | ||
33 | <Compile Include="NetCore3.1.3.wxs" /> | ||
30 | </ItemGroup> | 34 | </ItemGroup> |
31 | <ItemGroup> | 35 | <ItemGroup> |
32 | <None Include="packages.config" /> | 36 | <None Include="packages.config" /> |