[commit] r1145 - in trunk: GME/Gme GME/MgaDotNetServices Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan 21 15:25:33 2011
New Revision: 1145

Log:
.NET framework compat: Use a GME.exe.config to load .NET v4 if available, else use v2.0. MgaDotNetServices targets 3.5 to use 2.0 runtime. These changes are so .NET 4 is not required

Added:
   trunk/GME/Gme/GME.exe.config   (contents, props changed)
Modified:
   trunk/GME/Gme/GME.vcxproj
   trunk/GME/Gme/GME.vcxproj.filters
   trunk/GME/MgaDotNetServices/MgaDotNetServices.csproj
   trunk/Install/GME.wxs

Added: trunk/GME/Gme/GME.exe.config
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/GME/Gme/GME.exe.config	Fri Jan 21 15:25:33 2011	(r1145)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <!-- http://msdn.microsoft.com/en-us/library/w4atty68.aspx -->
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    <supportedRuntime version="v4.0" />
+    <supportedRuntime version="v2.0.50727" />
+  </startup>
+</configuration>

Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj	Fri Jan 21 09:34:59 2011	(r1144)
+++ trunk/GME/Gme/GME.vcxproj	Fri Jan 21 15:25:33 2011	(r1145)
@@ -249,10 +249,13 @@
     <ClCompile Include="SyncObjsListCtrl.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\Install\GME.wxs" />
+    <None Include="..\..\Install\GME.wxs">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="AnnotatorEventSink.rgs" />
     <None Include="DecoratorEventSink.rgs" />
     <None Include="aboutpic.bmp" />
+    <None Include="GME.exe.config" />
     <None Include="res\atomport.bmp" />
     <None Include="res\bitmap1.bmp" />
     <None Include="res\bitmap_l.bmp" />

Modified: trunk/GME/Gme/GME.vcxproj.filters
==============================================================================
--- trunk/GME/Gme/GME.vcxproj.filters	Fri Jan 21 09:34:59 2011	(r1144)
+++ trunk/GME/Gme/GME.vcxproj.filters	Fri Jan 21 15:25:33 2011	(r1145)
@@ -364,6 +364,7 @@
     </None>
     <None Include="GME.reg" />
     <None Include="..\..\Install\GME.wxs" />
+    <None Include="GME.exe.config" />
   </ItemGroup>
   <ItemGroup>
     <Midl Include="GmeLib.idl">

Modified: trunk/GME/MgaDotNetServices/MgaDotNetServices.csproj
==============================================================================
--- trunk/GME/MgaDotNetServices/MgaDotNetServices.csproj	Fri Jan 21 09:34:59 2011	(r1144)
+++ trunk/GME/MgaDotNetServices/MgaDotNetServices.csproj	Fri Jan 21 15:25:33 2011	(r1145)
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MgaDotNetServices</RootNamespace>
     <AssemblyName>MgaDotNetServices</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>MgaDotNetServicesKey.snk</AssemblyOriginatorKeyFile>

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Fri Jan 21 09:34:59 2011	(r1144)
+++ trunk/Install/GME.wxs	Fri Jan 21 15:25:33 2011	(r1145)
@@ -275,6 +275,7 @@
 		                </Class>
 			        </TypeLib>
 			     </File>
+              <File Id='GME.exe.config' Name='GME.exe.config' DiskId='1' Source='..\GME\GME\GME.exe.config'/>
                 <RegistryKey Root='HKLM' Key='Software\GME'>
                     <RegistryValue Name='IconPath' Type='string' Value='$PARADIGMDIR\icons;$PROJECTDIR\icons'/>
 		        </RegistryKey>