summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2010-05-18 18:45:35 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2010-05-18 18:45:35 +0000
commitb436fcebf2ce3326a1d87e99d376b750111c63ee (patch)
treebd9bd0e0a692f08a90281c0add6c83f248b090b2
parent809006cbd8638dcaad78aba474390003e672c3f8 (diff)
downloadMPC-b436fcebf2ce3326a1d87e99d376b750111c63ee.tar.gz
ChangeLogTag: Tue May 18 18:44:33 UTC 2010 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--ChangeLog9
-rw-r--r--docs/templates/vc8csharp.txt1
-rw-r--r--modules/VC9ProjectCreator.pm1
-rw-r--r--templates/vc8csharp.mpd8
4 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9562a524..9c6d9b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue May 18 18:44:33 UTC 2010 Chad Elliott <elliott_c@ociweb.com>
+
+ * docs/templates/vc8csharp.txt:
+ * modules/VC9ProjectCreator.pm:
+ * templates/vc8csharp.mpd:
+
+ Added a TargetFrameworkVersion template variable. This is set by
+ default with vc9 and above to 3.5.
+
Tue May 18 15:13:21 UTC 2010 Adam Mitz <mitza@ociweb.com>
* modules/Options.pm:
diff --git a/docs/templates/vc8csharp.txt b/docs/templates/vc8csharp.txt
index 1768d087..643e3c73 100644
--- a/docs/templates/vc8csharp.txt
+++ b/docs/templates/vc8csharp.txt
@@ -13,6 +13,7 @@ prversion = This setting specifies the ProductVersion in the generated .csproj f
registerforcominterop = This setting corresponds to the Build Output property "Register for COM interop". The boolean values true and false correspond to enabling or disabling the feature in the IDE.
schemaversion = This setting specifies the SchemaVersion in the generated .csproj file.
startupobject = This corresponds to the Application property "Startup object".
+targetframeworkversion = The TargetFrameworkVersion attribute. Setting this also enables a reference to the System.Core using the same version number as a requirement.
toolsversion = The ToolsVersion attribute of the Project XML element.
trace = This setting corresponds to the Build General property "Conditional Compilation Constants". If this boolean template variable is set, the TRACE constant will be defined.
warning_level = This corresponds to the Build General property "Warning level". Valid values are 0 through 4.
diff --git a/modules/VC9ProjectCreator.pm b/modules/VC9ProjectCreator.pm
index fea5ee31..8a66ba41 100644
--- a/modules/VC9ProjectCreator.pm
+++ b/modules/VC9ProjectCreator.pm
@@ -20,6 +20,7 @@ use vars qw(@ISA);
my %config = ('vcversion' => '9.00',
'prversion' => '9.0.30729',
'toolsversion' => '3.5',
+ 'targetframeworkversion' => '3.5',
'xmlheader' => 1,
);
diff --git a/templates/vc8csharp.mpd b/templates/vc8csharp.mpd
index 7e2ede7b..206c4036 100644
--- a/templates/vc8csharp.mpd
+++ b/templates/vc8csharp.mpd
@@ -47,6 +47,9 @@
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
+<%if(TargetFrameworkVersion)%>
+ <TargetFrameworkVersion>v<%TargetFrameworkVersion%></TargetFrameworkVersion>
+<%endif%>
</PropertyGroup>
<%foreach(platforms)%>
<%foreach(configurations)%>
@@ -81,6 +84,11 @@
<%if(after)%>
<!-- MPC ADD DEPENDENCIES -->
<%endif%>
+<%if(TargetFrameworkVersion)%>
+ <Reference Include="System.Core">
+ <RequiredTargetFramework><%TargetFrameworkVersion%></RequiredTargetFramework>
+ </Reference>
+<%endif%>
<%foreach(libs)%>
<Reference Include="<%libname_prefix%><%lib%>">
<Name><%libname_prefix%><%lib%></Name>