Skip to content

Commit 9d18780

Browse files
arturcicarturcic
committed
(build) use csproj instead of nuspec for nuget package
1 parent eecf50e commit 9d18780

File tree

7 files changed

+55
-65
lines changed

7 files changed

+55
-65
lines changed

‎nuspec/GitVersion.CommandLine.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<owners>GitTools and Contributors</owners>
99
<license type="expression">MIT</license>
1010
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
11-
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
11+
<iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
1414
<language>en-AU</language>

‎nuspec/GitVersion.Portable.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<owners>GitTools and Contributors</owners>
99
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
1010
<projectUrl>https://github.com/GitTools/GitVersion</projectUrl>
11-
<iconUrl>https://raw.githubusercontent.com/GitTools/GitVersion/master/docs/img/package_icon.png</iconUrl>
11+
<iconUrl>https://raw.githubusercontent.com/GitTools/graphics/master/GitVersion/icon_100x100.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
1414
<language>en-AU</language>

‎src/Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1111
<PackageIcon>package_icon.png</PackageIcon>
1212
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
13+
<RepositoryUrl>https://github.com/GitTools/GitVersion.git</RepositoryUrl>
14+
<RepositoryType>git</RepositoryType>
15+
<PackageReleaseNotes>https://github.com/GitTools/GitVersion/releases</PackageReleaseNotes>
1316
<Company>$(Authors)</Company>
1417

1518
</PropertyGroup>
@@ -31,9 +34,6 @@
3134
</PropertyGroup>
3235

3336
<ItemGroup>
34-
<None Include="../../docs/img/package_icon.png">
35-
<Pack>True</Pack>
36-
<PackagePath></PackagePath>
37-
</None>
37+
<None Include="../../docs/img/package_icon.png" Pack="true" PackagePath="/" />
3838
</ItemGroup>
3939
</Project>

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@
77
<Import Project="..\test.msbuild" />
88
<ItemGroup>
99
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="16.3.0" />
10+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)"/>
11+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1"/>
1012
</ItemGroup>
1113
<ItemGroup>
1214
<Content Include="Approved\**\*.txt" />
1315
</ItemGroup>
1416
<ItemGroup>
15-
<ProjectReference Include="..\GitVersionTask\GitVersionTask.csproj" />
17+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
18+
<ProjectReference Include="..\GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj" />
19+
<ProjectReference Include="..\GitVersionTask\GitVersionTask.csproj" />
1620
</ItemGroup>
1721
<ItemGroup>
1822
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

‎src/GitVersionTask/GitVersionTask.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFrameworks>net472;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
55

6-
<IsPackable>true</IsPackable>
7-
6+
<PackageId>GitVersionTask</PackageId>
7+
<Title>GitVersionTask</Title>
88
<PackageVersion Condition="$(PackageVersion) == '' Or $(PackageVersion) == '*Undefined*'">0.0.1-alpha-0001</PackageVersion>
9-
10-
<NuspecFile>GitVersionTask.nuspec</NuspecFile>
11-
<NuspecBasePath>bin\$(Configuration)</NuspecBasePath>
12-
<NuspecProperties>version=$(PackageVersion)</NuspecProperties>
13-
9+
<Description>Stamps an assembly with git information based on SemVer.</Description>
10+
<IncludeBuildOutput>false</IncludeBuildOutput>
1411
<DevelopmentDependency>true</DevelopmentDependency>
1512

1613
<LangVersion>8.0</LangVersion>
14+
1715
</PropertyGroup>
1816
<ItemGroup>
19-
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
2017
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
18+
<PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" PrivateAssets="All" />
2119
</ItemGroup>
2220

2321
<ItemGroup>
24-
<ProjectReference Include="..\GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj" />
25-
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
22+
<ProjectReference Include="..\GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj" PrivateAssets="All" />
23+
<ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" PrivateAssets="All" />
2624
</ItemGroup>
25+
26+
<Import Project="nuget-files.props" />
2727
</Project>

‎src/GitVersionTask/GitVersionTask.nuspec

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

‎src/GitVersionTask/nuget-files.props

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<FullPublish>bin/$(Configuration)/net472</FullPublish>
5+
<CorePublish>bin/$(Configuration)/netcoreapp2.1/publish</CorePublish>
6+
<FullTarget>tools/net472</FullTarget>
7+
<CoreTarget>tools/netstandard2.0</CoreTarget>
8+
</PropertyGroup>
9+
<ItemGroup>
10+
<None Include="build/*.*" Pack="true" PackagePath="build" />
11+
<None Include="buildMultiTargeting/*.*" Pack="true" PackagePath="buildMultiTargeting" />
12+
13+
<None Include="$(CorePublish)/runtimes/**/*.so" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
14+
<None Include="$(CorePublish)/runtimes/**/*.dylib" Pack="true" PackagePath="$(CoreTarget)/runtimes" />
15+
<None Include="$(CorePublish)/runtimes/win-x86/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x86/native" />
16+
<None Include="$(CorePublish)/runtimes/win-x64/native/*.dll" Pack="true" PackagePath="$(CoreTarget)/runtimes/win-x64/native" />
17+
18+
<None Include="$(CorePublish)/GitVersion*" Pack="true" PackagePath="$(CoreTarget)" />
19+
<None Include="$(CorePublish)/LibGit2Sharp.dll" Pack="true" PackagePath="$(CoreTarget)" />
20+
<None Include="$(CorePublish)/Newtonsoft.Json.dll" Pack="true" PackagePath="$(CoreTarget)" />
21+
<None Include="$(CorePublish)/YamlDotNet.dll" Pack="true" PackagePath="$(CoreTarget)" />
22+
<None Include="$(CorePublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(CoreTarget)" />
23+
24+
<None Include="$(FullPublish)/lib/linux-x64/*.so" Pack="true" PackagePath="$(FullTarget)/lib/linux-x64" />
25+
<None Include="$(FullPublish)/lib/osx/*.dylib" Pack="true" PackagePath="$(FullTarget)/lib/osx" />
26+
<None Include="$(FullPublish)/lib/win32/**/*.dll" Pack="true" PackagePath="$(FullTarget)/lib/win32" />
27+
28+
<None Include="$(FullPublish)/GitVersion*" Pack="true" PackagePath="$(FullTarget)" />
29+
<None Include="$(FullPublish)/LibGit2Sharp.*" Pack="true" PackagePath="$(FullTarget)" />
30+
<None Include="$(FullPublish)/YamlDotNet.dll" Pack="true" PackagePath="$(FullTarget)" />
31+
<None Include="$(FullPublish)/Microsoft.Extensions*" Pack="true" PackagePath="$(FullTarget)" />
32+
</ItemGroup>
33+
</Project>

0 commit comments

Comments
 (0)