Skip to content

Commit

Permalink
(build) removed GitVersion.Tool proj file, same effect achieved using…
Browse files Browse the repository at this point in the history 
… propertygroups
  • Loading branch information
@arturcic
arturcic committed Aug 20, 2019
1 parent f953257 commit 5145245
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 30 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Expand Up @@ -16,7 +16,6 @@ works out the [semantic version][semver] of the commit being built.
| **Docs** | [![Docs][docs-badge]][docs] | [![Docs][docs-pre-badge]][docs-pre] |
| **GitHub Release** | [![GitHub release][gh-rel-badge]][gh-rel] | - |
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] | [![Chocolatey][choco-pre-badge]][choco] |
| **GitVersionCore** | [![NuGet][gvc-badge]][gvc] | [![NuGet][gvc-pre-badge]][gvc] |
| **GitVersionTask** | [![NuGet][gvt-badge]][gvt] | [![NuGet][gvt-pre-badge]][gvt] |
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] | [![NuGet][gvcl-pre-badge]][gvcl] |
| **GitVersion.CommandLine.DotNetCore** | [![NuGet][gvcd-badge]][gvcd] | [![NuGet][gvcd-pre-badge]][gvcd] |
Expand Down Expand Up @@ -81,9 +80,6 @@ from The Noun Project.
[choco]: https://chocolatey.org/packages/GitVersion.Portable
[choco-badge]: https://img.shields.io/chocolatey/v/gitversion.portable.svg
[choco-pre-badge]: https://img.shields.io/chocolatey/vpre/gitversion.portable.svg
[gvc]: https://www.nuget.org/packages/GitVersionCore
[gvc-badge]: https://img.shields.io/nuget/v/GitVersionCore.svg
[gvc-pre-badge]: https://img.shields.io/nuget/vpre/GitVersionCore.svg
[gvt]: https://www.nuget.org/packages/GitVersionTask
[gvt-badge]: https://img.shields.io/nuget/v/GitVersionTask.svg
[gvt-pre-badge]: https://img.shields.io/nuget/vpre/GitVersionTask.svg
Expand Down
7 changes: 4 additions & 3 deletions build/pack.cake
View file
Expand Up @@ -271,10 +271,11 @@ Task("Pack-Nuget")
MSBuildSettings = parameters.MSBuildSettings
};
// GitVersionCore, GitVersionTask, & global tool
DotNetCorePack("./src/GitVersionCore", settings);
// GitVersionTask, & global tool
DotNetCorePack("./src/GitVersionTask", settings);
DotNetCorePack("./src/GitVersionExe/GitVersion.Tool.csproj", settings);
settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
DotNetCorePack("./src/GitVersionExe/GitVersionExe.csproj", settings);
});

Task("Pack-Chocolatey")
Expand Down
6 changes: 0 additions & 6 deletions src/GitVersion.sln
View file
Expand Up @@ -32,8 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe.Tests", "GitV
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersion.Tool", "GitVersionExe\GitVersion.Tool.csproj", "{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionTask.MsBuild", "GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj", "{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}"
EndProject
Global
Expand Down Expand Up @@ -66,10 +64,6 @@ Global
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}.Release|Any CPU.Build.0 = Release|Any CPU
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{929263FD-5CD2-42E1-BF3D-E0C1B0320DA4}.Release|Any CPU.Build.0 = Release|Any CPU
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
15 changes: 0 additions & 15 deletions src/GitVersionExe/GitVersion.Tool.csproj
View file

This file was deleted.

9 changes: 8 additions & 1 deletion src/GitVersionExe/GitVersionExe.csproj
View file
Expand Up @@ -4,14 +4,21 @@
<OutputType>Exe</OutputType>
<RootNamespace>GitVersion</RootNamespace>
<AssemblyName>GitVersion</AssemblyName>
<TargetFrameworks Condition=" '$(TargetFrameworks)' == '' ">net472;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(PackAsTool)' != 'true' ">net472;netcoreapp2.1</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PlatformTarget>AnyCPU</PlatformTarget>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<DocumentationFile>bin\$(Configuration)\GitVersion.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
<ToolCommandName>dotnet-gitversion</ToolCommandName>
<PackageId>GitVersion.Tool</PackageId>
<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>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net472'">
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)"></PackageReference>
</ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/GitVersionTask/GitVersionTask.csproj
View file
Expand Up @@ -5,9 +5,10 @@

<IsPackable>true</IsPackable>

<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>

<NuspecFile>GitVersionTask.nuspec</NuspecFile>
<NuspecBasePath>bin\$(Configuration)</NuspecBasePath>
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>

<DevelopmentDependency>true</DevelopmentDependency>
Expand Down

0 comments on commit 5145245

Please sign in to comment.