Skip to content

Commit 1e9bc82

Browse files
arturcicarturcic
committed
cleanup gitversion task packaging
1 parent 026bcbb commit 1e9bc82

File tree

3 files changed

+24
-25
lines changed

3 files changed

+24
-25
lines changed

‎src/GitVersionExe/GitVersionExe.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<ItemGroup Condition="'$(TargetFramework)'=='net472'">
2626
<PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" />
2727
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
28-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
2928
</ItemGroup>
3029

3130
<ItemGroup>

‎src/GitVersionTask/GitVersionTask.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
<DevelopmentDependency>true</DevelopmentDependency>
1212

1313
<LangVersion>8.0</LangVersion>
14-
</PropertyGroup>
14+
</PropertyGroup>
1515

1616
<ItemGroup>
17+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
1718
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" PrivateAssets="All">
1819
<Publish>true</Publish>
1920
</PackageReference>
20-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
21+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" PrivateAssets="All">
22+
<Publish>true</Publish>
23+
</PackageReference>
2124
</ItemGroup>
2225

2326
<ItemGroup>

‎src/GitVersionTask/nuget-files.props‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,35 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
4-
<RootPublish>../GitVersionExe</RootPublish>
5-
<FullPublish>$(RootPublish)/bin/$(Configuration)/net472</FullPublish>
6-
<CorePublish>$(RootPublish)/bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
74
<FullPublishTask>bin/$(Configuration)/net472</FullPublishTask>
85
<CorePublishTask>bin/$(Configuration)/netcoreapp2.1/publish</CorePublishTask>
96
<FullTarget>tools/net472</FullTarget>
107
<CoreTarget>tools/netstandard2.0</CoreTarget>
118
</PropertyGroup>
129
<ItemGroup>
13-
<None Include="build/*.*" Pack="true" PackagePath="build" />
14-
<None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
10+
<None Include="build/*.*" Pack="true" PackagePath="build" />
11+
<None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
1512

16-
<None Include="$(CorePublish)/runtimes/**/*.so" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
17-
<None Include="$(CorePublish)/runtimes/**/*.dylib" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
18-
<None Include="$(CorePublish)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
19-
<None Include="$(CorePublish)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />
13+
<None Include="$(CorePublishTask)/runtimes/**/*.so" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
14+
<None Include="$(CorePublishTask)/runtimes/**/*.dylib" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
15+
<None Include="$(CorePublishTask)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
16+
<None Include="$(CorePublishTask)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />
2017

21-
<None Include="$(CorePublishTask)/GitVersion*" Pack="true" PackagePath="$(CoreTarget)" />
22-
<None Include="$(CorePublish)/LibGit2Sharp.dll" Pack="true" PackagePath="$(CoreTarget)" />
23-
<None Include="$(CorePublish)/YamlDotNet.dll" Pack="true" PackagePath="$(CoreTarget)" />
24-
<None Include="$(CorePublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(CoreTarget)" />
25-
<None Include="$(CorePublish)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(CoreTarget)" />
18+
<None Include="$(CorePublishTask)/GitVersion*" Pack="true" PackagePath="$(CoreTarget)" />
19+
<None Include="$(CorePublishTask)/LibGit2Sharp.dll" Pack="true" PackagePath="$(CoreTarget)" />
20+
<None Include="$(CorePublishTask)/YamlDotNet.dll" Pack="true" PackagePath="$(CoreTarget)" />
21+
<None Include="$(CorePublishTask)/Microsoft.Extensions*" Pack="true" PackagePath="$(CoreTarget)" />
22+
<None Include="$(CorePublishTask)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(CoreTarget)" />
2623

27-
<None Include="$(FullPublish)/lib/linux-x64/*.so" Pack="true" PackagePath="$(FullTarget)/lib/linux-x64" />
28-
<None Include="$(FullPublish)/lib/osx/*.dylib" Pack="true" PackagePath="$(FullTarget)/lib/osx" />
29-
<None Include="$(FullPublish)/lib/win32/**/*.dll" Pack="true" PackagePath="$(FullTarget)/lib/win32" />
24+
<None Include="$(FullPublishTask)/lib/linux-x64/*.so" Pack="true" PackagePath="$(FullTarget)/lib/linux-x64" />
25+
<None Include="$(FullPublishTask)/lib/osx/*.dylib" Pack="true" PackagePath="$(FullTarget)/lib/osx" />
26+
<None Include="$(FullPublishTask)/lib/win32/**/*.dll" Pack="true" PackagePath="$(FullTarget)/lib/win32" />
3027

31-
<None Include="$(FullPublishTask)/GitVersion*" Pack="true" PackagePath="$(FullTarget)" />
32-
<None Include="$(FullPublish)/LibGit2Sharp.*" Pack="true" PackagePath="$(FullTarget)" />
33-
<None Include="$(FullPublish)/YamlDotNet.dll" Pack="true" PackagePath="$(FullTarget)" />
34-
<None Include="$(FullPublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(FullTarget)" />
35-
<None Include="$(FullPublish)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(FullTarget)" />
28+
<None Include="$(FullPublishTask)/GitVersion*" Pack="true" PackagePath="$(FullTarget)" />
29+
<None Include="$(FullPublishTask)/LibGit2Sharp.*" Pack="true" PackagePath="$(FullTarget)" />
30+
<None Include="$(FullPublishTask)/YamlDotNet.dll" Pack="true" PackagePath="$(FullTarget)" />
31+
<None Include="$(FullPublishTask)/Microsoft.Extensions*" Pack="true" PackagePath="$(FullTarget)" />
32+
<None Include="$(FullPublishTask)/Microsoft.Bcl.AsyncInterfaces.dll" Pack="true" PackagePath="$(FullTarget)" />
3633

3734
</ItemGroup>
3835
</Project>

0 commit comments

Comments
 (0)