diff options
Diffstat (limited to 'src/wixlib/NetFx46.wxs')
| -rw-r--r-- | src/wixlib/NetFx46.wxs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wixlib/NetFx46.wxs b/src/wixlib/NetFx46.wxs index a874ed95..5c875d09 100644 --- a/src/wixlib/NetFx46.wxs +++ b/src/wixlib/NetFx46.wxs | |||
| @@ -24,13 +24,11 @@ | |||
| 24 | <Fragment> | 24 | <Fragment> |
| 25 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | 25 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> |
| 26 | <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" /> | 26 | <Property Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Secure="yes" /> |
| 27 | <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | 27 | <SetProperty Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)"" /> |
| 28 | WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx46MinRelease)" | ||
| 29 | </SetProperty> | ||
| 30 | </Fragment> | 28 | </Fragment> |
| 31 | 29 | ||
| 32 | <Fragment> | 30 | <Fragment> |
| 33 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 31 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 34 | 32 | ||
| 35 | <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> | 33 | <WixVariable Id="NetFx46WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> |
| 36 | <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" /> | 34 | <WixVariable Id="NetFx46WebInstallCondition" Value="" Overridable="yes" /> |
| @@ -71,7 +69,7 @@ | |||
| 71 | </Fragment> | 69 | </Fragment> |
| 72 | 70 | ||
| 73 | <Fragment> | 71 | <Fragment> |
| 74 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 72 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 75 | 73 | ||
| 76 | <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> | 74 | <WixVariable Id="NetFx46RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx46MinRelease)" Overridable="yes" /> |
| 77 | <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" /> | 75 | <WixVariable Id="NetFx46RedistInstallCondition" Value="" Overridable="yes" /> |