Skip to content

Commit afb4805

Browse files
committed
remove UtilPack dependency for GitVersionTask
1 parent ccd343d commit afb4805

File tree

4 files changed

+2
-69
lines changed

4 files changed

+2
-69
lines changed

src/GitVersionTask/GitVersionTask.csproj

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33

4-
<Import Project="$(MSBuildThisFileDirectory)\UtilPack.Version.props" Condition="exists('$(MSBuildThisFileDirectory)\UtilPack.Version.props')" />
5-
64
<PropertyGroup>
75
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
86
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -17,19 +15,11 @@
1715

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

2220
<Product>$(AssemblyName)</Product>
2321

2422
</PropertyGroup>
25-
<ItemGroup>
26-
<None Remove="UtilPack.Version.props" />
27-
</ItemGroup>
28-
<ItemGroup>
29-
<Content Include="UtilPack.Version.props">
30-
<PackagePath>build\</PackagePath>
31-
</Content>
32-
</ItemGroup>
3323

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

4834
<ItemGroup>
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

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

8-
<!-- Import infrastructure props for util pack. -->
9-
<ImportGroup>
10-
<Import Project="$(MSBuildThisFileDirectory)..\build\Infrastructure.props"/>
11-
</ImportGroup>
12-
138
</Project>

src/GitVersionTask/NugetAssets/build/Infrastructure.props

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

src/GitVersionTask/UtilPack.Version.props

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

0 commit comments

Comments
 (0)