diff options
Diffstat (limited to 'src/wixlib/NetFx4.5.wxs')
| -rw-r--r-- | src/wixlib/NetFx4.5.wxs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wixlib/NetFx4.5.wxs b/src/wixlib/NetFx4.5.wxs index d2ee09cd..ace065e2 100644 --- a/src/wixlib/NetFx4.5.wxs +++ b/src/wixlib/NetFx4.5.wxs | |||
| @@ -24,9 +24,7 @@ | |||
| 24 | <Fragment> | 24 | <Fragment> |
| 25 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | 25 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> |
| 26 | <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" /> | 26 | <Property Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Secure="yes" /> |
| 27 | <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | 27 | <SetProperty Id="WIX_IS_NETFRAMEWORK_45_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx45MinRelease)"" /> |
| 28 | WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx45MinRelease)" | ||
| 29 | </SetProperty> | ||
| 30 | </Fragment> | 28 | </Fragment> |
| 31 | 29 | ||
| 32 | <Fragment> | 30 | <Fragment> |
| @@ -40,7 +38,7 @@ | |||
| 40 | </Fragment> | 38 | </Fragment> |
| 41 | 39 | ||
| 42 | <Fragment> | 40 | <Fragment> |
| 43 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 41 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 44 | 42 | ||
| 45 | <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx45MinRelease)" Overridable="yes" /> | 43 | <WixVariable Id="NetFx45WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx45MinRelease)" Overridable="yes" /> |
| 46 | <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" /> | 44 | <WixVariable Id="NetFx45WebInstallCondition" Value="" Overridable="yes" /> |
| @@ -81,7 +79,7 @@ | |||
| 81 | </Fragment> | 79 | </Fragment> |
| 82 | 80 | ||
| 83 | <Fragment> | 81 | <Fragment> |
| 84 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 82 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 85 | 83 | ||
| 86 | <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx45MinRelease)" Overridable="yes" /> | 84 | <WixVariable Id="NetFx45RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx45MinRelease)" Overridable="yes" /> |
| 87 | <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" /> | 85 | <WixVariable Id="NetFx45RedistInstallCondition" Value="" Overridable="yes" /> |