[commit] r1994 - trunk/Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Aug  3 18:04:20 2012
New Revision: 1994

Log:
Fix installation of ISIS.GME.Common.dll

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

Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs	Fri Aug  3 14:00:04 2012	(r1993)
+++ trunk/Install/GME_SDK.wxs	Fri Aug  3 18:04:20 2012	(r1994)
@@ -12,6 +12,11 @@
         InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
         InstallPrivileges='elevated' InstallScope='perMachine'/>
 
+    <PropertyRef Id="NETFRAMEWORK20"/>
+    <PropertyRef Id="NETFRAMEWORK40FULL"/>
+    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
+    <Property Id="NETFRAMEWORK">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Property><!-- FIXME: doesnt work -->
+
     <!-- =========================================================== -->
     <!-- DIRECTORY STRUCTURE -->
     <!-- =========================================================== -->
@@ -204,9 +209,9 @@
     <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
       <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\CSharpDSMLGenerator.ico" />
     </Component>
-    <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR" Permanent="yes">
-      <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\ISIS.GME.Common.dll" Assembly=".net" />
-      <Condition>NETFRAMEWORK</Condition>
+    <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>NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</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	Fri Aug  3 14:00:04 2012	(r1993)
+++ trunk/Install/GME_paradigms.wxs	Fri Aug  3 18:04:20 2012	(r1994)
@@ -12,12 +12,6 @@
         InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
         InstallPrivileges='elevated' InstallScope='perMachine'/>
 
-
-    <PropertyRef Id="NETFRAMEWORK20"/>
-    <PropertyRef Id="NETFRAMEWORK40FULL"/>
-    <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
-    <Property Id="NETFRAMEWORK">NETFRAMEWORK20 OR NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Property><!-- FIXME: doesnt work -->
-
     <!-- =========================================================== -->
     <!-- DIRECTORY STRUCTURE -->
     <!-- =========================================================== -->