diff options
Diffstat (limited to 'src/wixlib/NetFx462.wxs')
-rw-r--r-- | src/wixlib/NetFx462.wxs | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/src/wixlib/NetFx462.wxs b/src/wixlib/NetFx462.wxs index c80e7c27..22cb70c9 100644 --- a/src/wixlib/NetFx462.wxs +++ b/src/wixlib/NetFx462.wxs | |||
@@ -14,9 +14,9 @@ | |||
14 | --> | 14 | --> |
15 | 15 | ||
16 | <?define NetFx462MinRelease = 394802 ?> | 16 | <?define NetFx462MinRelease = 394802 ?> |
17 | <?define NetFx462WebLink = http://go.microsoft.com/fwlink/?LinkId=780596 ?> | 17 | <?define NetFx462WebLink = https://go.microsoft.com/fwlink/?LinkId=780596 ?> |
18 | <?define NetFx462RedistLink = http://go.microsoft.com/fwlink/?LinkId=780600 ?> | 18 | <?define NetFx462RedistLink = https://go.microsoft.com/fwlink/?LinkId=780600 ?> |
19 | <?define NetFx462EulaLink = http://referencesource.microsoft.com/license.html ?> | 19 | <?define NetFx462EulaLink = https://referencesource.microsoft.com/license.html ?> |
20 | <?define NetFx462WebId = NetFx462Web ?> | 20 | <?define NetFx462WebId = NetFx462Web ?> |
21 | <?define NetFx462RedistId = NetFx462Redist ?> | 21 | <?define NetFx462RedistId = NetFx462Redist ?> |
22 | 22 | ||
@@ -35,9 +35,8 @@ | |||
35 | 35 | ||
36 | <PackageGroup Id="$(var.NetFx462WebId)"> | 36 | <PackageGroup Id="$(var.NetFx462WebId)"> |
37 | <ExePackage | 37 | <ExePackage |
38 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 38 | InstallArguments="/q /norestart /log "[NetFx462FullLog].html"" |
39 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 39 | UninstallArguments="/uninstall /q /norestart /log "[NetFx462FullLog].html"" |
40 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | ||
41 | PerMachine="yes" | 40 | PerMachine="yes" |
42 | DetectCondition="!(wix.NetFx462WebDetectCondition)" | 41 | DetectCondition="!(wix.NetFx462WebDetectCondition)" |
43 | InstallCondition="!(wix.NetFx462WebInstallCondition)" | 42 | InstallCondition="!(wix.NetFx462WebInstallCondition)" |
@@ -45,13 +44,12 @@ | |||
45 | Vital="yes" | 44 | Vital="yes" |
46 | Permanent="yes" | 45 | Permanent="yes" |
47 | Protocol="netfx4" | 46 | Protocol="netfx4" |
47 | LogPathVariable="NetFx462FullLog"> | ||
48 | <ExePackagePayload | ||
49 | Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe" | ||
48 | DownloadUrl="$(var.NetFx462WebLink)" | 50 | DownloadUrl="$(var.NetFx462WebLink)" |
49 | LogPathVariable="NetFx462FullLog" | ||
50 | Compressed="no" | ||
51 | Name="!(wix.NetFx462WebPackageDirectory)NDP462-KB3151802-Web.exe"> | ||
52 | <RemotePayload | ||
53 | Description="Microsoft .NET Framework 4.6.2 Setup" | 51 | Description="Microsoft .NET Framework 4.6.2 Setup" |
54 | Hash="C42E6ED280290648BBD59F664008852F4CFE4548" | 52 | Hash="31D7081BFFEEB5F32457096E51A29236306E5D971DE7EDB80A51188BCCDA9B9F17F0C3593D30828FC140B7A023F5B6842BC922F2023C7B8EA3786C2DBEC40472" |
55 | ProductName="Microsoft .NET Framework 4.6.2" | 53 | ProductName="Microsoft .NET Framework 4.6.2" |
56 | Size="1429344" | 54 | Size="1429344" |
57 | Version="4.6.1590.0" /> | 55 | Version="4.6.1590.0" /> |
@@ -76,9 +74,8 @@ | |||
76 | 74 | ||
77 | <PackageGroup Id="$(var.NetFx462RedistId)"> | 75 | <PackageGroup Id="$(var.NetFx462RedistId)"> |
78 | <ExePackage | 76 | <ExePackage |
79 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 77 | InstallArguments="/q /norestart /log "[NetFx462FullLog].html"" |
80 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | 78 | UninstallArguments="/uninstall /q /norestart /log "[NetFx462FullLog].html"" |
81 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx462FullLog].html"" | ||
82 | PerMachine="yes" | 79 | PerMachine="yes" |
83 | DetectCondition="!(wix.NetFx462RedistDetectCondition)" | 80 | DetectCondition="!(wix.NetFx462RedistDetectCondition)" |
84 | InstallCondition="!(wix.NetFx462RedistInstallCondition)" | 81 | InstallCondition="!(wix.NetFx462RedistInstallCondition)" |
@@ -86,13 +83,12 @@ | |||
86 | Vital="yes" | 83 | Vital="yes" |
87 | Permanent="yes" | 84 | Permanent="yes" |
88 | Protocol="netfx4" | 85 | Protocol="netfx4" |
86 | LogPathVariable="NetFx462FullLog"> | ||
87 | <ExePackagePayload | ||
88 | Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe" | ||
89 | DownloadUrl="$(var.NetFx462RedistLink)" | 89 | DownloadUrl="$(var.NetFx462RedistLink)" |
90 | LogPathVariable="NetFx462FullLog" | ||
91 | Compressed="no" | ||
92 | Name="!(wix.NetFx462RedistPackageDirectory)NDP462-KB3151800-x86-x64-AllOS-ENU.exe"> | ||
93 | <RemotePayload | ||
94 | Description="Microsoft .NET Framework 4.6.2 Setup" | 90 | Description="Microsoft .NET Framework 4.6.2 Setup" |
95 | Hash="A70F856BDA33D45AD0A8AD035F73092441715431" | 91 | Hash="E183B33F93FD5F9AA93A1EC02103D2548CA22E3447EF2CEEDE89A5DEBEFC4F2C20990567EB17AFA412E0698D577ADDA373E433847EC8B79EC04BE3C86EDD9F0E" |
96 | ProductName="Microsoft .NET Framework 4.6.2" | 92 | ProductName="Microsoft .NET Framework 4.6.2" |
97 | Size="62008080" | 93 | Size="62008080" |
98 | Version="4.6.1590.0" /> | 94 | Version="4.6.1590.0" /> |