diff options
Diffstat (limited to 'src/wixlib/NetFx48.wxs')
-rw-r--r-- | src/wixlib/NetFx48.wxs | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs index 9a5dd8bf..1945e139 100644 --- a/src/wixlib/NetFx48.wxs +++ b/src/wixlib/NetFx48.wxs | |||
@@ -33,9 +33,9 @@ | |||
33 | 33 | ||
34 | <PackageGroup Id="$(var.NetFx48WebId)"> | 34 | <PackageGroup Id="$(var.NetFx48WebId)"> |
35 | <ExePackage | 35 | <ExePackage |
36 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | 36 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" |
37 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | 37 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" |
38 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" | 38 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48WebLog].html"" |
39 | PerMachine="yes" | 39 | PerMachine="yes" |
40 | DetectCondition="!(wix.NetFx48WebDetectCondition)" | 40 | DetectCondition="!(wix.NetFx48WebDetectCondition)" |
41 | InstallCondition="!(wix.NetFx48WebInstallCondition)" | 41 | InstallCondition="!(wix.NetFx48WebInstallCondition)" |
@@ -48,8 +48,6 @@ | |||
48 | Compressed="no" | 48 | Compressed="no" |
49 | Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> | 49 | Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> |
50 | <RemotePayload | 50 | <RemotePayload |
51 | CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" | ||
52 | CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" | ||
53 | Description="Microsoft .NET Framework 4.8 Setup" | 51 | Description="Microsoft .NET Framework 4.8 Setup" |
54 | Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" | 52 | Hash="5A84A8E612E270E27D0061D58DB6B470153BE1F9" |
55 | ProductName="Microsoft .NET Framework 4.8" | 53 | ProductName="Microsoft .NET Framework 4.8" |
@@ -76,9 +74,9 @@ | |||
76 | 74 | ||
77 | <PackageGroup Id="$(var.NetFx48RedistId)"> | 75 | <PackageGroup Id="$(var.NetFx48RedistId)"> |
78 | <ExePackage | 76 | <ExePackage |
79 | InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | 77 | InstallArguments="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" |
80 | RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | 78 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" |
81 | UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" | 79 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48RedistLog].html"" |
82 | PerMachine="yes" | 80 | PerMachine="yes" |
83 | DetectCondition="!(wix.NetFx48RedistDetectCondition)" | 81 | DetectCondition="!(wix.NetFx48RedistDetectCondition)" |
84 | InstallCondition="!(wix.NetFx48RedistInstallCondition)" | 82 | InstallCondition="!(wix.NetFx48RedistInstallCondition)" |
@@ -91,8 +89,6 @@ | |||
91 | Compressed="no" | 89 | Compressed="no" |
92 | Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> | 90 | Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> |
93 | <RemotePayload | 91 | <RemotePayload |
94 | CertificatePublicKey="D17AFCE951979605250FAEBAFA7AE974899AED22" | ||
95 | CertificateThumbprint="C82273A065EC470FB1EBDE846A91E6FFB29E9C12" | ||
96 | Description="Microsoft .NET Framework 4.8 Setup" | 92 | Description="Microsoft .NET Framework 4.8 Setup" |
97 | Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" | 93 | Hash="8DD233698D5EB4609B86C2AC917279FE39E0EF4C" |
98 | ProductName="Microsoft .NET Framework 4.8" | 94 | ProductName="Microsoft .NET Framework 4.8" |