aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib/NetFx452.wxs
diff options
context:
space:
mode:
Diffstat (limited to 'src/wixlib/NetFx452.wxs')
-rw-r--r--src/wixlib/NetFx452.wxs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wixlib/NetFx452.wxs b/src/wixlib/NetFx452.wxs
index 260f8ab1..8dbdd9b3 100644
--- a/src/wixlib/NetFx452.wxs
+++ b/src/wixlib/NetFx452.wxs
@@ -23,13 +23,11 @@
23 <Fragment> 23 <Fragment>
24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> 24 <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
25 <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" /> 25 <Property Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Secure="yes" />
26 <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch"> 26 <SetProperty Id="WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED" Value="1" After="AppSearch" Condition="WIXNETFX4RELEASEINSTALLED &gt;= &quot;#$(var.NetFx452MinRelease)&quot;" />
27 WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx452MinRelease)"
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="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" /> 32 <WixVariable Id="NetFx452WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
35 <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" /> 33 <WixVariable Id="NetFx452WebInstallCondition" Value="" Overridable="yes" />
@@ -69,7 +67,7 @@
69 </Fragment> 67 </Fragment>
70 68
71 <Fragment> 69 <Fragment>
72 <util:RegistrySearchRef Id="NETFRAMEWORK45"/> 70 <util:RegistrySearchRef Id="NETFRAMEWORK45" />
73 71
74 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" /> 72 <WixVariable Id="NetFx452RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx452MinRelease)" Overridable="yes" />
75 <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" /> 73 <WixVariable Id="NetFx452RedistInstallCondition" Value="" Overridable="yes" />