diff options
Diffstat (limited to 'src/wixlib/NetFx48.wxs')
| -rw-r--r-- | src/wixlib/NetFx48.wxs | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs index 1945e139..a48fe4cf 100644 --- a/src/wixlib/NetFx48.wxs +++ b/src/wixlib/NetFx48.wxs | |||
| @@ -33,9 +33,8 @@ | |||
| 33 | 33 | ||
| 34 | <PackageGroup Id="$(var.NetFx48WebId)"> | 34 | <PackageGroup Id="$(var.NetFx48WebId)"> |
| 35 | <ExePackage | 35 | <ExePackage |
| 36 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | 36 | InstallArguments="/q /norestart /log "[NetFx48WebLog].html"" |
| 37 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | 37 | UninstallArguments="/uninstall /q /norestart /log "[NetFx48WebLog].html"" |
| 38 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | ||
| 39 | PerMachine="yes" | 38 | PerMachine="yes" |
| 40 | DetectCondition="!(wix.NetFx48WebDetectCondition)" | 39 | DetectCondition="!(wix.NetFx48WebDetectCondition)" |
| 41 | InstallCondition="!(wix.NetFx48WebInstallCondition)" | 40 | InstallCondition="!(wix.NetFx48WebInstallCondition)" |
| @@ -43,13 +42,12 @@ | |||
| 43 | Vital="yes" | 42 | Vital="yes" |
| 44 | Permanent="yes" | 43 | Permanent="yes" |
| 45 | Protocol="netfx4" | 44 | Protocol="netfx4" |
| 46 | DownloadUrl="$(var.NetFx48WebLink)" | 45 | LogPathVariable="NetFx48WebLog"> |
| 47 | LogPathVariable="NetFx48WebLog" | 46 | <ExePackagePayload |
| 48 | Compressed="no" | 47 | Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe" |
| 49 | Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> | 48 | DownloadUrl="$(var.NetFx48WebLink)" |
| 50 | <RemotePayload | ||
| 51 | Description="Microsoft .NET Framework 4.8 Setup" | 49 | Description="Microsoft .NET Framework 4.8 Setup" |
| 52 | Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" | 50 | Hash="E18E3DB30A0AB2B51F34A9B7EBCEC0FD7B015F74B4525643C170FDE73EE94BA4092E3A82C98BCAE4AEBF48009BA8B6E7FA60B89AB917D8F28E74E84DB9D8CF21" |
| 53 | ProductName="Microsoft .NET Framework 4.8" | 51 | ProductName="Microsoft .NET Framework 4.8" |
| 54 | Size="1479400" | 52 | Size="1479400" |
| 55 | Version="4.8.3928.0" /> | 53 | Version="4.8.3928.0" /> |
| @@ -74,9 +72,8 @@ | |||
| 74 | 72 | ||
| 75 | <PackageGroup Id="$(var.NetFx48RedistId)"> | 73 | <PackageGroup Id="$(var.NetFx48RedistId)"> |
| 76 | <ExePackage | 74 | <ExePackage |
| 77 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | 75 | InstallArguments="/q /norestart /log "[NetFx48RedistLog].html"" |
| 78 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | 76 | UninstallArguments="/uninstall /q /norestart /log "[NetFx48RedistLog].html"" |
| 79 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | ||
| 80 | PerMachine="yes" | 77 | PerMachine="yes" |
| 81 | DetectCondition="!(wix.NetFx48RedistDetectCondition)" | 78 | DetectCondition="!(wix.NetFx48RedistDetectCondition)" |
| 82 | InstallCondition="!(wix.NetFx48RedistInstallCondition)" | 79 | InstallCondition="!(wix.NetFx48RedistInstallCondition)" |
| @@ -84,13 +81,12 @@ | |||
| 84 | Vital="yes" | 81 | Vital="yes" |
| 85 | Permanent="yes" | 82 | Permanent="yes" |
| 86 | Protocol="netfx4" | 83 | Protocol="netfx4" |
| 87 | DownloadUrl="$(var.NetFx48RedistLink)" | 84 | LogPathVariable="NetFx48RedistLog"> |
| 88 | LogPathVariable="NetFx48RedistLog" | 85 | <ExePackagePayload |
| 89 | Compressed="no" | 86 | Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe" |
| 90 | Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> | 87 | DownloadUrl="$(var.NetFx48RedistLink)" |
| 91 | <RemotePayload | ||
| 92 | Description="Microsoft .NET Framework 4.8 Setup" | 88 | Description="Microsoft .NET Framework 4.8 Setup" |
| 93 | Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" | 89 | Hash="B758812388CD1BE1E6994B58267088FE6C22961D875153CC8B924DFC590F681AF85D750AA412571745B3872CADA56E2A45C4328CFDC5EE8E201743830614609E" |
| 94 | ProductName="Microsoft .NET Framework 4.8" | 90 | ProductName="Microsoft .NET Framework 4.8" |
| 95 | Size="117380440" | 91 | Size="117380440" |
| 96 | Version="4.8.3928.0" /> | 92 | Version="4.8.3928.0" /> |