Permalink
Browse files

Changed build script that teamcity uses the version number of the ass…

…embly file version as build number
  • Loading branch information...
remogloor committed May 15, 2011
1 parent 60f58f5 commit e42eeac43f053657a9c2812b7c1ccef0d8637d0a
Showing with 30 additions and 27 deletions.
  1. +0 −6 mvc1/Ninject.Web.Mvc.sln
  2. +10 −7 mvc1/Ninject.include
  3. +10 −7 mvc2/Ninject.include
  4. +10 −7 mvc3/Ninject.include
View
@@ -8,8 +8,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Web.Mvc", "src\Ninject.Web.Mvc\Ninject.Web.Mvc.csproj", "{82222179-0EB8-4C43-AD48-6EA388349C64}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ninject.Web.Common", "..\..\Ninject.Web.Common\src\Ninject.Web.Common\Ninject.Web.Common.csproj", "{1FD016A0-A938-4F81-88BE-0DED65D9A022}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -20,10 +18,6 @@ Global
{82222179-0EB8-4C43-AD48-6EA388349C64}.Debug|Any CPU.Build.0 = Debug|Any CPU
{82222179-0EB8-4C43-AD48-6EA388349C64}.Release|Any CPU.ActiveCfg = Release|Any CPU
{82222179-0EB8-4C43-AD48-6EA388349C64}.Release|Any CPU.Build.0 = Release|Any CPU
- {1FD016A0-A938-4F81-88BE-0DED65D9A022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1FD016A0-A938-4F81-88BE-0DED65D9A022}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1FD016A0-A938-4F81-88BE-0DED65D9A022}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1FD016A0-A938-4F81-88BE-0DED65D9A022}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="NinjectIncludes">
+ <property name="teamcity" value="false" overwrite="false"/>
<property name="path.base" value="${project::get-base-directory()}"/>
<property name="path.build" value="${path.base}/build"/>
<property name="path.lib" value="${path.base}/../lib"/>
@@ -9,13 +10,13 @@
<property name="path.src" value="${path.base}/src"/>
<property name="path.build.assemblyinfo" value="${path.src}/${build.asminfo}" dynamic="true"/>
<property name="path.tools" value="${path.base}/../tools"/>
+ <property name="path.tools.xunit.sl" value="${path.tools}/xunit.sl/"/>
<property name="path.tools.xunit" value="${path.tools}/xunit.net"/>
<property name="path.tools.xunit.console" value="${path.tools.xunit}/xunit.console.exe" dynamic="true"/>
<property name="path.tools.moq" value="${path.tools}/moq"/>
<property name="path.tools.ncover" value="${path.tools}/ncover"/>
<property name="path.tools.git" value="${path.tools}/git"/>
<property name="path.tools.statlight" value="${path.tools}/statlight/statlight.exe"/>
- <property name="path.tools.unitdriven" value="${path.tools}/unitdriven"/>
<property name="path.tools.nuget" value="${path.tools}/nuget/nuget.exe"/>
<property name="product.keyfile" value="Ninject.snk" overwrite="false"/>
@@ -115,9 +116,9 @@
<target name="InitializeBuildSystem" depends="DetectOperatingSystemArchitecture"/>
<target name="create-assembly-info" depends="get-git-revision">
- <echo message="##teamcity[buildVersionNumber '${build.version}']" />
- <echo message="##assembly[assemblyVersionNumber '${build.assemblyversion}']" />
- <echo message="##assembly[buildPlatform '${build.platform}']" />
+ <echo message="##teamcity[buildNumber '${build.version}']" />
+ <echo message="Assembly Version: '${build.assemblyversion}'" />
+ <echo message="Build Platform: '${build.platform}'" />
<asminfo output="${path.build.assemblyinfo}" language="CSharp">
<imports>
@@ -247,7 +248,7 @@
<target name="config-platform-silverlight-4.0-wp7">
<property name="nant.settings.currentframework" value="silverlight-4.0-wp7"/>
- <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS"/>
+ <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS, NO_MOQ"/>
<property name="nuget.platform" value="sl3-wp"/>
<property name="nuget.add" value="true"/>
</target>
@@ -278,8 +279,10 @@
</if>
</target>
- <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests}" if="${string::contains(build.platform, 'silverlight')}">
- <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline='-x"${product.assembly.silverlighttest}" -o=UnitDriven --teamcity' failonerror="true"/>
+ <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests or string::contains(build.platform, 'wp7')}" if="${string::contains(build.platform, 'silverlight')}">
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}" --teamcity' if="${teamcity}"/>
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}"' unless="${teamcity}"/>
+ <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline="${cmdLine}" failonerror="true"/>
</target>
<target name="UnzipDependencies">
View
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="NinjectIncludes">
+ <property name="teamcity" value="false" overwrite="false"/>
<property name="path.base" value="${project::get-base-directory()}"/>
<property name="path.build" value="${path.base}/build"/>
<property name="path.lib" value="${path.base}/../lib"/>
@@ -9,13 +10,13 @@
<property name="path.src" value="${path.base}/src"/>
<property name="path.build.assemblyinfo" value="${path.src}/${build.asminfo}" dynamic="true"/>
<property name="path.tools" value="${path.base}/../tools"/>
+ <property name="path.tools.xunit.sl" value="${path.tools}/xunit.sl/"/>
<property name="path.tools.xunit" value="${path.tools}/xunit.net"/>
<property name="path.tools.xunit.console" value="${path.tools.xunit}/xunit.console.exe" dynamic="true"/>
<property name="path.tools.moq" value="${path.tools}/moq"/>
<property name="path.tools.ncover" value="${path.tools}/ncover"/>
<property name="path.tools.git" value="${path.tools}/git"/>
<property name="path.tools.statlight" value="${path.tools}/statlight/statlight.exe"/>
- <property name="path.tools.unitdriven" value="${path.tools}/unitdriven"/>
<property name="path.tools.nuget" value="${path.tools}/nuget/nuget.exe"/>
<property name="product.keyfile" value="Ninject.snk" overwrite="false"/>
@@ -115,9 +116,9 @@
<target name="InitializeBuildSystem" depends="DetectOperatingSystemArchitecture"/>
<target name="create-assembly-info" depends="get-git-revision">
- <echo message="##teamcity[buildVersionNumber '${build.version}']" />
- <echo message="##assembly[assemblyVersionNumber '${build.assemblyversion}']" />
- <echo message="##assembly[buildPlatform '${build.platform}']" />
+ <echo message="##teamcity[buildNumber '${build.version}']" />
+ <echo message="Assembly Version: '${build.assemblyversion}'" />
+ <echo message="Build Platform: '${build.platform}'" />
<asminfo output="${path.build.assemblyinfo}" language="CSharp">
<imports>
@@ -247,7 +248,7 @@
<target name="config-platform-silverlight-4.0-wp7">
<property name="nant.settings.currentframework" value="silverlight-4.0-wp7"/>
- <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS"/>
+ <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS, NO_MOQ"/>
<property name="nuget.platform" value="sl3-wp"/>
<property name="nuget.add" value="true"/>
</target>
@@ -278,8 +279,10 @@
</if>
</target>
- <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests}" if="${string::contains(build.platform, 'silverlight')}">
- <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline='-x"${product.assembly.silverlighttest}" -o=UnitDriven --teamcity' failonerror="true"/>
+ <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests or string::contains(build.platform, 'wp7')}" if="${string::contains(build.platform, 'silverlight')}">
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}" --teamcity' if="${teamcity}"/>
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}"' unless="${teamcity}"/>
+ <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline="${cmdLine}" failonerror="true"/>
</target>
<target name="UnzipDependencies">
View
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<project name="NinjectIncludes">
+ <property name="teamcity" value="false" overwrite="false"/>
<property name="path.base" value="${project::get-base-directory()}"/>
<property name="path.build" value="${path.base}/build"/>
<property name="path.lib" value="${path.base}/../lib"/>
@@ -9,13 +10,13 @@
<property name="path.src" value="${path.base}/src"/>
<property name="path.build.assemblyinfo" value="${path.src}/${build.asminfo}" dynamic="true"/>
<property name="path.tools" value="${path.base}/../tools"/>
+ <property name="path.tools.xunit.sl" value="${path.tools}/xunit.sl/"/>
<property name="path.tools.xunit" value="${path.tools}/xunit.net"/>
<property name="path.tools.xunit.console" value="${path.tools.xunit}/xunit.console.exe" dynamic="true"/>
<property name="path.tools.moq" value="${path.tools}/moq"/>
<property name="path.tools.ncover" value="${path.tools}/ncover"/>
<property name="path.tools.git" value="${path.tools}/git"/>
<property name="path.tools.statlight" value="${path.tools}/statlight/statlight.exe"/>
- <property name="path.tools.unitdriven" value="${path.tools}/unitdriven"/>
<property name="path.tools.nuget" value="${path.tools}/nuget/nuget.exe"/>
<property name="product.keyfile" value="Ninject.snk" overwrite="false"/>
@@ -115,9 +116,9 @@
<target name="InitializeBuildSystem" depends="DetectOperatingSystemArchitecture"/>
<target name="create-assembly-info" depends="get-git-revision">
- <echo message="##teamcity[buildVersionNumber '${build.version}']" />
- <echo message="##assembly[assemblyVersionNumber '${build.assemblyversion}']" />
- <echo message="##assembly[buildPlatform '${build.platform}']" />
+ <echo message="##teamcity[buildNumber '${build.version}']" />
+ <echo message="Assembly Version: '${build.assemblyversion}'" />
+ <echo message="Build Platform: '${build.platform}'" />
<asminfo output="${path.build.assemblyinfo}" language="CSharp">
<imports>
@@ -247,7 +248,7 @@
<target name="config-platform-silverlight-4.0-wp7">
<property name="nant.settings.currentframework" value="silverlight-4.0-wp7"/>
- <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS"/>
+ <property name="build.defines" value="${global.build.defines},SILVERLIGHT,SILVERLIGHT_40,WINDOWS_PHONE,NO_LCG,NO_ASSEMBLY_SCANNING,NO_WEB,NO_PARTIAL_TRUST,NO_SKIP_VISIBILITY,NO_EXCEPTION_SERIALIZATION,NO_DEBUG_SYMBOLS, NO_MOQ"/>
<property name="nuget.platform" value="sl3-wp"/>
<property name="nuget.add" value="true"/>
</target>
@@ -278,8 +279,10 @@
</if>
</target>
- <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests}" if="${string::contains(build.platform, 'silverlight')}">
- <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline='-x"${product.assembly.silverlighttest}" -o=UnitDriven --teamcity' failonerror="true"/>
+ <target name="silverlight-test" depends="compile-silverlight-tests" unless="${skip.tests or skip.silverlightTests or string::contains(build.platform, 'wp7')}" if="${string::contains(build.platform, 'silverlight')}">
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}" --teamcity' if="${teamcity}"/>
+ <property name="cmdLine" value='-x"${product.assembly.silverlighttest}"' unless="${teamcity}"/>
+ <exec program="${path.tools.statlight}" workingdir="${current.path.test}" commandline="${cmdLine}" failonerror="true"/>
</target>
<target name="UnzipDependencies">

0 comments on commit e42eeac

Please sign in to comment.