|
|
|
@ -47,7 +47,7 @@
@@ -47,7 +47,7 @@
|
|
|
|
|
"Installed OR" this would not be allowed. |
|
|
|
|
--> |
|
|
|
|
<!-- |
|
|
|
|
Check for .NET 4.0 beta 2 |
|
|
|
|
Check for .NET 4.0 RTM Full |
|
|
|
|
--> |
|
|
|
|
<Property Id="NETFRAMEWORK40FULL" Secure="yes"> |
|
|
|
|
<RegistrySearch Id="NetFramework40Full" Root="HKLM" Key="SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" Name="Install" Type="raw" /> |
|
|
|
@ -60,6 +60,12 @@
@@ -60,6 +60,12 @@
|
|
|
|
|
Installed OR NETFRAMEWORK40FULL |
|
|
|
|
</Condition> |
|
|
|
|
|
|
|
|
|
<!-- Unfortunately we also require .NET 3.5 SP1 at the moment --> |
|
|
|
|
<PropertyRef Id="NETFRAMEWORK35_SP_LEVEL" /> |
|
|
|
|
<Condition Message="This setup requires the .NET Framework 3.5 SP1 to be installed (Yes, you need both .NET 4.0 and 3.5 SP1. Sorry.)"> |
|
|
|
|
Installed OR NETFRAMEWORK35_SP_LEVEL = "#1" |
|
|
|
|
</Condition> |
|
|
|
|
|
|
|
|
|
<!-- |
|
|
|
|
Check for C++ 2008 Runtime (we accept any 2008 runtime version). |
|
|
|
|
We only need the VC9 CRT, but unfortunately I couldn't find any way to detect if that is installed. |
|
|
|
|