Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Adding net-4.0 and net-4.0-no-web targets.

  • Loading branch information...
commit f41d7256b268cc02f7775644b90c2de28df8f247 1 parent 5ef4bae
Ian Davis authored
Showing with 16 additions and 4 deletions.
  1. +2 −2 Ninject.build
  2. +12 −2 Ninject.include
  3. +2 −0  build-release.cmd
View
4 Ninject.build
@@ -2,7 +2,7 @@
<project name="Ninject" default="all">
<include buildfile="Ninject.include" />
- <property name="version" value="2.0.2.0" overwrite="true"/>
+ <property name="version" value="2.1.0.0" overwrite="true"/>
<target name="all" depends="core csl test"/>
@@ -40,7 +40,7 @@
</csc>
</target>
- <target name="compile-tests" depends="core" unless="${skip.tests}">
+ <target name="compile-tests" depends="core" unless="${skip.tests}" if="${build.platform == 'net-3.5'}">
<mkdir dir="${current.path.test}"/>
<copy todir="${current.path.test}" flatten="true">
<fileset basedir="${current.path.build}">
View
14 Ninject.include
@@ -101,10 +101,20 @@
<property name="build.defines" value="${global.build.defines},NET,NET_35"/>
</target>
- <target name="config-platform-net-3.5-no-web">
+ <target name="config-platform-net-3.5-no-web">
<property name="nant.settings.currentframework" value="net-3.5"/>
<property name="build.defines" value="${global.build.defines},NET,NET_35,NO_WEB"/>
</target>
+
+ <target name="config-platform-net-4.0">
+ <property name="nant.settings.currentframework" value="net-4.0"/>
+ <property name="build.defines" value="${global.build.defines},NET,NET_40"/>
+ </target>
+
+ <target name="config-platform-net-4.0-no-web">
+ <property name="nant.settings.currentframework" value="net-4.0"/>
+ <property name="build.defines" value="${global.build.defines},NET,NET_40,NO_WEB"/>
+ </target>
<target name="config-platform-silverlight-2.0">
<property name="nant.settings.currentframework" value="silverlight-2.0"/>
@@ -141,7 +151,7 @@
<property name="build.defines" value="${global.build.defines},NET,NET_35,NO_WEB,MONO"/>
</target>
- <target name="test" depends="compile-tests" unless="${skip.tests}">
+ <target name="test" depends="compile-tests" unless="${skip.tests}" if="${build.platform == 'net-3.5'}">
<xunit workingDir="${current.path.test}" assembly="${product.assembly.test}" html="${current.path.test}/results.html" if="${build.platform == 'net-3.5'}"/>
<exec verbose="true" program="${path.tools.ncover}/ncover.console.exe" workingdir="${current.path.test}"
commandline="&quot;${path.tools.xunit}\xunit.console.exe&quot; &quot;${product.assembly.test}&quot; //reg //w &quot;.&quot; //x &quot;coverage.xml&quot;"/>
View
2  build-release.cmd
@@ -2,6 +2,8 @@ tools\nant\nant.exe -buildfile:Ninject.build clean %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build package-source %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=net-3.5" package-bin %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=net-3.5-no-web" package-bin %1 %2 %3 %4 %5 %6 %7 %8
+tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=net-4.0" package-bin %1 %2 %3 %4 %5 %6 %7 %8
+tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=net-4.0-no-web" package-bin %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=silverlight-2.0" package-bin %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=silverlight-3.0" package-bin %1 %2 %3 %4 %5 %6 %7 %8
tools\nant\nant.exe -buildfile:Ninject.build "-D:build.config=release" "-D:build.platform=silverlight-4.0" package-bin %1 %2 %3 %4 %5 %6 %7 %8
Please sign in to comment.
Something went wrong with that request. Please try again.