diff options
Diffstat (limited to 'src/wixlib/NetFx451.wxs')
-rw-r--r-- | src/wixlib/NetFx451.wxs | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/src/wixlib/NetFx451.wxs b/src/wixlib/NetFx451.wxs index 266a744b..08a9b4f2 100644 --- a/src/wixlib/NetFx451.wxs +++ b/src/wixlib/NetFx451.wxs | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 5 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
6 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" | ||
7 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 6 | xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
8 | 7 | ||
9 | <!-- | 8 | <!-- |
@@ -26,86 +25,4 @@ | |||
26 | <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" /> | 25 | <Property Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Secure="yes" /> |
27 | <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx451MinRelease)"" /> | 26 | <SetProperty Id="WIX_IS_NETFRAMEWORK_451_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx451MinRelease)"" /> |
28 | </Fragment> | 27 | </Fragment> |
29 | |||
30 | <Fragment> | ||
31 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> | ||
32 | |||
33 | <WixVariable Id="NetFx451WebDetectCondition" Value="NETFRAMEWORK45 >= $(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 "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | ||
40 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | ||
41 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullWebLog].html"" | ||
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 >= $(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 "[WixBundleName]" /log "[NetFx451FullLog].html"" | ||
81 | RepairArguments="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" | ||
82 | UninstallArguments="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx451FullLog].html"" | ||
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> | ||
111 | </Wix> | 28 | </Wix> |