Skip to content

Fix build & improve VSTS extension #776

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.

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 10 commits into from
Feb 4, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ build_script:

- cmd: 7z a "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip" -r .\build\GitVersionTfsTaskBuild\GitVersionTask\*.*
- cmd: appveyor PushArtifact "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip"
- cmd: appveyor PushArtifact "jakeginnivan.gitversion-%GitVersion_MajorMinorPatch%.vsix"
- cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\jakeginnivan.gitversion-%GitVersion_SemVer%.vsix"

test_script:
- nunit-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow
Expand Down
1 change: 1 addition & 0 deletions src/GitVersion.sln
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TfsTask", "TfsTask", "{A0ED
GitVersionTfsTask\Create-Vsix.ps1 = GitVersionTfsTask\Create-Vsix.ps1
GitVersionTfsTask\GitVersion.ps1 = GitVersionTfsTask\GitVersion.ps1
GitVersionTfsTask\icon.png = GitVersionTfsTask\icon.png
GitVersionTfsTask\extension-icon.png = GitVersionTfsTask\extension-icon.png
GitVersionTfsTask\manifest.json = GitVersionTfsTask\manifest.json
GitVersionTfsTask\overview.md = GitVersionTfsTask\overview.md
GitVersionTfsTask\task.json = GitVersionTfsTask\task.json
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe/GitVersionExe.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<!-- TfsBuildTask -->
<Copy SourceFiles="@(amd64)" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\NativeBinaries\amd64" />
<Copy SourceFiles="@(x86)" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\NativeBinaries\x86" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\extension-icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\manifest.json" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\overview.md" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\builds.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\img" />
Expand Down
Binary file added src/GitVersionTfsTask/extension-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 13 additions & 12 deletions src/GitVersionTfsTask/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
"manifestVersion": 1,
"id": "gitversion",
"name": "GitVersion",
"publisher": "jakeginnivan",
"author": "GitVersion Contributors",
"version": "$version$",
"description": "Easy Semantic Versioning (http://semver.org) for projects using Git, includes GitVersion Build Task",
"description": "Build task for easy semantic versioning for projects using Git.",
"targets": [
{
"id": "Microsoft.VisualStudio.Services"
Expand All @@ -19,24 +20,28 @@
"Build and release"
],
"icons": {
"default": "icon.png"
"default": "extension-icon.png"
},
"tags": [
"semver",
"git",
"versioning",
"gitflow",
"githubflow"
],
"links": {
"documentation": {
"uri": "http://gitversion.readthedocs.org/en/latest"
"learn": {
"uri": "http://gitversion.readthedocs.org/en/stable"
},
"getstarted": {
"uri": "http://gitversion.readthedocs.org/en/latest/build-server-support/build-server/tfs-build-vnext/#running-inside-tfs"
"uri": "http://gitversion.readthedocs.org/en/stable/build-server-support/build-server/tfs-build-vnext/#running-inside-tfs"
},
"repository": {
"uri": "https://github.com/GitTools/GitVersion"
}
"license": {
"uri": "https://github.com/GitTools/GitVersion/blob/master/LICENSE"
},
"support": {
"uri": "https://github.com/GitTools/GitVersion/issues"
}
},
"screenshots": [
{
Expand All @@ -51,10 +56,6 @@
"path": "overview.md"
}
},
"scopes": [
"vso.build",
"vso.build_execute"
],
"contributions": [
{
"id": "gitversion-task",
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTfsTask/overview.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Versioning when using git, solved. GitVersion looks at your git history and works out the semantic version (semver.org) of the commit being built.
Versioning when using Git, solved. GitVersion looks at your Git history and works out the [semantic version](http://semver.org) of the commit being built.

It works with most branching strategies but has been designed mainly around GitFlow and GitHubFlow (pull request workflow). The calculated version numbers can then be accessed through variables such as `$(GitVersion_NuGetVersion)` and `$(GitVersion_SemVer)`. It is also very configurable to allow it to work with most release workflows!

Expand Down