Skip to content

Commit ce19760

Browse files
authored
Merge pull request #1528 from arturcic/feature/GitVersion-Global-Tool
Publish as .NET Core Global Tool
2 parents 644d475 + 0fdac1b commit ce19760

8 files changed

+36
-12
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: csharp
22
sudo: required
33
dist: trusty
4-
dotnet: 2.1.401
4+
dotnet: 2.1.403
55
mono:
66
- latest
77
os:

azure-pipelines.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ jobs:
44
vmImage: 'macOS 10.13'
55
steps:
66
- task: DotNetCoreInstaller@0
7-
displayName: 'Use .NET Core sdk 2.1.401'
7+
displayName: 'Use .NET Core sdk 2.1.403'
88
inputs:
9-
version: 2.1.401
9+
version: 2.1.403
1010
- powershell: ./build.ps1 -script build.cake -target Default
1111
displayName: 'Cake build'
1212
- job: Linux
1313
pool:
1414
vmImage: 'Ubuntu 16.04'
1515
steps:
1616
- task: DotNetCoreInstaller@0
17-
displayName: 'Use .NET Core sdk 2.1.401'
17+
displayName: 'Use .NET Core sdk 2.1.403'
1818
inputs:
19-
version: 2.1.401
19+
version: 2.1.403
2020
- task: UseRubyVersion@0
2121
inputs:
2222
addToPath: true # Optional
@@ -27,9 +27,9 @@ jobs:
2727
vmImage: 'VS2017-Win2016'
2828
steps:
2929
- task: DotNetCoreInstaller@0
30-
displayName: 'Use .NET Core sdk 2.1.401'
30+
displayName: 'Use .NET Core sdk 2.1.403'
3131
inputs:
32-
version: 2.1.401
32+
version: 2.1.403
3333
- task: UseRubyVersion@0
3434
inputs:
3535
addToPath: true # Optional

build.cake

+2-1
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,10 @@ Task("Pack-Nuget")
335335
MSBuildSettings = parameters.MSBuildSettings
336336
};
337337

338-
// GitVersionCore & GitVersionTask
338+
// GitVersionCore, GitVersionTask, & global tool
339339
DotNetCorePack("./src/GitVersionCore", settings);
340340
DotNetCorePack("./src/GitVersionTask", settings);
341+
DotNetCorePack("./src/GitVersionExe/GitVersion.Tool.csproj", settings);
341342
});
342343

343344
Task("Pack-Chocolatey")

build/parameters.cake

+2-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public class BuildParameters
9494
Packages = BuildPackages.GetPackages(
9595
Paths.Directories.NugetRoot,
9696
Version.SemVersion,
97-
new [] { "GitVersion.CommandLine.DotNetCore", "GitVersion.CommandLine", "GitVersionCore", "GitVersionTask" },
97+
new [] { "GitVersion.CommandLine.DotNetCore", "GitVersion.CommandLine", "GitVersionCore", "GitVersionTask", "GitVersion.Tool" },
9898
new [] { "GitVersion.Portable" });
9999

100100
var files = Paths.Files;
@@ -113,6 +113,7 @@ public class BuildParameters
113113
["GitVersion.CommandLine.DotNetCore"] = Paths.Directories.ArtifactsBinNetCore,
114114
["GitVersion.CommandLine"] = Paths.Directories.ArtifactsBinFullFxCmdline,
115115
["GitVersion.Portable"] = Paths.Directories.ArtifactsBinFullFxPortable,
116+
["GitVersion.Tool"] = Paths.Directories.ArtifactsBinNetCore,
116117
};
117118

118119
Credentials = BuildCredentials.GetCredentials(context);

src/GitVersion.sln

+6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DockerBase", "DockerBase",
6969
Docker\Mono\DockerBase\readme = Docker\Mono\DockerBase\readme
7070
EndProjectSection
7171
EndProject
72+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.Tool", "GitVersionExe\GitVersion.Tool.csproj", "{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}"
73+
EndProject
7274
Global
7375
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7476
Debug|Any CPU = Debug|Any CPU
@@ -99,6 +101,10 @@ Global
99101
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
100102
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
101103
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.Build.0 = Release|Any CPU
104+
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
105+
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
106+
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
107+
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.Build.0 = Release|Any CPU
102108
EndGlobalSection
103109
GlobalSection(SolutionProperties) = preSolution
104110
HideSolutionNode = FALSE
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
4+
</PropertyGroup>
5+
</Project>
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
<Import Project="GitVersionExe.csproj" />
3+
4+
<PropertyGroup>
5+
<PackAsTool>true</PackAsTool>
6+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
7+
<ToolCommandName>dotnet-gitversion</ToolCommandName>
8+
<PackageId>GitVersion.Tool</PackageId>
9+
</PropertyGroup>
10+
11+
</Project>

src/global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sdk": {
3-
"version": "2.0.0"
4-
}
2+
"sdk": {
3+
"version": "2.1.403"
4+
}
55
}

0 commit comments

Comments
 (0)