Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
remove UtilPack dependency for GitVersionTask
  • Loading branch information
arturcic committed May 16, 2019
commit afb480519dbc49da5a174cf17067dba7a0bcb884
16 changes: 1 addition & 15 deletions src/GitVersionTask/GitVersionTask.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="$(MSBuildThisFileDirectory)\UtilPack.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\UtilPack.Version.props')" />

<PropertyGroup>
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
Expand All @@ -17,19 +15,11 @@

<NuspecFile>NugetAssets\GitVersionTask.nuspec</NuspecFile>
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
<NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);utilpackversion=$(PackageVersion_UtilPackNuGetMSBuild);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>
<NuspecProperties>version=$(PackageVersion);configuration=$(Configuration);libgit2sharpversion=$(PackageVersion_LibGit2Sharp);yamldotnetversion=$(PackageVersion_YamlDotNet)</NuspecProperties>

<Product>$(AssemblyName)</Product>

</PropertyGroup>
<ItemGroup>
<None Remove="UtilPack.Version.props" />
</ItemGroup>
<ItemGroup>
<Content Include="UtilPack.Version.props">
<PackagePath>build\</PackagePath>
</Content>
</ItemGroup>

<ItemGroup>
<!--<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
Expand All @@ -39,10 +29,6 @@
</PackageReference>
<!--See https://github.com/Microsoft/msbuild/issues/3671 for reason for the ExcludeAssets against msbuild packagerefernces -->
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.0.461" ExcludeAssets="runtime" />
<PackageReference Include="UtilPack.NuGet.MSBuild" Version="$(PackageVersion_UtilPackNuGetMSBuild)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 1 addition & 6 deletions src/GitVersionTask/NugetAssets/build/GitVersionTask.targets
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<GitVersionTaskBuildTools_IsMultiTargeting>false</GitVersionTaskBuildTools_IsMultiTargeting>
<GitVersionTaskBuildTools_IsMultiTargeting Condition="$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/').EndsWith('buildMultiTargeting'))">true</GitVersionTaskBuildTools_IsMultiTargeting>
</PropertyGroup>

<!-- Import infrastructure props for util pack. -->
<ImportGroup>
<Import Project="$(MSBuildThisFileDirectory)..\build\Infrastructure.props"/>
</ImportGroup>

</Project>
42 changes: 0 additions & 42 deletions src/GitVersionTask/NugetAssets/build/Infrastructure.props

This file was deleted.

6 changes: 0 additions & 6 deletions src/GitVersionTask/UtilPack.Version.props

This file was deleted.