diff options
Diffstat (limited to 'src/wixlib/NetFx48.wxs')
| -rw-r--r-- | src/wixlib/NetFx48.wxs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wixlib/NetFx48.wxs b/src/wixlib/NetFx48.wxs index d65d36be..acc79a31 100644 --- a/src/wixlib/NetFx48.wxs +++ b/src/wixlib/NetFx48.wxs | |||
| @@ -21,13 +21,11 @@ | |||
| 21 | <Fragment> | 21 | <Fragment> |
| 22 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | 22 | <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> |
| 23 | <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" /> | 23 | <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" /> |
| 24 | <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | 24 | <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"" /> |
| 25 | WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)" | ||
| 26 | </SetProperty> | ||
| 27 | </Fragment> | 25 | </Fragment> |
| 28 | 26 | ||
| 29 | <Fragment> | 27 | <Fragment> |
| 30 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 28 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 31 | 29 | ||
| 32 | <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> | 30 | <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> |
| 33 | <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" /> | 31 | <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" /> |
| @@ -68,7 +66,7 @@ | |||
| 68 | </Fragment> | 66 | </Fragment> |
| 69 | 67 | ||
| 70 | <Fragment> | 68 | <Fragment> |
| 71 | <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | 69 | <util:RegistrySearchRef Id="NETFRAMEWORK45" /> |
| 72 | 70 | ||
| 73 | <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> | 71 | <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> |
| 74 | <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" /> | 72 | <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" /> |