Skip to content

Commit 993d893

Browse files
committed
Complete configuration of NuGet package
1 parent 1ece70d commit 993d893

File tree

5 files changed

+40
-10
lines changed

5 files changed

+40
-10
lines changed

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<PropertyGroup>
44
<Authors>Pieter van Ginkel, Git Extensions</Authors>
55
<Company>Git Extensions</Company>
6-
<RepositoryUrl>https://github.com/gitextensions/GitExtensions.GerritPlugin</RepositoryUrl>
6+
<PackageProjectUrl>https://github.com/gitextensions/GitExtensions.GerritPlugin</PackageProjectUrl>
7+
<Description>Git Extensions plugin for integration with Gerrit.</Description>
78
<LangVersion>latest</LangVersion>
89
<Version>0.0.0</Version>
910
<AssemblyVersion>0.0.0.1</AssemblyVersion>

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 1.0.0.{build}
77

88
# version suffix, if any (e.g. '-RC1', '-beta' otherwise '')
99
environment:
10-
version_suffix: '-RC1'
10+
version_suffix: ''
1111

1212
# Do not build on tags (GitHub and BitBucket)
1313
skip_tags: true

src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.csproj

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,22 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1" />
14-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.5.132" />
15-
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
16-
<PackageReference Include="NUnit" Version="3.12.0" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
14+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
15+
</PackageReference>
16+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="16.5.132">
17+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
18+
</PackageReference>
19+
<PackageReference Include="Newtonsoft.Json" Version="10.0.3">
20+
<ReferenceOutputAssembly>true</ReferenceOutputAssembly>
21+
</PackageReference>
22+
<PackageReference Include="NUnit" Version="3.12.0">
23+
<PrivateAssets>all</PrivateAssets>
24+
</PackageReference>
1725
</ItemGroup>
1826

1927
<ItemGroup>
20-
<PackageReference Include="GitExtensions.Extensibility" Version="0.1.1.40" />
28+
<PackageReference Include="GitExtensions.Extensibility" Version="0.1.*" />
2129
</ItemGroup>
2230

2331
<ItemGroup>
@@ -46,6 +54,13 @@
4654
<None Include="Resources\GerritPublish.png" />
4755
<None Include="Resources\IconGerrit.png" />
4856
</ItemGroup>
57+
58+
59+
<!-- Pack as .nupkg with dependency on GitExtensions.Extensibility -->
60+
<PropertyGroup>
61+
<NuspecFile>$(MSBuildThisFileDirectory)$(MSBuildProjectName).nuspec</NuspecFile>
62+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
63+
</PropertyGroup>
4964

5065
<ItemGroup>
5166
<Compile Update="Properties\Resources.Designer.cs">
@@ -60,4 +75,18 @@
6075
<EmbeddedResource Update="Properties\Resources.resx" Generator="ResXFileCodeGenerator" LastGenOutput="Resources.Designer.cs" />
6176
</ItemGroup>
6277

78+
<Target Name="SetPackageProperties" BeforeTargets="GenerateNuspec">
79+
<PropertyGroup>
80+
<NuspecProperties>
81+
id=$(PackageId);
82+
version=$(Version);
83+
authors=$(Authors);
84+
description=$(Description);
85+
iconUrl=$(PackageIconUrl);
86+
projectUrl=$(PackageProjectUrl);
87+
tags=$(PackageTags.Replace(';',' '));
88+
configuration=$(Configuration);
89+
</NuspecProperties>
90+
</PropertyGroup>
91+
</Target>
6392
</Project>

src/GitExtensions.GerritPlugin/GitExtensions.GerritPlugin.nuspec

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>$id$</id>
55
<version>$version$</version>
6-
<authors>$author$</authors>
6+
<authors>$authors$</authors>
77
<description>$description$</description>
88
<projectUrl>$projectUrl$</projectUrl>
99
<tags>$tags$</tags>
@@ -12,6 +12,7 @@
1212
</dependencies>
1313
</metadata>
1414
<files>
15-
<file src="bin/$configuration$/net461/GitExtensions.GerritPlugin.dll" target="/lib" />
15+
<file src="..\..\LICENSE.md" target="\" />
16+
<file src="bin\$configuration$\net461\GitExtensions.GerritPlugin.dll" target="\lib\net461\" />
1617
</files>
1718
</package>
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
33

4-
[assembly: AssemblyDescription("GitExtensions plugin for integration with Gerrit")]
54
[assembly: InternalsVisibleTo("GitExtensions.GerritPlugin.Tests")]

0 commit comments

Comments
 (0)