@joebigelow / wix / commits / a5fe70f7

Update dependencies and integrate changes. Remove unsupported versions of .NET Framework. Update to latest 3.1 .NET Core. Remove /ChainingPackage from .NET Framework args. Remove RepairArguments from .NET Framework packages. Make all package urls https.

Update dependencies and integrate changes. Remove unsupported versions of .NET Framework. Update to latest 3.1 .NET Core. Remove /ChainingPackage from .NET Framework args. Remove RepairArguments from .NET Framework packages. Make all package urls https. #3992, #4183, #5374, #5615, #5762

Sean Hall committed Mar 2, 2021 at 19:03 UTC a5fe70f726e8f428306ccba54037ce2ba055b1f8
18 files changed +160 -499
global.json
+1 -1
@@ -1,5 +1,5 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0189"
3 + "WixToolset.Sdk": "4.0.0-build-0193"
4 }
5 }
src/ca/netfxca.vcxproj
+2 -2
@@ -1,7 +1,7 @@
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 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
4 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
6 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32">
@@ -62,7 +62,7 @@
62 <PropertyGroup>
63 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
64 </PropertyGroup>
65 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />
65 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
66 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
67 </Target>
68 </Project>
\ No newline at end of file
src/ca/packages.config
+1 -1
@@ -1,5 +1,5 @@
1 <?xml version="1.0" encoding="utf-8"?>
2 <packages>
3 - <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
3 + <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
5 </packages>
\ No newline at end of file
src/wixlib/NetCore3.1.12_x64.wxs renamed
+32 -35
@@ -5,13 +5,13 @@
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x64?>
8 - <?define NetCoreIdVersion = 318?>
9 - <?define NetCoreVersion = 3.1.8?>
8 + <?define NetCoreIdVersion = 3112?>
9 + <?define NetCoreVersion = 3.1.12?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143792?>
13 - <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143950?>
14 - <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143846?>
12 + <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/20cf277c-2ccf-449f-a0b8-925ba0c175e7/aa50b052ceb8a8d36a5b4f9b8d0bd91c/aspnetcore-runtime-3.1.12-win-x64.exe?>
13 + <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/076a47e9-c65b-4b78-95a7-93eb988891a4/3574764590cfa650e0aa87c44d3fe384/windowsdesktop-runtime-3.1.12-win-x64.exe?>
14 + <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/2fdc3009-cf5c-4cf6-8f3b-a61e83200cbb/2c71ee04b48103a7464f4e28a8bf339b/dotnet-runtime-3.1.12-win-x64.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
@@ -23,7 +23,6 @@
23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage
26 - Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
26 InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
27 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
28 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
@@ -34,15 +33,15 @@
33 Vital="yes"
34 Permanent="yes"
35 Protocol="burn"
37 - DownloadUrl="$(var.AspNetCoreRedistLink)"
38 - LogPathVariable="$(var.AspNetCoreRedistLog)"
39 - Compressed="no">
40 - <RemotePayload
41 - Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
42 - Hash="61DC9EAA0C8968E48E13C5913ED202A2F8F94DBA"
43 - ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 - Size="7841880"
45 - Version="3.1.8.20421" />
36 + LogPathVariable="$(var.AspNetCoreRedistLog)">
37 + <ExePackagePayload
38 + Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
39 + DownloadUrl="$(var.AspNetCoreRedistLink)"
40 + Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
41 + Hash="5CE9839CAE90FB2936033431F2905E97C7DC080DC50108D58714939CCCC6A265694B8259A3BF742A68BF04D9CFFB0602B0306DD401C4CE644BDB96C7D1168E59"
42 + ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
43 + Size="7841808"
44 + Version="3.1.12.21070" />
45 </ExePackage>
46 </PackageGroup>
47 </Fragment>
@@ -57,7 +56,6 @@
56
57 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
58 <ExePackage
60 - Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
59 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
60 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
61 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
@@ -68,15 +66,15 @@
66 Vital="yes"
67 Permanent="yes"
68 Protocol="burn"
71 - DownloadUrl="$(var.DesktopNetCoreRedistLink)"
72 - LogPathVariable="$(var.DesktopNetCoreRedistLog)"
73 - Compressed="no">
74 - <RemotePayload
75 - Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
76 - Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
77 - ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
78 - Size="54253328"
79 - Version="3.1.8.29220" />
69 + LogPathVariable="$(var.DesktopNetCoreRedistLog)">
70 + <ExePackagePayload
71 + Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
72 + DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73 + Description="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
74 + Hash="CD69B8722B2FF175FADD6774AB6A97F89292FC57A15CEC95218E79FFF1E26F46A7EFFFB15CE0F6D22B83B991F7083BB5C04F5158F87D298EA0F204933F8ECD27"
75 + ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x64)"
76 + Size="54284816"
77 + Version="3.1.12.29719" />
78 </ExePackage>
79 </PackageGroup>
80 </Fragment>
@@ -91,7 +89,6 @@
89
90 <PackageGroup Id="$(var.DotNetCoreRedistId)">
91 <ExePackage
94 - Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
92 InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
93 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
94 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
@@ -102,15 +99,15 @@
99 Vital="yes"
100 Permanent="yes"
101 Protocol="burn"
105 - DownloadUrl="$(var.DotNetCoreRedistLink)"
106 - LogPathVariable="$(var.DotNetCoreRedistLog)"
107 - Compressed="no">
108 - <RemotePayload
109 - Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
110 - Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
111 - ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
112 - Size="26089480"
113 - Version="3.1.8.29220" />
102 + LogPathVariable="$(var.DotNetCoreRedistLog)">
103 + <ExePackagePayload
104 + Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105 + DownloadUrl="$(var.DotNetCoreRedistLink)"
106 + Description="Microsoft .NET Core Runtime - 3.1.12 (x64)"
107 + Hash="9B3F882AE5DFDC8B50D3CEC4F3292292D658B2FECB84B3F73426FB3C16E6FC6B8E7118EF559CFAE25ED7A2C175FA4D89E18986CA3C05D15F706524FBB667F702"
108 + ProductName="Microsoft .NET Core Runtime - 3.1.12 (x64)"
109 + Size="26090616"
110 + Version="3.1.12.29719" />
111 </ExePackage>
112 </PackageGroup>
113 </Fragment>
src/wixlib/NetCore3.1.12_x86.wxs renamed
+32 -35
@@ -5,13 +5,13 @@
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <?define NetCorePlatform = x86?>
8 - <?define NetCoreIdVersion = 318?>
9 - <?define NetCoreVersion = 3.1.8?>
8 + <?define NetCoreIdVersion = 3112?>
9 + <?define NetCoreVersion = 3.1.12?>
10 <?include NetCore3_Platform.wxi?>
11
12 - <?define AspNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143951?>
13 - <?define DesktopNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2143791?>
14 - <?define DotNetCoreRedistLink = https://go.microsoft.com/fwlink/?linkid=2144014?>
12 + <?define AspNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/55d6ff56-2725-4657-bffd-fdf35d6816fd/7431d1d3533f0b1ac97df734c45c33f2/aspnetcore-runtime-3.1.12-win-x86.exe?>
13 + <?define DesktopNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/5d89a010-88bf-4e4e-ac12-a07258ddbf5f/1ff5dfe312c5bd9760f3b500b1b37597/windowsdesktop-runtime-3.1.12-win-x86.exe?>
14 + <?define DotNetCoreRedistLink = https://download.visualstudio.microsoft.com/download/pr/cbdd1603-7fa9-4957-8869-94e24963ba6c/ca0b7d1be494882d5a7433accfa3c94c/dotnet-runtime-3.1.12-win-x86.exe?>
15
16 <Fragment>
17 <util:DirectorySearchRef Id="$(var.AspNetCoreId)" />
@@ -23,7 +23,6 @@
23
24 <PackageGroup Id="$(var.AspNetCoreRedistId)">
25 <ExePackage
26 - Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
26 InstallArguments="$(var.AspNetCoreRedistInstallArguments)"
27 RepairArguments="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
28 UninstallArguments="$(var.AspNetCoreRedistUninstallArguments)"
@@ -34,15 +33,15 @@
33 Vital="yes"
34 Permanent="yes"
35 Protocol="burn"
37 - DownloadUrl="$(var.AspNetCoreRedistLink)"
38 - LogPathVariable="$(var.AspNetCoreRedistLog)"
39 - Compressed="no">
40 - <RemotePayload
41 - Description="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
42 - Hash="39CAC2A47CB57594C6FC2ED693DF1A02064CBC8D"
43 - ProductName="Microsoft ASP.NET Core 3.1.8 - Shared Framework"
44 - Size="7160128"
45 - Version="3.1.8.20421" />
36 + LogPathVariable="$(var.AspNetCoreRedistLog)">
37 + <ExePackagePayload
38 + Name="!(wix.AspNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)aspnetcore-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
39 + DownloadUrl="$(var.AspNetCoreRedistLink)"
40 + Description="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
41 + Hash="03EE5F6D3B2AF8FFE2A5154BB05E50938E2D36E98D996D9E67A3C349DD0C8B3051D5A9628F48C51E006CEA0B1F4484B4BE51920FE5CA841060B0D2C6A12FD5D2"
42 + ProductName="Microsoft ASP.NET Core 3.1.12 - Shared Framework"
43 + Size="7841808"
44 + Version="3.1.12.21070" />
45 </ExePackage>
46 </PackageGroup>
47 </Fragment>
@@ -57,7 +56,6 @@
56
57 <PackageGroup Id="$(var.DesktopNetCoreRedistId)">
58 <ExePackage
60 - Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
59 InstallArguments="$(var.DesktopNetCoreRedistInstallArguments)"
60 RepairArguments="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
61 UninstallArguments="$(var.DesktopNetCoreRedistUninstallArguments)"
@@ -68,15 +66,15 @@
66 Vital="yes"
67 Permanent="yes"
68 Protocol="burn"
71 - DownloadUrl="$(var.DesktopNetCoreRedistLink)"
72 - LogPathVariable="$(var.DesktopNetCoreRedistLog)"
73 - Compressed="no">
74 - <RemotePayload
75 - Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
76 - Hash="6105823D7417C265929DF2978A7214E7394E404F"
77 - ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
78 - Size="48377976"
79 - Version="3.1.8.29220" />
69 + LogPathVariable="$(var.DesktopNetCoreRedistLog)">
70 + <ExePackagePayload
71 + Name="!(wix.DesktopNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)windowsdesktop-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
72 + DownloadUrl="$(var.DesktopNetCoreRedistLink)"
73 + Description="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
74 + Hash="C211A7F29D9B6FEEFCF0379B153FFBFB815157D3D494CFD7D0D84D619701EEA284BF12502094BCFF2BB2968213190454E7CE0E865FD623E78C2FCDAEBEF963DA"
75 + ProductName="Microsoft Windows Desktop Runtime - 3.1.12 (x86)"
76 + Size="48590696"
77 + Version="3.1.12.29719" />
78 </ExePackage>
79 </PackageGroup>
80 </Fragment>
@@ -91,7 +89,6 @@
89
90 <PackageGroup Id="$(var.DotNetCoreRedistId)">
91 <ExePackage
94 - Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
92 InstallArguments="$(var.DotNetCoreRedistInstallArguments)"
93 RepairArguments="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)RepairArguments)"
94 UninstallArguments="$(var.DotNetCoreRedistUninstallArguments)"
@@ -102,15 +99,15 @@
99 Vital="yes"
100 Permanent="yes"
101 Protocol="burn"
105 - DownloadUrl="$(var.DotNetCoreRedistLink)"
106 - LogPathVariable="$(var.DotNetCoreRedistLog)"
107 - Compressed="no">
108 - <RemotePayload
109 - Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
110 - Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
111 - ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
112 - Size="23183576"
113 - Version="3.1.8.29220" />
102 + LogPathVariable="$(var.DotNetCoreRedistLog)">
103 + <ExePackagePayload
104 + Name="!(wix.DotNetCoreRuntime$(var.NetCoreIdVersion)Redist$(var.NetCorePlatform)PackageDirectory)dotnet-runtime-$(var.NetCoreVersion)-win-$(var.NetCorePlatform).exe"
105 + DownloadUrl="$(var.DotNetCoreRedistLink)"
106 + Description="Microsoft .NET Core Runtime - 3.1.12 (x86)"
107 + Hash="BA18F9028B19630D91017BEACCD8D79388125C228A83B5A62306108F3BB283617A7ED9B98785BC73192EC00E5D186DA767E940DCAB388699FAF274E437D0C16F"
108 + ProductName="Microsoft .NET Core Runtime - 3.1.12 (x86)"
109 + Size="23392184"
110 + Version="3.1.12.29719" />
111 </ExePackage>
112 </PackageGroup>
113 </Fragment>
src/wixlib/NetCore3.1_x64.wxs
+3 -3
@@ -6,19 +6,19 @@
6
7 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x64">
9 - <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
9 + <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x64" />
10 </PackageGroup>
11 </Fragment>
12
13 <Fragment>
14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x64">
15 - <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
15 + <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x64" />
16 </PackageGroup>
17 </Fragment>
18
19 <Fragment>
20 <PackageGroup Id="DotNetCoreRuntime31Redist_x64">
21 - <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
21 + <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x64" />
22 </PackageGroup>
23 </Fragment>
24 </Wix>
src/wixlib/NetCore3.1_x86.wxs
+3 -3
@@ -6,19 +6,19 @@
6
7 <Fragment>
8 <PackageGroup Id="AspNetCoreRuntime31Redist_x86">
9 - <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
9 + <PackageGroupRef Id="AspNetCoreRuntime3112Redist_x86" />
10 </PackageGroup>
11 </Fragment>
12
13 <Fragment>
14 <PackageGroup Id="DesktopNetCoreRuntime31Redist_x86">
15 - <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
15 + <PackageGroupRef Id="DesktopNetCoreRuntime3112Redist_x86" />
16 </PackageGroup>
17 </Fragment>
18
19 <Fragment>
20 <PackageGroup Id="DotNetCoreRuntime31Redist_x86">
21 - <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
21 + <PackageGroupRef Id="DotNetCoreRuntime3112Redist_x86" />
22 </PackageGroup>
23 </Fragment>
24 </Wix>
src/wixlib/NetFx4.5.wxs
-83
@@ -3,7 +3,6 @@
3
4
5 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6 - xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8 <!--
@@ -36,88 +35,6 @@
35 Value="Release"
36 Result="value" />
37 </Fragment>
39 -
40 - <Fragment>
41 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
42 -
43 - <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
44 - <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" />
45 - <WixVariable Id="NetFx45WebPackageDirectory" Value="redist\" Overridable="yes" />
46 -
47 - <PackageGroup Id="$(var.NetFx45WebId)">
48 - <ExePackage
49 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
50 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
51 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullWebLog].html&quot;"
52 - PerMachine="yes"
53 - DetectCondition="!(wix.NetFx45WebDetectCondition)"
54 - InstallCondition="!(wix.NetFx45WebInstallCondition)"
55 - Id="$(var.NetFx45WebId)"
56 - Vital="yes"
57 - Permanent="yes"
58 - Protocol="netfx4"
59 - DownloadUrl="$(var.NetFx45WebLink)"
60 - LogPathVariable="NetFx45FullWebLog"
61 - Compressed="no"
62 - Name="!(wix.NetFx45WebPackageDirectory)dotNetFx45_Full_setup.exe">
63 - <RemotePayload
64 - Size="1005568"
65 - Version="4.5.50709.17929"
66 - ProductName="Microsoft .NET Framework 4.5"
67 - Description="Microsoft .NET Framework 4.5 Setup"
68 - Hash="F6BA6F03C65C3996A258F58324A917463B2D6FF4"/>
69 - </ExePackage>
70 - </PackageGroup>
71 - </Fragment>
72 -
73 - <Fragment>
74 - <PackageGroup Id="$(var.NetFx45WebId)AsPrereq">
75 - <PackageGroupRef Id="$(var.NetFx45WebId)" />
76 - </PackageGroup>
77 -
78 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45WebId)" LicenseUrl="$(var.NetFx45EulaLink)" />
79 - </Fragment>
80 -
81 - <Fragment>
82 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
83 -
84 - <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx45MinRelease)" Overridable="yes" />
85 - <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" />
86 - <WixVariable Id="NetFx45RedistPackageDirectory" Value="redist\" Overridable="yes" />
87 -
88 - <PackageGroup Id="$(var.NetFx45RedistId)">
89 - <ExePackage
90 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
91 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
92 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx45FullLog].html&quot;"
93 - PerMachine="yes"
94 - DetectCondition="!(wix.NetFx45RedistDetectCondition)"
95 - InstallCondition="!(wix.NetFx45RedistInstallCondition)"
96 - Id="$(var.NetFx45RedistId)"
97 - Vital="yes"
98 - Permanent="yes"
99 - Protocol="netfx4"
100 - DownloadUrl="$(var.NetFx45RedistLink)"
101 - LogPathVariable="NetFx45FullLog"
102 - Compressed="no"
103 - Name="!(wix.NetFx45RedistPackageDirectory)dotNetFx45_Full_x86_x64.exe">
104 - <RemotePayload
105 - Size="50352408"
106 - Version="4.5.50709.17929"
107 - ProductName="Microsoft .NET Framework 4.5"
108 - Description="Microsoft .NET Framework 4.5 Setup"
109 - Hash="B2FF712CA0947040CA0B8E9BD7436A3C3524BB5D"/>
110 - </ExePackage>
111 - </PackageGroup>
112 - </Fragment>
113 -
114 - <Fragment>
115 - <PackageGroup Id="$(var.NetFx45RedistId)AsPrereq">
116 - <PackageGroupRef Id="$(var.NetFx45RedistId)" />
117 - </PackageGroup>
118 -
119 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx45RedistId)" LicenseUrl="$(var.NetFx45EulaLink)" />
120 - </Fragment>
38
39 <!-- set to Release number of the .NET Framework 4.5 if installed (not set otherwise) -->
40 <Fragment>
src/wixlib/NetFx4.wxs
-141
@@ -3,7 +3,6 @@
3
4
5 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6 - xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8 <!--
@@ -40,76 +39,6 @@
39 Result="value" />
40 </Fragment>
41
43 - <Fragment>
44 - <util:RegistrySearchRef Id="NETFRAMEWORK40" />
45 -
46 - <PackageGroup Id="$(var.NetFx40WebId)">
47 - <ExePackage
48 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
49 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
50 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
51 - PerMachine="yes"
52 - DetectCondition="NETFRAMEWORK40"
53 - Id="$(var.NetFx40WebId)"
54 - Vital="yes"
55 - Permanent="yes"
56 - Protocol="netfx4"
57 - DownloadUrl="$(var.NetFx40WebLink)"
58 - Compressed="no"
59 - Name="redist\dotNetFx40_Full_setup.exe">
60 - <RemotePayload
61 - Size="889416"
62 - Version="4.0.30319.1"
63 - ProductName="Microsoft .NET Framework 4"
64 - Description="Microsoft .NET Framework 4 Setup"
65 - Hash="06BECADB92A5FCCA2529C0B93687C2A0C6D0D610"/>
66 - </ExePackage>
67 - </PackageGroup>
68 - </Fragment>
69 -
70 - <Fragment>
71 - <PackageGroup Id="$(var.NetFx40WebId)AsPrereq">
72 - <PackageGroupRef Id="$(var.NetFx40WebId)" />
73 - </PackageGroup>
74 -
75 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40WebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
76 - </Fragment>
77 -
78 - <Fragment>
79 - <util:RegistrySearchRef Id="NETFRAMEWORK40" />
80 -
81 - <PackageGroup Id="$(var.NetFx40RedistId)">
82 - <ExePackage
83 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
84 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
85 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
86 - PerMachine="yes"
87 - DetectCondition="NETFRAMEWORK40"
88 - Id="$(var.NetFx40RedistId)"
89 - Vital="yes"
90 - Permanent="yes"
91 - Protocol="netfx4"
92 - DownloadUrl="$(var.NetFx40RedistLink)"
93 - Compressed="no"
94 - Name="redist\dotNetFx40_Full_x86_x64.exe">
95 - <RemotePayload
96 - Size="50449456"
97 - Version="4.0.30319.1"
98 - ProductName="Microsoft .NET Framework 4"
99 - Description="Microsoft .NET Framework 4 Setup"
100 - Hash="58DA3D74DB353AAD03588CBB5CEA8234166D8B99"/>
101 - </ExePackage>
102 - </PackageGroup>
103 - </Fragment>
104 -
105 - <Fragment>
106 - <PackageGroup Id="$(var.NetFx40RedistId)AsPrereq">
107 - <PackageGroupRef Id="$(var.NetFx40RedistId)" />
108 - </PackageGroup>
109 -
110 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40RedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
111 - </Fragment>
112 -
42 <Fragment>
43 <util:RegistrySearch
44 Id="NETFRAMEWORK40CLIENT"
@@ -120,76 +49,6 @@
49 Result="value" />
50 </Fragment>
51
123 - <Fragment>
124 - <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
125 -
126 - <PackageGroup Id="$(var.NetFx40ClientWebId)">
127 - <ExePackage
128 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
129 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
130 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
131 - PerMachine="yes"
132 - DetectCondition="NETFRAMEWORK40CLIENT"
133 - Id="$(var.NetFx40ClientWebId)"
134 - Vital="yes"
135 - Permanent="yes"
136 - Protocol="netfx4"
137 - DownloadUrl="$(var.NetFx40ClientWebLink)"
138 - Compressed="no"
139 - Name="redist\dotNetFx40_Client_setup.exe">
140 - <RemotePayload
141 - Size="887896"
142 - Version="4.0.30319.1"
143 - ProductName="Microsoft .NET Framework 4 Client Profile"
144 - Description="Microsoft .NET Framework 4 Client Profile Setup"
145 - Hash="E15AD80FC74277EF2048312E9A71AF56B2EBA622"/>
146 - </ExePackage>
147 - </PackageGroup>
148 - </Fragment>
149 -
150 - <Fragment>
151 - <PackageGroup Id="$(var.NetFx40ClientWebId)AsPrereq">
152 - <PackageGroupRef Id="$(var.NetFx40ClientWebId)" />
153 - </PackageGroup>
154 -
155 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientWebId)" LicenseUrl="$(var.NetFx40EulaLink)" />
156 - </Fragment>
157 -
158 - <Fragment>
159 - <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" />
160 -
161 - <PackageGroup Id="$(var.NetFx40ClientRedistId)">
162 - <ExePackage
163 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
164 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot;"
165 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot;"
166 - PerMachine="yes"
167 - DetectCondition="NETFRAMEWORK40CLIENT"
168 - Id="$(var.NetFx40ClientRedistId)"
169 - Vital="yes"
170 - Permanent="yes"
171 - Protocol="netfx4"
172 - DownloadUrl="$(var.NetFx40ClientRedistLink)"
173 - Compressed="no"
174 - Name="redist\dotNetFx40_Client_x86_x64.exe">
175 - <RemotePayload
176 - Size="43000680"
177 - Version="4.0.30319.1"
178 - ProductName="Microsoft .NET Framework 4 Client Profile"
179 - Description="Microsoft .NET Framework 4 Client Profile Setup"
180 - Hash="4CD67F609F89D617D2B206341B8C211E1B88B287"/>
181 - </ExePackage>
182 - </PackageGroup>
183 - </Fragment>
184 -
185 - <Fragment>
186 - <PackageGroup Id="$(var.NetFx40ClientRedistId)AsPrereq">
187 - <PackageGroupRef Id="$(var.NetFx40ClientRedistId)" />
188 - </PackageGroup>
189 -
190 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx40ClientRedistId)" LicenseUrl="$(var.NetFx40EulaLink)" />
191 - </Fragment>
192 -
52 <!-- set to #1 if the .NET Framework 4.0 client is installed (not set otherwise) -->
53 <Fragment>
54 <Property Id="NETFRAMEWORK40CLIENT" Secure="yes">
src/wixlib/NetFx451.wxs
-83
@@ -3,7 +3,6 @@
3
4
5 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
6 - xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
6 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
7
8 <!--
@@ -26,86 +25,4 @@
25 <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" />
26 <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx451MinRelease)&quot;" />
27 </Fragment>
29 -
30 - <Fragment>
31 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
32 -
33 - <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
34 - <WixVariable Id="NetFx451WebInstallCondition" Value="" Overridable="yes" />
35 - <WixVariable Id="NetFx451WebPackageDirectory" Value="redist\" Overridable="yes" />
36 -
37 - <PackageGroup Id="$(var.NetFx451WebId)">
38 - <ExePackage
39 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
40 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
41 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullWebLog].html&quot;"
42 - PerMachine="yes"
43 - DetectCondition="!(wix.NetFx451WebDetectCondition)"
44 - InstallCondition="!(wix.NetFx451WebInstallCondition)"
45 - Id="$(var.NetFx451WebId)"
46 - Vital="yes"
47 - Permanent="yes"
48 - Protocol="netfx4"
49 - DownloadUrl="$(var.NetFx451WebLink)"
50 - LogPathVariable="NetFx451FullWebLog"
51 - Compressed="no"
52 - Name="!(wix.NetFx451WebPackageDirectory)NDP451-KB2859818-Web.exe">
53 - <RemotePayload
54 - Size="1021432"
55 - Version="4.5.50938.18408"
56 - ProductName="Microsoft .NET Framework 4.5.1"
57 - Description="Microsoft .NET Framework 4.5.1 Setup"
58 - Hash="4CBEA1E408DB5B423E130931B9478972E6798431" />
59 - </ExePackage>
60 - </PackageGroup>
61 - </Fragment>
62 -
63 - <Fragment>
64 - <PackageGroup Id="$(var.NetFx451WebId)AsPrereq">
65 - <PackageGroupRef Id="$(var.NetFx451WebId)" />
66 - </PackageGroup>
67 -
68 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451WebId)" LicenseUrl="$(var.NetFx451EulaLink)" />
69 - </Fragment>
70 -
71 - <Fragment>
72 - <util:RegistrySearchRef Id="NETFRAMEWORK45" />
73 -
74 - <WixVariable Id="NetFx451RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx451MinRelease)" Overridable="yes" />
75 - <WixVariable Id="NetFx451RedistInstallCondition" Value="" Overridable="yes" />
76 - <WixVariable Id="NetFx451RedistPackageDirectory" Value="redist\" Overridable="yes" />
77 -
78 - <PackageGroup Id="$(var.NetFx451RedistId)">
79 - <ExePackage
80 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
81 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
82 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx451FullLog].html&quot;"
83 - PerMachine="yes"
84 - DetectCondition="!(wix.NetFx451RedistDetectCondition)"
85 - InstallCondition="!(wix.NetFx451RedistInstallCondition)"
86 - Id="$(var.NetFx451RedistId)"
87 - Vital="yes"
88 - Permanent="yes"
89 - Protocol="netfx4"
90 - DownloadUrl="$(var.NetFx451RedistLink)"
91 - LogPathVariable="NetFx451FullLog"
92 - Compressed="no"
93 - Name="!(wix.NetFx451RedistPackageDirectory)NDP451-KB2858728-x86-x64-AllOS-ENU.exe">
94 - <RemotePayload
95 - Size="70087104"
96 - Version="4.5.50938.18408"
97 - ProductName="Microsoft .NET Framework 4.5.1"
98 - Description="Microsoft .NET Framework 4.5.1 Setup"
99 - Hash="5934DD101414BBC0B7F1EE2780D2FC8B9BEC5C4D" />
100 - </ExePackage>
101 - </PackageGroup>
102 - </Fragment>
103 -
104 - <Fragment>
105 - <PackageGroup Id="$(var.NetFx451RedistId)AsPrereq">
106 - <PackageGroupRef Id="$(var.NetFx451RedistId)" />
107 - </PackageGroup>
108 -
109 - <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx451RedistId)" LicenseUrl="$(var.NetFx451EulaLink)" />
110 - </Fragment>
28 </Wix>
src/wixlib/NetFx452.wxs
+15 -19
@@ -14,9 +14,9 @@
14 -->
15
16 <?define NetFx452MinRelease = 379893 ?>
17 - <?define NetFx452WebLink = http://go.microsoft.com/fwlink/?LinkId=397707 ?>
18 - <?define NetFx452RedistLink = http://go.microsoft.com/fwlink/?LinkId=397708 ?>
19 - <?define NetFx452EulaLink = http://wixtoolset.org/licenses/netfx452 ?>
17 + <?define NetFx452WebLink = https://go.microsoft.com/fwlink/?LinkId=397707 ?>
18 + <?define NetFx452RedistLink = https://go.microsoft.com/fwlink/?LinkId=397708 ?>
19 + <?define NetFx452EulaLink = https://wixtoolset.org/licenses/netfx452 ?>
20 <?define NetFx452WebId = NetFx452Web ?>
21 <?define NetFx452RedistId = NetFx452Redist ?>
22
@@ -35,9 +35,8 @@
35
36 <PackageGroup Id="$(var.NetFx452WebId)">
37 <ExePackage
38 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
39 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
40 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullWebLog].html&quot;"
38 + InstallArguments="/q /norestart /log &quot;[NetFx452FullWebLog].html&quot;"
39 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullWebLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx452WebDetectCondition)"
42 InstallCondition="!(wix.NetFx452WebInstallCondition)"
@@ -45,13 +44,12 @@
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 + LogPathVariable="NetFx452FullWebLog">
48 + <ExePackagePayload
49 + Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe"
50 DownloadUrl="$(var.NetFx452WebLink)"
49 - LogPathVariable="NetFx452FullWebLog"
50 - Compressed="no"
51 - Name="!(wix.NetFx452WebPackageDirectory)NDP452-KB2901954-Web.exe">
52 - <RemotePayload
51 Description="Microsoft .NET Framework 4.5.2 Setup"
54 - Hash="5B71B20A455F6EEAB79DD1EDCAB0BA66AD0D2208"
52 + Hash="90A3A5A57EA8A6508EEE0D129303C7CB012AABF651DD9A6BEFC20DA3BBDB09FC47FD087645051D3D45BFF909DFC6E6039C22C4816FBC793A847E81701248639E"
53 ProductName="Microsoft .NET Framework 4.5.2"
54 Size="1118920"
55 Version="4.5.51209.34209" />
@@ -76,9 +74,8 @@
74
75 <PackageGroup Id="$(var.NetFx452RedistId)">
76 <ExePackage
79 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
80 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
81 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx452FullLog].html&quot;"
77 + InstallArguments="/q /norestart /log &quot;[NetFx452FullLog].html&quot;"
78 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx452FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx452RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx452RedistInstallCondition)"
@@ -86,13 +83,12 @@
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 + LogPathVariable="NetFx452FullLog">
87 + <ExePackagePayload
88 + Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx452RedistLink)"
90 - LogPathVariable="NetFx452FullLog"
91 - Compressed="no"
92 - Name="!(wix.NetFx452RedistPackageDirectory)NDP452-KB2901907-x86-x64-AllOS-ENU.exe">
93 - <RemotePayload
90 Description="Microsoft .NET Framework 4.5.2 Setup"
95 - Hash="89F86F9522DC7A8A965FACCE839ABB790A285A63"
91 + Hash="033D457229C4FE6EEA7B1E42A3A39DD4CF6A054C5E996CE036942DD2FE9623FD3A0634BE5DCB88506C1C61BF9FF6076F27B4ECEC38F8CF85603AF018111E584D"
92 ProductName="Microsoft .NET Framework 4.5.2"
93 Size="69999448"
94 Version="4.5.51209.34209" />
src/wixlib/NetFx46.wxs
+15 -19
@@ -15,9 +15,9 @@
15 -->
16
17 <?define NetFx46MinRelease = 393295 ?>
18 - <?define NetFx46WebLink = http://go.microsoft.com/fwlink/?LinkId=560371 ?>
19 - <?define NetFx46RedistLink = http://go.microsoft.com/fwlink/?LinkId=560369 ?>
20 - <?define NetFx46EulaLink = http://go.microsoft.com/fwlink/?LinkID=558772 ?>
18 + <?define NetFx46WebLink = https://go.microsoft.com/fwlink/?LinkId=560371 ?>
19 + <?define NetFx46RedistLink = https://go.microsoft.com/fwlink/?LinkId=560369 ?>
20 + <?define NetFx46EulaLink = https://go.microsoft.com/fwlink/?LinkID=558772 ?>
21 <?define NetFx46WebId = NetFx46Web ?>
22 <?define NetFx46RedistId = NetFx46Redist ?>
23
@@ -36,9 +36,8 @@
36
37 <PackageGroup Id="$(var.NetFx46WebId)">
38 <ExePackage
39 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
40 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
41 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
39 + InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;"
40 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
41 PerMachine="yes"
42 DetectCondition="!(wix.NetFx46WebDetectCondition)"
43 InstallCondition="!(wix.NetFx46WebInstallCondition)"
@@ -46,13 +45,12 @@
45 Vital="yes"
46 Permanent="yes"
47 Protocol="netfx4"
48 + LogPathVariable="NetFx46FullLog">
49 + <ExePackagePayload
50 + Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe"
51 DownloadUrl="$(var.NetFx46WebLink)"
50 - LogPathVariable="NetFx46FullLog"
51 - Compressed="no"
52 - Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe">
53 - <RemotePayload
52 Description="Microsoft .NET Framework 4.6 Setup"
55 - Hash="480CA134B9E3F2437DF10719D5A8C77DDEC0A4F1"
53 + Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205"
54 ProductName="Microsoft .NET Framework 4.6"
55 Size="1497400"
56 Version="4.6.81.0" />
@@ -77,9 +75,8 @@
75
76 <PackageGroup Id="$(var.NetFx46RedistId)">
77 <ExePackage
80 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
81 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
82 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx46FullLog].html&quot;"
78 + InstallArguments="/q /norestart /log &quot;[NetFx46FullLog].html&quot;"
79 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx46FullLog].html&quot;"
80 PerMachine="yes"
81 DetectCondition="!(wix.NetFx46RedistDetectCondition)"
82 InstallCondition="!(wix.NetFx46RedistInstallCondition)"
@@ -87,13 +84,12 @@
84 Vital="yes"
85 Permanent="yes"
86 Protocol="netfx4"
87 + LogPathVariable="NetFx46FullLog">
88 + <ExePackagePayload
89 + Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe"
90 DownloadUrl="$(var.NetFx46RedistLink)"
91 - LogPathVariable="NetFx46FullLog"
92 - Compressed="no"
93 - Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe">
94 - <RemotePayload
91 Description="Microsoft .NET Framework 4.6 Setup"
96 - Hash="3049A85843EAF65E89E2336D5FE6E85E416797BE"
92 + Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E"
93 ProductName="Microsoft .NET Framework 4.6"
94 Size="65444688"
95 Version="4.6.81.0" />
src/wixlib/NetFx461.wxs
+15 -19
@@ -14,9 +14,9 @@
14 -->
15
16 <?define NetFx461MinRelease = 394254 ?>
17 - <?define NetFx461WebLink = http://go.microsoft.com/fwlink/?LinkId=671728 ?>
18 - <?define NetFx461RedistLink = http://go.microsoft.com/fwlink/?LinkId=671743 ?>
19 - <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?>
17 + <?define NetFx461WebLink = https://go.microsoft.com/fwlink/?LinkId=671728 ?>
18 + <?define NetFx461RedistLink = https://go.microsoft.com/fwlink/?LinkId=671743 ?>
19 + <?define NetFx461EulaLink = https://referencesource.microsoft.com/license.html ?>
20 <?define NetFx461WebId = NetFx461Web ?>
21 <?define NetFx461RedistId = NetFx461Redist ?>
22
@@ -35,9 +35,8 @@
35
36 <PackageGroup Id="$(var.NetFx461WebId)">
37 <ExePackage
38 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
39 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
40 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
38 + InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;"
39 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx461WebDetectCondition)"
42 InstallCondition="!(wix.NetFx461WebInstallCondition)"
@@ -45,13 +44,12 @@
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 + LogPathVariable="NetFx461FullLog">
48 + <ExePackagePayload
49 + Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe"
50 DownloadUrl="$(var.NetFx461WebLink)"
49 - LogPathVariable="NetFx461FullLog"
50 - Compressed="no"
51 - Name="!(wix.NetFx461WebPackageDirectory)NDP461-KB3102438-Web.exe">
52 - <RemotePayload
51 Description="Microsoft .NET Framework 4.6.1 Setup"
54 - Hash="EE88B05232F43B517D4A368F7EE5065CDE7F67FA"
52 + Hash="97C4DD638E2E0324D60BDD1D7BE85603EDBF969898469A524FB271EBA5E22B78CA67DB1F568F5C45393381F1E76408C366AD4A68A7BB00E23D1FB820E67DE99E"
53 ProductName="Microsoft .NET Framework 4.6.1"
54 Size="1424328"
55 Version="4.6.1055.0" />
@@ -76,9 +74,8 @@
74
75 <PackageGroup Id="$(var.NetFx461RedistId)">
76 <ExePackage
79 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
80 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
81 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"
77 + InstallArguments="/q /norestart /log &quot;[NetFx461FullLog].html&quot;"
78 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx461FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx461RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx461RedistInstallCondition)"
@@ -86,13 +83,12 @@
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 + LogPathVariable="NetFx461FullLog">
87 + <ExePackagePayload
88 + Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx461RedistLink)"
90 - LogPathVariable="NetFx461FullLog"
91 - Compressed="no"
92 - Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe">
93 - <RemotePayload
90 Description="Microsoft .NET Framework 4.6.1 Setup"
95 - Hash="83D048D171FF44A3CAD9B422137656F585295866"
91 + Hash="43BEF5EB278CF0954EAE1A6FEEC5A9852B932270508DD10647B9EA32DFD3832ECB58172B28707216709705BF0013FCEBB0B39DB31E38786FC2DAE219622EA00F"
92 ProductName="Microsoft .NET Framework 4.6.1"
93 Size="67681000"
94 Version="4.6.1055.0" />
src/wixlib/NetFx462.wxs
+15 -19
@@ -14,9 +14,9 @@
14 -->
15
16 <?define NetFx462MinRelease = 394802 ?>
17 - <?define NetFx462WebLink = http://go.microsoft.com/fwlink/?LinkId=780596 ?>
18 - <?define NetFx462RedistLink = http://go.microsoft.com/fwlink/?LinkId=780600 ?>
19 - <?define NetFx462EulaLink = http://referencesource.microsoft.com/license.html ?>
17 + <?define NetFx462WebLink = https://go.microsoft.com/fwlink/?LinkId=780596 ?>
18 + <?define NetFx462RedistLink = https://go.microsoft.com/fwlink/?LinkId=780600 ?>
19 + <?define NetFx462EulaLink = https://referencesource.microsoft.com/license.html ?>
20 <?define NetFx462WebId = NetFx462Web ?>
21 <?define NetFx462RedistId = NetFx462Redist ?>
22
@@ -35,9 +35,8 @@
35
36 <PackageGroup Id="$(var.NetFx462WebId)">
37 <ExePackage
38 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
39 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
40 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
38 + InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;"
39 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
40 PerMachine="yes"
41 DetectCondition="!(wix.NetFx462WebDetectCondition)"
42 InstallCondition="!(wix.NetFx462WebInstallCondition)"
@@ -45,13 +44,12 @@
44 Vital="yes"
45 Permanent="yes"
46 Protocol="netfx4"
47 + LogPathVariable="NetFx462FullLog">
48 + <ExePackagePayload
49 + Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"
50 DownloadUrl="$(var.NetFx462WebLink)"
49 - LogPathVariable="NetFx462FullLog"
50 - Compressed="no"
51 - Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe">
52 - <RemotePayload
51 Description="Microsoft .NET Framework 4.6.2 Setup"
54 - Hash="C42E6ED280290648BBD59F664008852F4CFE4548"
52 + Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472"
53 ProductName="Microsoft .NET Framework 4.6.2"
54 Size="1429344"
55 Version="4.6.1590.0" />
@@ -76,9 +74,8 @@
74
75 <PackageGroup Id="$(var.NetFx462RedistId)">
76 <ExePackage
79 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
80 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
81 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx462FullLog].html&quot;"
77 + InstallArguments="/q /norestart /log &quot;[NetFx462FullLog].html&quot;"
78 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx462FullLog].html&quot;"
79 PerMachine="yes"
80 DetectCondition="!(wix.NetFx462RedistDetectCondition)"
81 InstallCondition="!(wix.NetFx462RedistInstallCondition)"
@@ -86,13 +83,12 @@
83 Vital="yes"
84 Permanent="yes"
85 Protocol="netfx4"
86 + LogPathVariable="NetFx462FullLog">
87 + <ExePackagePayload
88 + Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"
89 DownloadUrl="$(var.NetFx462RedistLink)"
90 - LogPathVariable="NetFx462FullLog"
91 - Compressed="no"
92 - Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe">
93 - <RemotePayload
90 Description="Microsoft .NET Framework 4.6.2 Setup"
95 - Hash="A70F856BDA33D45AD0A8AD035F73092441715431"
91 + Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E"
92 ProductName="Microsoft .NET Framework 4.6.2"
93 Size="62008080"
94 Version="4.6.1590.0" />
src/wixlib/NetFx47.wxs
-1
@@ -2,7 +2,6 @@
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"
5 - xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <!--
src/wixlib/NetFx471.wxs
-1
@@ -2,7 +2,6 @@
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"
5 - xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"
5 xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
6
7 <!--
src/wixlib/NetFx472.wxs
+12 -16
@@ -33,9 +33,8 @@
33
34 <PackageGroup Id="$(var.NetFx472WebId)">
35 <ExePackage
36 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
37 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
38 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472WebLog].html&quot;"
36 + InstallArguments="/q /norestart /log &quot;[NetFx472WebLog].html&quot;"
37 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472WebLog].html&quot;"
38 PerMachine="yes"
39 DetectCondition="!(wix.NetFx472WebDetectCondition)"
40 InstallCondition="!(wix.NetFx472WebInstallCondition)"
@@ -43,13 +42,12 @@
42 Vital="yes"
43 Permanent="yes"
44 Protocol="netfx4"
45 + LogPathVariable="NetFx472WebLog">
46 + <ExePackagePayload
47 + Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe"
48 DownloadUrl="$(var.NetFx472WebLink)"
47 - LogPathVariable="NetFx472WebLog"
48 - Compressed="no"
49 - Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
50 - <RemotePayload
49 Description="Microsoft .NET Framework 4.7.2 Setup"
52 - Hash="CEDBBF404B166A5E72D035760BCB0FA508E4F4CB"
50 + Hash="37006954E3AFE07FB02D24894CC34794618B78C27A1B514818985B6CC1FA3E896ED99BA2E4AAC3F6469D263819BD94EE70E7113946C51BA83C93B74826FC8FA8"
51 ProductName="Microsoft .NET Framework 4.7.2"
52 Size="1432848"
53 Version="4.7.3081.0" />
@@ -74,9 +72,8 @@
72
73 <PackageGroup Id="$(var.NetFx472RedistId)">
74 <ExePackage
77 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
78 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
79 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx472RedistLog].html&quot;"
75 + InstallArguments="/q /norestart /log &quot;[NetFx472RedistLog].html&quot;"
76 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx472RedistLog].html&quot;"
77 PerMachine="yes"
78 DetectCondition="!(wix.NetFx472RedistDetectCondition)"
79 InstallCondition="!(wix.NetFx472RedistInstallCondition)"
@@ -84,13 +81,12 @@
81 Vital="yes"
82 Permanent="yes"
83 Protocol="netfx4"
84 + LogPathVariable="NetFx472RedistLog">
85 + <ExePackagePayload
86 + Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe"
87 DownloadUrl="$(var.NetFx472RedistLink)"
88 - LogPathVariable="NetFx472RedistLog"
89 - Compressed="no"
90 - Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
91 - <RemotePayload
88 Description="Microsoft .NET Framework 4.7.2 Setup"
93 - Hash="31FC0D305A6F651C9E892C98EB10997AE885EB1E"
89 + Hash="36F295ED19A5BD5C5F05803BA26EFD17D419ABC7A791312AD011B63A4402492529AED0FB4D45FF1F74381079A310B33649C9C56C36E815B12E79ECD671897489"
90 ProductName="Microsoft .NET Framework 4.7.2"
91 Size="83943272"
92 Version="4.7.3081.0" />
src/wixlib/NetFx48.wxs
+14 -18
@@ -33,9 +33,8 @@
33
34 <PackageGroup Id="$(var.NetFx48WebId)">
35 <ExePackage
36 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
37 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
38 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48WebLog].html&quot;"
36 + InstallArguments="/q /norestart /log &quot;[NetFx48WebLog].html&quot;"
37 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48WebLog].html&quot;"
38 PerMachine="yes"
39 DetectCondition="!(wix.NetFx48WebDetectCondition)"
40 InstallCondition="!(wix.NetFx48WebInstallCondition)"
@@ -43,13 +42,12 @@
42 Vital="yes"
43 Permanent="yes"
44 Protocol="netfx4"
46 - DownloadUrl="$(var.NetFx48WebLink)"
47 - LogPathVariable="NetFx48WebLog"
48 - Compressed="no"
49 - Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
50 - <RemotePayload
45 + LogPathVariable="NetFx48WebLog">
46 + <ExePackagePayload
47 + Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"
48 + DownloadUrl="$(var.NetFx48WebLink)"
49 Description="Microsoft .NET Framework 4.8 Setup"
52 - Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9"
50 + Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21"
51 ProductName="Microsoft .NET Framework 4.8"
52 Size="1479400"
53 Version="4.8.3928.0" />
@@ -74,9 +72,8 @@
72
73 <PackageGroup Id="$(var.NetFx48RedistId)">
74 <ExePackage
77 - InstallArguments="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
78 - RepairArguments="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
79 - UninstallArguments="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48RedistLog].html&quot;"
75 + InstallArguments="/q /norestart /log &quot;[NetFx48RedistLog].html&quot;"
76 + UninstallArguments="/uninstall /q /norestart /log &quot;[NetFx48RedistLog].html&quot;"
77 PerMachine="yes"
78 DetectCondition="!(wix.NetFx48RedistDetectCondition)"
79 InstallCondition="!(wix.NetFx48RedistInstallCondition)"
@@ -84,13 +81,12 @@
81 Vital="yes"
82 Permanent="yes"
83 Protocol="netfx4"
87 - DownloadUrl="$(var.NetFx48RedistLink)"
88 - LogPathVariable="NetFx48RedistLog"
89 - Compressed="no"
90 - Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
91 - <RemotePayload
84 + LogPathVariable="NetFx48RedistLog">
85 + <ExePackagePayload
86 + Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"
87 + DownloadUrl="$(var.NetFx48RedistLink)"
88 Description="Microsoft .NET Framework 4.8 Setup"
93 - Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C"
89 + Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E"
90 ProductName="Microsoft .NET Framework 4.8"
91 Size="117380440"
92 Version="4.8.3928.0" />