Skip to content

Make version comply to SemVer #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2015
Merged

Make version comply to SemVer #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions LibGit2Sharp.Tests/GlobalSettingsFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Text.RegularExpressions;
using System.Text.RegularExpressions;
using LibGit2Sharp.Tests.TestHelpers;
using Xunit;

Expand All @@ -20,33 +19,35 @@ public void CanGetMinimumCompiledInFeatures()
public void CanRetrieveValidVersionString()
{
// Version string format is:
// Major.Minor.Patch-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)
// Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)
// Example output:
// "0.17.0-unknown-06d772d (x86 - Threads, Https)"
// "0.17.0[-pre20170914123547]-deadcafe-06d772d (x86 - Threads, Https)"

string versionInfo = GlobalSettings.Version.ToString();

// The GlobalSettings.Version returned string should contain :
// version: '0.17.0[.198[-pre]]' LibGit2Sharp version number.
// version: '0.17.0[-pre20170914123547]' LibGit2Sharp version number.
// git2SharpHash:'unknown' ( when compiled from source ) else LibGit2Sharp library hash.
// git2hash: '06d772d' LibGit2 library hash.
// arch: 'x86' or 'amd64' LibGit2 target.
// git2Features: 'Threads, Ssh' LibGit2 features compiled with.
string regex = @"^(?<version>\d{1,}\.\d{1,2}\.\d{1,3}(\.\d{1,5}(-pre)?)?)-(?<git2SharpHash>\w+)-(?<git2Hash>\w+) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
string regex = @"^(?<version>\d{1,}\.\d{1,2}\.\d{1,3}(-(pre|dev)\d{14})?)-(?<git2SharpHash>\w+)-(?<git2Hash>\w+) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";

Assert.NotNull(versionInfo);

Match regexResult = Regex.Match(versionInfo, regex);

Assert.True(regexResult.Success, "The following version string format is enforced:" +
"Major.Minor.Patch[.Build['-pre']]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)");
"Major.Minor.Patch[-preDateTime]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|amd64 - features)");

GroupCollection matchGroups = regexResult.Groups;

Assert.Equal(8, matchGroups.Count);

// Check that all groups are valid
for (int i = 0; i < matchGroups.Count; i++)
{
if (i == 1 || i == 2) // Build number and '-pre' are optional
if (i == 1 || i == 2) // '-pre' segment is optional
{
continue;
}
Expand Down
6 changes: 3 additions & 3 deletions LibGit2Sharp/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("0.21.0")]
[assembly: AssemblyFileVersion("0.21.0")]
[assembly: AssemblyInformationalVersion("0.21.0")]
[assembly: AssemblyVersion("0.22.0")]
[assembly: AssemblyFileVersion("0.22.0")]
[assembly: AssemblyInformationalVersion("0.22.0-dev00000000000000")]
15 changes: 9 additions & 6 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '0.21.0.{build}'
version: '{build}'

branches:
only:
Expand All @@ -10,6 +10,7 @@ skip_tags: true
clone_folder: C:\projects\libgit2sharp

environment:
version : 0.22.0
matrix:
- xunit_runner: xunit.console.clr4.exe
Arch: 64
Expand All @@ -22,15 +23,17 @@ matrix:
install:
- ps: |
Write-Host "Commit being built = $($Env:APPVEYOR_REPO_COMMIT)"
Write-Host "Current build version = $($Env:APPVEYOR_BUILD_VERSION)"
Write-Host "Current build version = $($Env:VERSION)"
Write-Host "Target branch = $($Env:APPVEYOR_REPO_BRANCH)"
Write-Host "Is a Pull Request = $($Env:APPVEYOR_PULL_REQUEST_NUMBER -ne $null)"
$BuildDate = (Get-Date).ToUniversalTime().ToString("yyyyMMddHHmmss")
Write-Host "Build UTC date = $BuildDate"
$VersionSuffix = ""
If ($Env:APPVEYOR_REPO_BRANCH -ne "master")
{
$VersionSuffix = "-pre"
$VersionSuffix = "-pre$BuildDate"
}
$Version = "$($Env:APPVEYOR_BUILD_VERSION)$($VersionSuffix)"
$Version = "$($Env:VERSION)$($VersionSuffix)"
$Env:ASSEMBLY_INFORMATIONAL_VERSION = $Version
Write-Host "Assembly informational version = $($Env:ASSEMBLY_INFORMATIONAL_VERSION)"
$ShouldPublishNugetArtifact = "$($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)"
Expand All @@ -40,8 +43,8 @@ install:
assembly_info:
patch: true
file: LibGit2Sharp\Properties\AssemblyInfo.cs
assembly_version: '{version}'
assembly_file_version: '{version}'
assembly_version: '$(VERSION)'
assembly_file_version: '$(VERSION)'
assembly_informational_version: '$(ASSEMBLY_INFORMATIONAL_VERSION)'

cache:
Expand Down