Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updated to Nuget 1.6 and added support for prerelease packages

  • Loading branch information...
commit ddc934b5416dcf7df47f915eb6adbeb0e01203f9 1 parent 30e07e3
@remogloor remogloor authored
View
26 Ninject.include
@@ -260,7 +260,8 @@
<target name="config-platform-mono-2.0">
<property name="nant.settings.currentframework" value="mono-2.0"/>
- <property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,NO_GENERIC_MOQ"/>
+ <property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,NO_GENERIC_MOQ,MONO_2_6" if="${teamcity}"/>
+ <property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,NO_GENERIC_MOQ" unless="${teamcity}"/>
<property name="nuget.add" value="false"/>
</target>
@@ -329,6 +330,7 @@
</target>
<target name="allPlatforms" depends="InitializeBuildSystem">
+ <call target="csproj"/>
<foreach item="String" in="${product.platforms}" delim="," property="platform">
<property name="build.platform" value="${platform}"/>
<call target="package-bin"/>
@@ -339,7 +341,7 @@
<target name="package-bin" depends="create-assembly-info all">
<mkdir dir="${path.dist}" if="${not(directory::exists(path.dist))}"/>
- <zip zipfile="${path.dist}\${product.name}${product.packagePostfix}-${build.version}-${product.additionalVersionTag}${build.config}-${build.platform}.zip" ziplevel="9">
+ <zip zipfile="${path.dist}\${product.name}${product.packagePostfix}-${build.version}${product.additionalVersionTag}-${build.config}-${build.platform}.zip" ziplevel="9">
<fileset basedir="${current.path.build}">
<include name="**/*.*"/>
</fileset>
@@ -348,7 +350,7 @@
<target name="package-source" depends="create-assembly-info">
<mkdir dir="${path.dist}" if="${not(directory::exists(path.dist))}"/>
- <zip zipfile="${path.dist}\${product.name}${product.packagePostfix}-${build.version}-${product.additionalVersionTag}source.zip" ziplevel="9">
+ <zip zipfile="${path.dist}\${product.name}${product.packagePostfix}-${build.version}${product.additionalVersionTag}-source.zip" ziplevel="9">
<fileset basedir="${path.base}">
<include name="lib/*.*"/>
<include name="**/*.cs"/>
@@ -362,6 +364,10 @@
</zip>
</target>
+ <target name="csproj">
+ <msbuild project="${path.src}/${product.name}/${product.name}.csproj" />
+ </target>
+
<target name="revert">
<echo message="Reverting version info"/>
<exec
@@ -396,7 +402,7 @@
<property name="nuget.releaseDirectory" value="${path.build}\${build.platform}\release" dynamic="true"/>
<property name="nuget.dependencies" value="${dependencies}" />
<property name="nuget.additionalFiles" value="-" />
- <property name="nuget.packageName" value="${nuget.name}${product.packagePostfix}.${build.version}" />
+ <property name="nuget.packageName" value="${nuget.name}${product.packagePostfix}" />
<call target="nuget-run"/>
</target>
@@ -405,6 +411,8 @@
<delete dir="${nuget.basedir}"/>
<delete dir="${nuget.symbol.basedir}"/>
<property name="nuget.platform" value=""/>
+ <property name="nuget.version" value="${build.version}" if="${product.additionalVersionTag == ''}"/>
+ <property name="nuget.version" value="${version.major}.${version.minor}.${version.build}${product.additionalVersionTag}" unless="${product.additionalVersionTag == ''}"/>
<call target="config-build-${build.config}"/>
<foreach item="String" in="${nuget.platforms}" delim="," property="platform">
@@ -432,8 +440,8 @@
</fileset>
</copy>
- <echo message="Build Version: ${build.version}"/>
- <xmlpoke file="${nuget.basedir}/${nuget.name}.nuspec" xpath="//package/nu:metadata/nu:version" value="${build.version}">
+ <echo message="Build Version: ${nuget.version}"/>
+ <xmlpoke file="${nuget.basedir}/${nuget.name}.nuspec" xpath="//package/nu:metadata/nu:version" value="${nuget.version}">
<namespaces>
<namespace prefix="xsi" uri="http://www.w3.org/2001/XMLSchema-instance" />
<namespace prefix="xsd" uri="http://www.w3.org/2001/XMLSchema" />
@@ -480,15 +488,15 @@
</move>
<exec program="${path.tools.nuget}" workingdir="${nuget.basedir}" commandline="pack ${nuget.project} -symbols" />
- <unzip zipfile="${path.dist}\NuGet\${nuget.packageName}.nupkg" todir="${nuget.symbol.basedir}/target"/>
- <unzip zipfile="${nuget.basedir}\${nuget.name}.${version.major}.${version.minor}.symbols.nupkg" todir="${nuget.symbol.basedir}/source"/>
+ <unzip zipfile="${path.dist}\NuGet\${nuget.packageName}.${nuget.version}.nupkg" todir="${nuget.symbol.basedir}/target"/>
+ <unzip zipfile="${nuget.basedir}\${nuget.name}.${version.major}.${version.minor}.0.0.symbols.nupkg" todir="${nuget.symbol.basedir}/source"/>
<copy overwrite="false" todir="${nuget.symbol.basedir}/target">
<fileset basedir="${nuget.symbol.basedir}/source">
<include name="[Content_Types].xml" />
<include name="src/**" />
</fileset>
</copy>
- <zip zipfile="${path.dist}\NuGet\${nuget.packageName}.symbols.nupkg">
+ <zip zipfile="${path.dist}\NuGet\${nuget.packageName}.${nuget.version}.symbols.nupkg">
<fileset basedir="${nuget.symbol.basedir}/target">
<include name="**"/>
</fileset>
View
32 build-alpha.cmd
@@ -0,0 +1,32 @@
+@echo off
+set nantfile=Ninject.build
+set nantexe=tools\nant\nant.exe
+set buildlog=Ninject-Nant-Build.log
+set unittestlog=Ninject-Nant-unit-tests.log
+
+%nantexe% -buildfile:%nantfile% clean %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-alpha" package-source %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-alpha" "-D:build.config=release" allPlatforms %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+
+IF ERRORLEVEL 1 GOTO Failed
+
+echo "Release build completed."
+GOTO End
+
+:Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+echo "============================================================"
+echo "BUILD FAILED"
+echo "============================================================"
+
+IF NOT "%NoPause%"=="true" goto END
+exit /B 1
+
+:End
+if "%NoPause%"=="true" goto ENDBATCHFILE
+pause
+:ENDBATCHFILE
View
32 build-beta.cmd
@@ -0,0 +1,32 @@
+@echo off
+set nantfile=Ninject.build
+set nantexe=tools\nant\nant.exe
+set buildlog=Ninject-Nant-Build.log
+set unittestlog=Ninject-Nant-unit-tests.log
+
+%nantexe% -buildfile:%nantfile% clean %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-beta" package-source %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-beta" "-D:build.config=release" allPlatforms %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+
+IF ERRORLEVEL 1 GOTO Failed
+
+echo "Release build completed."
+GOTO End
+
+:Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+echo "============================================================"
+echo "BUILD FAILED"
+echo "============================================================"
+
+IF NOT "%NoPause%"=="true" goto END
+exit /B 1
+
+:End
+if "%NoPause%"=="true" goto ENDBATCHFILE
+pause
+:ENDBATCHFILE
View
32 build-rc1.cmd
@@ -0,0 +1,32 @@
+@echo off
+set nantfile=Ninject.build
+set nantexe=tools\nant\nant.exe
+set buildlog=Ninject-Nant-Build.log
+set unittestlog=Ninject-Nant-unit-tests.log
+
+%nantexe% -buildfile:%nantfile% clean %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-rc1" package-source %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% "-D:product.additionalVersionTag=-rc1" "-D:build.config=release" allPlatforms %1 %2 %3 %4 %5 %6 %7 %8
+IF ERRORLEVEL 1 GOTO Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+
+IF ERRORLEVEL 1 GOTO Failed
+
+echo "Release build completed."
+GOTO End
+
+:Failed
+%nantexe% -buildfile:%nantfile% -q -nologo revert
+echo "============================================================"
+echo "BUILD FAILED"
+echo "============================================================"
+
+IF NOT "%NoPause%"=="true" goto END
+exit /B 1
+
+:End
+if "%NoPause%"=="true" goto ENDBATCHFILE
+pause
+:ENDBATCHFILE
View
BIN  tools/nant/CollectionGen.dll
Binary file not shown
View
BIN  tools/nant/Interop.MsmMergeTypeLib.dll
Binary file not shown
View
BIN  tools/nant/Interop.StarTeam.dll
Binary file not shown
View
BIN  tools/nant/Interop.WindowsInstaller.dll
Binary file not shown
View
BIN  tools/nant/NAnt.Contrib.Tasks.dll
Binary file not shown
View
19,219 tools/nant/NAnt.Contrib.Tasks.xml
19,219 additions, 0 deletions not shown
View
BIN  tools/nant/SLiNgshoT.Core.dll
Binary file not shown
View
BIN  tools/nant/SLiNgshoT.exe
Binary file not shown
View
BIN  tools/nant/SourceSafe.Interop.dll
Binary file not shown
View
7 tools/nant/SourceSafe.Interop.dll.VisualState.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VisualState xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ShowCheckBoxes="false">
+ <TopNode>[0-1000]C:\Projects\Ninject\ninject.extensions.bbveventbroker\tools\nant\SourceSafe.Interop.dll</TopNode>
+ <SelectedNode>[0-1000]C:\Projects\Ninject\ninject.extensions.bbveventbroker\tools\nant\SourceSafe.Interop.dll</SelectedNode>
+ <ExcludeCategories>false</ExcludeCategories>
+ <Nodes />
+</VisualState>
View
BIN  tools/nuget/NuGet.exe
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.