Skip to content

Commit

Permalink
Merge branch 'stable'
Browse files Browse the repository at this point in the history
* stable:
  (version) 0.9.9.1
  (build) support fix version
  (GH-144) Don't use write-output for information
  • Loading branch information
ferventcoder committed Mar 3, 2015
2 parents 9567a91 + 00acd81 commit 37716fa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions .build/nugetBuild.step
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
<property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease}" if="${version.nuget.prerelease != ''}" />
<property name="nuget.version" value="${nuget.version + '.' + pkg.build.date}" if="${version.use.build_date and version.use_semanticversioning and version.nuget.prerelease == ''}" />
<property name="nuget.version" value="${nuget.version + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
<property name="nuget.version" value="${nuget.version + '.' + version.fix}" if="${version.fix != '0'}" />
<!-- version.use.build_date -->
<echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
</target>
Expand Down
4 changes: 2 additions & 2 deletions .build/versionBuilder.step
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@

<target name="generate_assembly_info" description="Generate assembly info">
<property name="version.assembly" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
<property name="version.assembly" value="${version.major}.${version.minor}.${version.patch}.0" if="${version.use_semanticversioning}" />
<property name="version.assembly" value="${version.major}.${version.minor}.${version.patch}.${version.fix}" if="${version.use_semanticversioning}" />
<echo level="Warning" message="Generating SolutionVersion.${language.short} with assembly version ${version.assembly}." />
<property name="version.file" value="${version.major}.${version.minor}.${version.build}.${version.revision}" />
<property name="version.file" value="${version.major}.${version.minor}.${version.patch}.${version.build}" if="${version.use_semanticversioning}" />
<property name="version.file" value="${version.major}.${version.minor}.${version.patch}.${version.fix}" if="${version.use_semanticversioning}" />
<property name="version.product" value="${version.hash}" />
<property name="version.product" value="${version.hash}" if="${version.use_semanticversioning}" />

Expand Down
1 change: 1 addition & 0 deletions .uppercut
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<property name="version.major" value="0" overwrite="false" />
<property name="version.minor" value="9" overwrite="false" />
<property name="version.patch" value="9" overwrite="false" />
<property name="version.fix" value="1" overwrite="false" />
<property name="version.nuget.prerelease" value="" overwrite="false" />
<property name="version.use.build_date" value="false" overwrite="false" />
<property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
Expand Down
2 changes: 1 addition & 1 deletion src/chocolatey.resources/helpers/functions/Get-BinRoot.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
function Get-BinRoot {

Write-Debug "Running 'Get-BinRoot'";
Write-Output "Get-BinRoot is going to be deprecated by v1. Many packages no longer require it since the folders no longer have versions on them."
Write-Host "Get-BinRoot is going to be deprecated by v1. Many packages no longer require it since the folders no longer have versions on them."

# Since CamelCase was decided upon when $env:ChocolateyInstall was first invented, whe should stick to this convention and use $env:ChocolateyBinRoot.
# I propose:
Expand Down

0 comments on commit 37716fa

Please sign in to comment.