[tomboy] Fixed .NET framework detection in installer



commit 64d31fa3e214e284d7df124b246f2c7421c2270c
Author: Alex Tereschenko <frozen and blue gmail com>
Date:   Wed Oct 30 20:58:20 2013 +0100

    Fixed .NET framework detection in installer
    
    Signed-off-by: Jared Jennings <jared jaredjennings org>

 Setup/Setup.wxs |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/Setup/Setup.wxs b/Setup/Setup.wxs
index ac4b4c7..06bdcc2 100644
--- a/Setup/Setup.wxs
+++ b/Setup/Setup.wxs
@@ -59,14 +59,10 @@
                <Condition Message="This setup requires Gtk# for .NET (version 2.12.20 or higher). Please 
download the latest installer from http://www.mono-project.com/GtkSharp ">
                        <![CDATA[GTKSHARPNOVELLINSTALLVERSION >= "2.12.20" OR (GTKSHARPNOVELLINSTALLVERSION 
<< "2.12.1" AND GTKSHARPNOVELLINSTALLVERSION <> "2.12.1") OR REMOVE ~= "ALL"]]>
                </Condition>
-               <Condition Message='This setup requires the .NET Framework 4.0 or higher.'>
-                       <![CDATA[MsiNetAssemblySupport >= "4.0.30319"]]>
-               </Condition>
 
-               
-               <PropertyRef Id="NETFRAMEWORK35"/>
-               <Condition Message="This application requires .NET Framework 3.5. Please install the .NET 
Framework then run this installer again.">
-                       <![CDATA[Installed OR NETFRAMEWORK35]]>
+               <PropertyRef Id="NETFRAMEWORK40FULL"/>
+               <Condition Message="This application requires .NET Framework 4.0. Please install the .NET 
Framework then run this installer again.">
+                       <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
                </Condition>
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]