Commit 20fb25b3 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Fixed `BuildFunctions` to use only git information.

parent 80fce917
...@@ -35,13 +35,6 @@ function Get-Published-PreRelase-Package ($PackageId) ...@@ -35,13 +35,6 @@ function Get-Published-PreRelase-Package ($PackageId)
return $version return $version
} }
function Get-Published-PreRelase-Package-Version ($PackageId)
{
$version = Get-Published-PreRelase-Package $PackageId
$version = $version.Split('-')[0]
return $version
}
function Get-Published-Package ($PackageId) function Get-Published-Package ($PackageId)
{ {
$out = [string](nuget list id:$PackageId) $out = [string](nuget list id:$PackageId)
...@@ -49,13 +42,6 @@ function Get-Published-Package ($PackageId) ...@@ -49,13 +42,6 @@ function Get-Published-Package ($PackageId)
return $version return $version
} }
function Get-Published-Package-Version ($PackageId)
{
$version = Get-Published-Package $PackageId
$version = $version.Split('-')[0]
return $version
}
function Get-Git-Package-Version () function Get-Git-Package-Version ()
{ {
Update-Ensure-Git-Not-Detached Update-Ensure-Git-Not-Detached
...@@ -171,16 +157,13 @@ function Test-Tag-Build ($nugetGitVersion, $buildMetaData, $fullSemVer) { ...@@ -171,16 +157,13 @@ function Test-Tag-Build ($nugetGitVersion, $buildMetaData, $fullSemVer) {
return $false return $false
} }
function Test-Stable-Release ($stableVersion, $preReleaseVersion, $nugetGitVersion, $buildMetaData, $fullSemVer) function Test-Stable-Release ($nugetGitVersion, $buildMetaData, $fullSemVer)
{ {
# This is unlikelly to heppen, but could happen if the tag creation didn't triggered the Package # This is unlikelly to heppen, but could happen if the tag creation didn't triggered the Package
if ($stableVersion -ne $preReleaseVersion -and $preReleaseVersion -ne $nugetGitVersion) {
return 1
}
if (Test-Tag-Build $nugetGitVersion $buildMetaData $fullSemVer) { if (Test-Tag-Build $nugetGitVersion $buildMetaData $fullSemVer) {
return 2 return $true
} }
return 0 return $false
} }
function Set-Forced-Git-Version ($version) function Set-Forced-Git-Version ($version)
...@@ -200,9 +183,6 @@ function Get-Prefix-Name () ...@@ -200,9 +183,6 @@ function Get-Prefix-Name ()
function Get-Next-Version-String ($PackageId) function Get-Next-Version-String ($PackageId)
{ {
$stableVersion = Get-Published-Package-Version ($PackageId)
$preReleaseVersion = Get-Published-PreRelase-Package-Version ($PackageId)
$nugetGitVersion = Get-Git-Package-Version $nugetGitVersion = Get-Git-Package-Version
$buildMetaData = Get-Git-Build-MetaData $buildMetaData = Get-Git-Build-MetaData
$fullSemVer = Get-Git-Full-Sem-Ver $fullSemVer = Get-Git-Full-Sem-Ver
...@@ -213,11 +193,8 @@ function Get-Next-Version-String ($PackageId) ...@@ -213,11 +193,8 @@ function Get-Next-Version-String ($PackageId)
$prefix = $prefix.Replace(".", "") $prefix = $prefix.Replace(".", "")
$nextVersion = "" $nextVersion = ""
$stable = Test-Stable-Release $stableVersion $preReleaseVersion $nugetGitVersion $buildMetaData $fullSemVer $stable = Test-Stable-Release $nugetGitVersion $buildMetaData $fullSemVer
if ($stable -eq 1){ if ($stable){
$nextVersion = $preReleaseVersion
Set-Forced-Git-Version $nextVersion
} elseif ($stable -eq 2) {
$nextVersion = $nugetGitVersion $nextVersion = $nugetGitVersion
} else { } else {
$nextVersion = "$($nugetGitVersion)-$($prefix)-build$($buildMetaData)" $nextVersion = "$($nugetGitVersion)-$($prefix)-build$($buildMetaData)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment