You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2017/04/19 19:19:27 UTC
[1/2] lucenenet git commit: Version.proj: Updated documentation
comments with versioning instructions
Repository: lucenenet
Updated Branches:
refs/heads/api-work 29a249b78 -> 5be649a2d
Version.proj: Updated documentation comments with versioning instructions
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/6cd681dd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/6cd681dd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/6cd681dd
Branch: refs/heads/api-work
Commit: 6cd681dd0c9b636b7faf8899b19e3775aed57059
Parents: 29a249b
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Apr 20 00:46:56 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Apr 20 00:46:56 2017 +0700
----------------------------------------------------------------------
Version.proj | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/6cd681dd/Version.proj
----------------------------------------------------------------------
diff --git a/Version.proj b/Version.proj
index 4296667..91cc850 100644
--- a/Version.proj
+++ b/Version.proj
@@ -1,12 +1,13 @@
<Project>
+ <!-- IMPORTANT: When either of these values is changed, the TeamCity counter number should also be reset. -->
<PropertyGroup>
- <!-- IMPORTANT: VersionPrefix should always be the same as the Lucene version this is based on.
+ <!-- IMPORTANT: VersionPrefix must always be the same as the Lucene version this is based on.
Never increment it for an individual build - only increment this when an entire version's changes
are ported over from Lucene. This is what determines the version of all of the NuGet packages and binaries. -->
<VersionPrefix>4.8.0</VersionPrefix>
- <!-- VersionSuffix is the pre-release tag. A zero-padded version number will automatically be suffixed to this
- by the build script. -->
+ <!-- VersionSuffix is the pre-release tag. If non-empty, a zero-padded counter number
+ will automatically be suffixed to this by the build script (when running under TeamCity). -->
<VersionSuffix>beta</VersionSuffix>
</PropertyGroup>
[2/2] lucenenet git commit: build\build.ps1: Added property for
buildCounter to be passed into the script from TeamCity explicitly
Posted by ni...@apache.org.
build\build.ps1: Added property for buildCounter to be passed into the script from TeamCity explicitly
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5be649a2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5be649a2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5be649a2
Branch: refs/heads/api-work
Commit: 5be649a2d45c05725291f82bb94ae0a1c83b8c47
Parents: 6cd681d
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Thu Apr 20 02:11:52 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Thu Apr 20 02:17:38 2017 +0700
----------------------------------------------------------------------
build/build.ps1 | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5be649a2/build/build.ps1
----------------------------------------------------------------------
diff --git a/build/build.ps1 b/build/build.ps1
index 70e09c0..71ea307 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -6,6 +6,7 @@
[string]$nuget_package_directory = "$release_directory\NuGetPackages"
[string]$test_results_directory = "$release_directory\TestResults"
+ [string]$buildCounter = ""
[string]$packageVersion = "0.0.0"
[string]$version = "0.0.0"
[string]$configuration = "Release"
@@ -38,7 +39,7 @@ task Init -description "This task makes sure the build environment is correctly
}
#If $packageVersion is not passed in, get it from Version.proj
- if ([string]::IsNullOrEmpty($packageVersion) -or $packageVersion -eq "0.0.0") {
+ if ([string]::IsNullOrEmpty($packageVersion) -or $packageVersion -eq "0.0.0" -or ![string]::IsNullOrWhiteSpace($env:BuildCounter)) {
#Get the version info
$versionFile = "$base_directory\Version.proj"
$xml = [xml](Get-Content $versionFile)
@@ -47,14 +48,12 @@ task Init -description "This task makes sure the build environment is correctly
$versionSuffix = $xml.Project.PropertyGroup.VersionSuffix
Write-Host "VersionPrefix: $versionPrefix" -ForegroundColor Yellow
Write-Host "VersionSuffix: $versionSuffix" -ForegroundColor Yellow
-
- #build counter from TeamCity
- $buildCounter = "$env:build_counter"
- Write-Host "TeamCity buildCounter : $buildCounter"
+
if ([string]::IsNullOrEmpty($buildCounter)) {
- #attempt to get MyGet build counter
+ #attempt to get MyGet (or TeamCity) build counter environment variable
$buildCounter = "$env:BuildCounter"
}
+ Write-Host "buildCounter: $buildCounter"
if ([string]::IsNullOrWhiteSpace($versionSuffix)) {