diff options
Diffstat (limited to 'src/wixlib/NetFx461.wxs')
| -rw-r--r-- | src/wixlib/NetFx461.wxs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wixlib/NetFx461.wxs b/src/wixlib/NetFx461.wxs index 52231a40..ec5a405c 100644 --- a/src/wixlib/NetFx461.wxs +++ b/src/wixlib/NetFx461.wxs | |||
| @@ -23,13 +23,11 @@ | |||
| 23 | <Fragment> | 23 | <Fragment> |
| 24 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | 24 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> |
| 25 | <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" /> | 25 | <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" /> |
| 26 | <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | 26 | <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)"" /> |
| 27 | WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)" | ||
| 28 | </SetProperty> | ||
| 29 | </Fragment> | 27 | </Fragment> |
| 30 | 28 | ||
| 31 | <Fragment> | 29 | <Fragment> |
| 32 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 30 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 33 | 31 | ||
| 34 | <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx461MinRelease)" Overridable="yes" /> | 32 | <WixVariable Id="NetFx461WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx461MinRelease)" Overridable="yes" /> |
| 35 | <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" /> | 33 | <WixVariable Id="NetFx461WebInstallCondition" Value="" Overridable="yes" /> |
| @@ -70,7 +68,7 @@ | |||
| 70 | </Fragment> | 68 | </Fragment> |
| 71 | 69 | ||
| 72 | <Fragment> | 70 | <Fragment> |
| 73 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 71 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 74 | 72 | ||
| 75 | <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx461MinRelease)" Overridable="yes" /> | 73 | <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx461MinRelease)" Overridable="yes" /> |
| 76 | <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" /> | 74 | <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" /> |