diff options
Diffstat (limited to 'src/wixlib/NetFx4.wxs')
| -rw-r--r-- | src/wixlib/NetFx4.wxs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/wixlib/NetFx4.wxs b/src/wixlib/NetFx4.wxs index cad4a31c..047915b9 100644 --- a/src/wixlib/NetFx4.wxs +++ b/src/wixlib/NetFx4.wxs | |||
| @@ -27,9 +27,7 @@ | |||
| 27 | <Fragment> | 27 | <Fragment> |
| 28 | <PropertyRef Id="NETFRAMEWORK40FULL" /> | 28 | <PropertyRef Id="NETFRAMEWORK40FULL" /> |
| 29 | <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" /> | 29 | <Property Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Secure="yes" /> |
| 30 | <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | 30 | <SetProperty Id="WIX_IS_NETFRAMEWORK_40_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="NETFRAMEWORK40FULL" /> |
| 31 | NETFRAMEWORK40FULL | ||
| 32 | </SetProperty> | ||
| 33 | </Fragment> | 31 | </Fragment> |
| 34 | 32 | ||
| 35 | <Fragment> | 33 | <Fragment> |
| @@ -43,7 +41,7 @@ | |||
| 43 | </Fragment> | 41 | </Fragment> |
| 44 | 42 | ||
| 45 | <Fragment> | 43 | <Fragment> |
| 46 | <util:RegistrySearchRef Id="NETFRAMEWORK40"/> | 44 | <util:RegistrySearchRef Id="NETFRAMEWORK40" /> |
| 47 | 45 | ||
| 48 | <PackageGroup Id="$(var.NetFx40WebId)"> | 46 | <PackageGroup Id="$(var.NetFx40WebId)"> |
| 49 | <ExePackage | 47 | <ExePackage |
| @@ -78,7 +76,7 @@ | |||
| 78 | </Fragment> | 76 | </Fragment> |
| 79 | 77 | ||
| 80 | <Fragment> | 78 | <Fragment> |
| 81 | <util:RegistrySearchRef Id="NETFRAMEWORK40"/> | 79 | <util:RegistrySearchRef Id="NETFRAMEWORK40" /> |
| 82 | 80 | ||
| 83 | <PackageGroup Id="$(var.NetFx40RedistId)"> | 81 | <PackageGroup Id="$(var.NetFx40RedistId)"> |
| 84 | <ExePackage | 82 | <ExePackage |
| @@ -123,7 +121,7 @@ | |||
| 123 | </Fragment> | 121 | </Fragment> |
| 124 | 122 | ||
| 125 | <Fragment> | 123 | <Fragment> |
| 126 | <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/> | 124 | <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" /> |
| 127 | 125 | ||
| 128 | <PackageGroup Id="$(var.NetFx40ClientWebId)"> | 126 | <PackageGroup Id="$(var.NetFx40ClientWebId)"> |
| 129 | <ExePackage | 127 | <ExePackage |
| @@ -158,7 +156,7 @@ | |||
| 158 | </Fragment> | 156 | </Fragment> |
| 159 | 157 | ||
| 160 | <Fragment> | 158 | <Fragment> |
| 161 | <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT"/> | 159 | <util:RegistrySearchRef Id="NETFRAMEWORK40CLIENT" /> |
| 162 | 160 | ||
| 163 | <PackageGroup Id="$(var.NetFx40ClientRedistId)"> | 161 | <PackageGroup Id="$(var.NetFx40ClientRedistId)"> |
| 164 | <ExePackage | 162 | <ExePackage |