diff options
Diffstat (limited to 'src/ext/NetFx/wixlib/NetFx46.wxs')
-rw-r--r-- | src/ext/NetFx/wixlib/NetFx46.wxs | 58 |
1 files changed, 4 insertions, 54 deletions
diff --git a/src/ext/NetFx/wixlib/NetFx46.wxs b/src/ext/NetFx/wixlib/NetFx46.wxs index 535747e0..a6fae112 100644 --- a/src/ext/NetFx/wixlib/NetFx46.wxs +++ b/src/ext/NetFx/wixlib/NetFx46.wxs | |||
@@ -4,19 +4,12 @@ | |||
4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> |
5 | 5 | ||
6 | <!-- | 6 | <!-- |
7 | .NET Framework installation state properties | 7 | .NET Framework installation state properties |
8 | 8 | Official documentation can be found at the following location: | |
9 | Official documentation can be found at the following location: | 9 | .NET Framework 4.5/4.5.1/4.5.2/4.6 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx |
10 | 10 | --> | |
11 | .NET Framework 4.5/4.5.1/4.5.2/4.6 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx | ||
12 | --> | ||
13 | 11 | ||
14 | <?define NetFx46MinRelease = 393295 ?> | 12 | <?define NetFx46MinRelease = 393295 ?> |
15 | <?define NetFx46WebLink = https://go.microsoft.com/fwlink/?LinkId=560371 ?> | ||
16 | <?define NetFx46RedistLink = https://go.microsoft.com/fwlink/?LinkId=560369 ?> | ||
17 | <?define NetFx46EulaLink = https://go.microsoft.com/fwlink/?LinkID=558772 ?> | ||
18 | <?define NetFx46WebId = NetFx46Web ?> | ||
19 | <?define NetFx46RedistId = NetFx46Redist ?> | ||
20 | 13 | ||
21 | <Fragment> | 14 | <Fragment> |
22 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | 15 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> |
@@ -24,47 +17,4 @@ | |||
24 | <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"" /> | 17 | <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"" /> |
25 | </Fragment> | 18 | </Fragment> |
26 | 19 | ||
27 | <Fragment> | ||
28 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> | ||
29 | |||
30 | <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> | ||
31 | <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" /> | ||
32 | <WixVariable Id="NetFx46WebPackageDirectory" Value="redist\" Overridable="yes" /> | ||
33 | |||
34 | <PackageGroup Id="$(var.NetFx46WebId)"> | ||
35 | <ExePackage InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx46WebDetectCondition)" InstallCondition="!(wix.NetFx46WebInstallCondition)" Id="$(var.NetFx46WebId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="remove"> | ||
36 | <ExePackagePayload Name="!(wix.NetFx46WebPackageDirectory)NDP46-KB3045560-Web.exe" DownloadUrl="$(var.NetFx46WebLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="CAA5F4D4DB0C9DF34252FCB74CF7762214F69D2419865EBC1E6717E6B1348E59A7599A8DECAAB5CEE6974E59D1AE5A749F8C4EC07C8E4C80C90E77B996B3B205" ProductName="Microsoft .NET Framework 4.6" Size="1497400" Version="4.6.81.0" /> | ||
37 | </ExePackage> | ||
38 | </PackageGroup> | ||
39 | </Fragment> | ||
40 | |||
41 | <Fragment> | ||
42 | <PackageGroup Id="$(var.NetFx46WebId)AsPrereq"> | ||
43 | <PackageGroupRef Id="$(var.NetFx46WebId)" /> | ||
44 | </PackageGroup> | ||
45 | |||
46 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46WebId)" LicenseUrl="$(var.NetFx46EulaLink)" /> | ||
47 | </Fragment> | ||
48 | |||
49 | <Fragment> | ||
50 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> | ||
51 | |||
52 | <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> | ||
53 | <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" /> | ||
54 | <WixVariable Id="NetFx46RedistPackageDirectory" Value="redist\" Overridable="yes" /> | ||
55 | |||
56 | <PackageGroup Id="$(var.NetFx46RedistId)"> | ||
57 | <ExePackage InstallArguments="/q /norestart /log "[NetFx46FullLog].html"" PerMachine="yes" DetectCondition="!(wix.NetFx46RedistDetectCondition)" InstallCondition="!(wix.NetFx46RedistInstallCondition)" Id="$(var.NetFx46RedistId)" Vital="yes" Permanent="yes" Protocol="netfx4" LogPathVariable="NetFx46FullLog" Cache="remove"> | ||
58 | <ExePackagePayload Name="!(wix.NetFx46RedistPackageDirectory)NDP46-KB3045557-x86-x64-AllOS-ENU.exe" DownloadUrl="$(var.NetFx46RedistLink)" Description="Microsoft .NET Framework 4.6 Setup" Hash="C6FC54F648F822515ADACB4C27E0A6DBD6A3EAF2BA3F069C0002750894ECC453EBED8BC8D4FF2AFD73C7B3445C1DA18D43FE361EA5195AE8522249DF36B84B7E" ProductName="Microsoft .NET Framework 4.6" Size="65444688" Version="4.6.81.0" /> | ||
59 | </ExePackage> | ||
60 | </PackageGroup> | ||
61 | </Fragment> | ||
62 | |||
63 | <Fragment> | ||
64 | <PackageGroup Id="$(var.NetFx46RedistId)AsPrereq"> | ||
65 | <PackageGroupRef Id="$(var.NetFx46RedistId)" /> | ||
66 | </PackageGroup> | ||
67 | |||
68 | <bal:ManagedBootstrapperApplicationPrereqInformation PackageId="$(var.NetFx46RedistId)" LicenseUrl="$(var.NetFx46EulaLink)" /> | ||
69 | </Fragment> | ||
70 | </Wix> | 20 | </Wix> |