[commit] r2142 - trunk/Install

Wed Jan 23 09:16:56 CST 2013

Author: ksmyth
Date: Wed Jan 23 09:16:55 2013
New Revision: 2142

Log:
Fix .NET detection

Modified:
   trunk/Install/GME_SDK.wxs
   trunk/Install/GME_paradigms.wxs

Modified: trunk/Install/GME_SDK.wxs
==============================================================================

--- trunk/Install/GME_SDK.wxs	Wed Jan 23 09:16:34 2013	(r2141)
+++ trunk/Install/GME_SDK.wxs	Wed Jan 23 09:16:55 2013	(r2142)
@@ -15,7 +15,8 @@
     <PropertyRef Id="NETFRAMEWORK20"/>
     <PropertyRef Id="NETFRAMEWORK40FULL"/>
     <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-    <Property Id="NETFRAMEWORK">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Property><!-- FIXME: doesnt work -->
+    <SetProperty Id="NETFRAMEWORK" Value="#1" After="AppSearch">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
+    <SetProperty Id="NETFRAMEWORK40" Value="#1" After="AppSearch">NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
 
     <!-- =========================================================== -->
     <!-- DIRECTORY STRUCTURE -->
@@ -211,7 +212,7 @@
     </Component>
     <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR" Guid="{AEE769E8-E82D-46AF-AF94-F61B2C41DF5A}" Permanent="yes">
       <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\ISIS.GME.Common.dll" KeyPath="yes" Assembly=".net"/>
-      <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
+      <Condition>NETFRAMEWORK40</Condition>
     </Component>
     <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
       <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\MgaMeta.dll" />

Modified: trunk/Install/GME_paradigms.wxs
==============================================================================
--- trunk/Install/GME_paradigms.wxs	Wed Jan 23 09:16:34 2013	(r2141)
+++ trunk/Install/GME_paradigms.wxs	Wed Jan 23 09:16:55 2013	(r2142)
@@ -16,7 +16,9 @@
         <PropertyRef Id="NETFRAMEWORK40FULL"/>
         <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
         <!-- used by PIAs -->
-        <Property Id="NETFRAMEWORK">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Property><!-- FIXME: doesnt work -->
+    <SetProperty Id="NETFRAMEWORK" Value="#1" After="AppSearch">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
+    <!-- FIXME: doesnt work -->
+    <SetProperty Id="NETFRAMEWORK40" Value="#1" After="AppSearch">NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</SetProperty>
 
     <!-- =========================================================== -->
     <!-- DIRECTORY STRUCTURE -->
