Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPRNET-1508 adding support for AssemblyInformationalVersionAttribute to contain nuget package suffix (e.g., "alpha", etc.) if provided

Browse Source
This commit is contained in:
Steve Bohlen
2012-05-08 15:09:17 -04:00
parent d3c122ea70
commit c9add9533f
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Spring.build
View File

@@ -160,7 +160,7 @@ Commandline Examples:
<sysinfo failonerror="false" />
<property name="project.company" value="SpringSource"/>
<property name="project.copyright" value="Copyright 2002-2011 Spring.NET Framework Team."/>
<property name="project.copyright" value="Copyright 2002-2012 Spring.NET Framework Team."/>
<property name="key.file" value="Spring.Net.snk"/>
<property name="project.year" value="2010"/>
@@ -1607,9 +1607,12 @@ Commandline Examples:
<property name="nuget.package.dir" value="${spring.basedir}\nuget-packages" />
<!-- ensure that we have an empty suffix if none is specified on the command-line -->
<property name="nuget.version.suffix" value="" overwrite="false" />
<!-- assume version of nuget package matches version of assemblies contained within it -->
<property name="nuget.package.version" value="${package.version}" />
<!-- if suffix is passed in, use it -->
<property name="nuget.package.version" value="${package.version + '-' + nuget.version.suffix}" if="${property::exists('nuget.version.suffix')}" />
<call target="clean-nuget-package-dir" />
<call target="check-package-version" />
@@ -1631,7 +1634,7 @@ Commandline Examples:
<arg value="pack" />
<arg value="${filename}" />
<arg value="-Version" />
<arg value="${package.version + '-' + nuget.version.suffix}" />
<arg value="${nuget.package.version}" />
<arg value="-basepath" />
<arg value="${spring.basedir}" />
<arg value="-OutputDirectory" />

12
Spring.include
View File

@@ -185,10 +185,11 @@
<!-- 1591 - do not report warnings for missing XML comments -->
<!-- 0618 - do not report deprecation warnings -->
<!-- 0067 - do not report uncalled events -->
<property name="nowarn.numbers" value="0618"/>
<!-- 1607 - disable AssemblyInformationalVersionAttribute is not in the normal 'major.minor.build.revision' format msgs -->
<property name="nowarn.numbers" value="0618,1607"/>
<!-- use a different set of warnings for building the tests -->
<!-- TODO: "nowarn.numbers.test.default" should be "current.nowarn.numbers.test" -->
<property name="nowarn.numbers.test.default" value="1591,0618,0067"/>
<property name="nowarn.numbers.test.default" value="1591,0618,0067,1607"/>
<if test="${not target::exists('set-' + current.build.config + '-build-configuration')}">
<fail message="The ${current.build.config} build configuration is not supported by ${project.name}."/>
</if>
@@ -243,10 +244,12 @@
<property name="assembly.delay.sign" value="false" />
<property name="assembly.keyfile" value="${key.file}" />
<property name="assembly.version.informational" value="${project.version.numeric}" />
<property name="assembly.version.informational" value="${project.version.numeric + '-' + nuget.version.suffix}" if="${property::exists('nuget.version.suffix')}" />
<!--
<property name="assembly.title" value="${project::get-name()}" />
<property name="assembly.description" value="" />
<property name="assembly.version.informational" value="${project.version.numeric}" />
-->
</target>
@@ -271,12 +274,11 @@
<attribute type="AssemblyVersionAttribute" value="${assembly.version}" />
<attribute type="AssemblyDelaySignAttribute" value="false"/>
<attribute type="AssemblyInformationalVersionAttribute" value="${assembly.version.informational}" />
<!--
<attribute type="AssemblyTitleAttribute" value="${assembly.title}" />
<attribute type="AssemblyDescriptionAttribute" value="${assembly.description}" />
<attribute type="AssemblyInformationalVersionAttribute" value="${assembly.version.informational}" />
<attribute type="AssemblyFileVersionAttribute" value="${assembly.version.file}" />
-->
</attributes>