Skip to content

Commit 5145245

Browse files
arturcicarturcic
committed
(build) removed GitVersion.Tool proj file, same effect achieved using propertygroups
1 parent f953257 commit 5145245

File tree

6 files changed

+14
-30
lines changed

6 files changed

+14
-30
lines changed

‎README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ works out the [semantic version][semver] of the commit being built.
1616
| **Docs** | [![Docs][docs-badge]][docs] | [![Docs][docs-pre-badge]][docs-pre] |
1717
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] | - |
1818
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] | [![Chocolatey][choco-pre-badge]][choco] |
19-
| **GitVersionCore** | [![NuGet][gvc-badge]][gvc] | [![NuGet][gvc-pre-badge]][gvc] |
2019
| **GitVersionTask** | [![NuGet][gvt-badge]][gvt] | [![NuGet][gvt-pre-badge]][gvt] |
2120
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] | [![NuGet][gvcl-pre-badge]][gvcl] |
2221
| **GitVersion.CommandLine.DotNetCore** | [![NuGet][gvcd-badge]][gvcd] | [![NuGet][gvcd-pre-badge]][gvcd] |
@@ -81,9 +80,6 @@ from The Noun Project.
8180
[choco]: https://chocolatey.org/packages/GitVersion.Portable
8281
[choco-badge]: https://img.shields.io/chocolatey/v/gitversion.portable.svg
8382
[choco-pre-badge]: https://img.shields.io/chocolatey/vpre/gitversion.portable.svg
84-
[gvc]: https://www.nuget.org/packages/GitVersionCore
85-
[gvc-badge]: https://img.shields.io/nuget/v/GitVersionCore.svg
86-
[gvc-pre-badge]: https://img.shields.io/nuget/vpre/GitVersionCore.svg
8783
[gvt]: https://www.nuget.org/packages/GitVersionTask
8884
[gvt-badge]: https://img.shields.io/nuget/v/GitVersionTask.svg
8985
[gvt-pre-badge]: https://img.shields.io/nuget/vpre/GitVersionTask.svg

‎build/pack.cake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,11 @@ Task("Pack-Nuget")
271271
MSBuildSettings = parameters.MSBuildSettings
272272
};
273273

274-
// GitVersionCore, GitVersionTask, & global tool
275-
DotNetCorePack("./src/GitVersionCore", settings);
274+
// GitVersionTask, & global tool
276275
DotNetCorePack("./src/GitVersionTask", settings);
277-
DotNetCorePack("./src/GitVersionExe/GitVersion.Tool.csproj", settings);
276+
277+
settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
278+
DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);
278279
});
279280

280281
Task("Pack-Chocolatey")

‎src/GitVersion.sln

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe.Tests", "GitV
3232
EndProject
3333
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
3434
EndProject
35-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.Tool", "GitVersionExe\GitVersion.Tool.csproj", "{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}"
36-
EndProject
3735
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionTask.MsBuild", "GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj", "{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}"
3836
EndProject
3937
Global
@@ -66,10 +64,6 @@ Global
6664
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
6765
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
6866
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.Build.0 = Release|Any CPU
69-
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
70-
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
71-
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.Build.0 = Release|Any CPU
7367
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7468
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
7569
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/GitVersionExe/GitVersion.Tool.csproj

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
<OutputType>Exe</OutputType>
55
<RootNamespace>GitVersion</RootNamespace>
66
<AssemblyName>GitVersion</AssemblyName>
7-
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net472;netcoreapp2.1</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(PackAsTool)' != 'true' ">net472;netcoreapp2.1</TargetFrameworks>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
99
<PlatformTarget>AnyCPU</PlatformTarget>
1010
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1111
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
1212
<NoWarn>1591</NoWarn>
1313
</PropertyGroup>
1414

15+
<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
16+
<ToolCommandName>dotnet-gitversion</ToolCommandName>
17+
<PackageId>GitVersion.Tool</PackageId>
18+
<PackageDescription>Derives SemVer information from a repository following GitFlow or GitHubFlow. This is the .NET Core Global Tool allowing usage of GitVersion from command line.</PackageDescription>
19+
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
20+
</PropertyGroup>
21+
1522
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
1623
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
1724
</ItemGroup>

‎src/GitVersionTask/GitVersionTask.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
<IsPackable>true</IsPackable>
77

8+
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
9+
810
<NuspecFile>GitVersionTask.nuspec</NuspecFile>
911
<NuspecBasePath>bin\$(Configuration)</NuspecBasePath>
10-
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
1112
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
1213

1314
<DevelopmentDependency>true</DevelopmentDependency>

0 commit comments

Comments
 (0)