Skip to content

Commit 0a6df1d

Browse files
AArnottAArnott
committed
Switch to nuspec file to solve the problem of target frameworks showing up in the built package
1 parent cee2a98 commit 0a6df1d

File tree

2 files changed

+55
-8
lines changed

2 files changed

+55
-8
lines changed

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.Tasks.csproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,7 @@
33
<TargetFrameworks>netcoreapp1.0;net45</TargetFrameworks>
44
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
55

6-
<PackageId>Nerdbank.GitVersioning</PackageId>
7-
<title>Nerdbank.GitVersioning</title>
8-
<authors>Andrew Arnott</authors>
9-
<owners>andarno</owners>
10-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
11-
<PackageProjectUrl>http://github.com/aarnott/Nerdbank.GitVersioning</PackageProjectUrl>
12-
<description>Stamps your assemblies with semver 2.0 compliant git commit specific version information and provides NuGet versioning information as well.</description>
13-
<PackageTags>git commit versioning version assemblyinfo</PackageTags>
6+
<NuSpecFile>Nerdbank.GitVersioning.nuspec</NuSpecFile>
147

158
<NoPackageAnalysis>true</NoPackageAnalysis>
169

@@ -26,6 +19,8 @@
2619
<Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
2720
<PropertyGroup>
2821
<PackageLicenseUrl>https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/$(GitCommitIdShort)/LICENSE.txt</PackageLicenseUrl>
22+
<LibGit2SharpNativeBinaries>$(NuGetPackageRoot)libgit2sharp.nativebinaries\1.0.165\</LibGit2SharpNativeBinaries>
23+
<NuspecProperties>$(NuspecProperties);LicenseUrl=$(PackageLicenseUrl);Version=$(Version);BaseOutputPath=$(OutputPath);LibGit2SharpNativeBinaries=$(LibGit2SharpNativeBinaries)</NuspecProperties>
2924
</PropertyGroup>
3025
</Target>
3126

‎src/Nerdbank.GitVersioning.Tasks/Nerdbank.GitVersioning.nuspec‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
3+
<metadata>
4+
<id>Nerdbank.GitVersioning</id>
5+
<version>$version$</version>
6+
<title>Nerdbank.GitVersioning</title>
7+
<authors>Andrew Arnott</authors>
8+
<owners>aarnott</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<developmentDependency>true</developmentDependency>
11+
<licenseUrl>$LicenseUrl$</licenseUrl>
12+
<projectUrl>http://github.com/aarnott/Nerdbank.GitVersioning</projectUrl>
13+
<description>Stamps your assemblies with semver 2.0 compliant git commit specific version information and provides NuGet versioning information as well.</description>
14+
<tags>git commit versioning version assemblyinfo</tags>
15+
</metadata>
16+
<files>
17+
<file src="$BaseOutputPath$net45\LibGit2Sharp.dll" target="build\MSBuildFull\LibGit2Sharp.dll" />
18+
<file src="$BaseOutputPath$net45\LibGit2Sharp.dll.config" target="build\MSBuildFull\LibGit2Sharp.dll.config" />
19+
<file src="$BaseOutputPath$net45\MSBuildExtensionTask.dll" target="build\MSBuildFull\MSBuildExtensionTask.dll" />
20+
<file src="$BaseOutputPath$net45\NerdBank.GitVersioning.dll" target="build\MSBuildFull\NerdBank.GitVersioning.dll" />
21+
<file src="$BaseOutputPath$net45\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildFull\Nerdbank.GitVersioning.Tasks.dll" />
22+
<file src="$BaseOutputPath$net45\Newtonsoft.Json.dll" target="build\MSBuildFull\Newtonsoft.Json.dll" />
23+
<file src="$BaseOutputPath$net45\Validation.dll" target="build\MSBuildFull\Validation.dll" />
24+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.dll" target="build\MSBuildFull\lib\win32\x64\git2-1196807.dll" />
25+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.dll" target="build\MSBuildCore\lib\win32\x64\git2-1196807.dll" />
26+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.pdb" target="build\MSBuildFull\lib\win32\x64\git2-1196807.pdb" />
27+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x64\native\git2-1196807.pdb" target="build\MSBuildCore\lib\win32\x64\git2-1196807.pdb" />
28+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.dll" target="build\MSBuildFull\lib\win32\x86\git2-1196807.dll" />
29+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.dll" target="build\MSBuildCore\lib\win32\x86\git2-1196807.dll" />
30+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.pdb" target="build\MSBuildFull\lib\win32\x86\git2-1196807.pdb" />
31+
<file src="$LibGit2SharpNativeBinaries$runtimes\win7-x86\native\git2-1196807.pdb" target="build\MSBuildCore\lib\win32\x86\git2-1196807.pdb" />
32+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-1196807.dylib" target="build\MSBuildFull\lib\osx\libgit2-1196807.dylib" />
33+
<file src="$LibGit2SharpNativeBinaries$runtimes\osx\native\libgit2-1196807.dylib" target="build\MSBuildCore\lib\osx\libgit2-1196807.dylib" />
34+
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-1196807.so" target="build\MSBuildFull\lib\linux\x86_64\libgit2-1196807.so" />
35+
<file src="$LibGit2SharpNativeBinaries$runtimes\linux-x64\native\libgit2-1196807.so" target="build\MSBuildCore\lib\linux\x86_64\libgit2-1196807.so" />
36+
<file src="$LibGit2SharpNativeBinaries$libgit2\LibGit2Sharp.dll.config" target="build\MSBuildCore\LibGit2Sharp.dll.config" />
37+
<file src="$BaseOutputPath$netcoreapp1.0\LibGit2Sharp.dll" target="build\MSBuildCore\LibGit2Sharp.dll" />
38+
<file src="$BaseOutputPath$netcoreapp1.0\MSBuildExtensionTask.dll" target="build\MSBuildCore\MSBuildExtensionTask.dll" />
39+
<file src="$BaseOutputPath$netcoreapp1.0\NerdBank.GitVersioning.dll" target="build\MSBuildCore\NerdBank.GitVersioning.dll" />
40+
<file src="$BaseOutputPath$netcoreapp1.0\Nerdbank.GitVersioning.Tasks.dll" target="build\MSBuildCore\Nerdbank.GitVersioning.Tasks.dll" />
41+
<file src="$BaseOutputPath$netcoreapp1.0\Newtonsoft.Json.dll" target="build\MSBuildCore\Newtonsoft.Json.dll" />
42+
<file src="$BaseOutputPath$netcoreapp1.0\Validation.dll" target="build\MSBuildCore\Validation.dll" />
43+
44+
<file src="build\Nerdbank.GitVersioning.targets" target="build\Nerdbank.GitVersioning.targets" />
45+
<file src="buildCrossTargeting\Nerdbank.GitVersioning.targets" target="buildCrossTargeting\Nerdbank.GitVersioning.targets" />
46+
<file src="tools\Create-VersionFile.ps1" target="tools\Create-VersionFile.ps1" />
47+
<file src="tools\Get-CommitId.ps1" target="tools\Get-CommitId.ps1" />
48+
<file src="tools\Get-Version.ps1" target="tools\Get-Version.ps1" />
49+
<file src="tools\Install.ps1" target="tools\Install.ps1" />
50+
<file src="readme.txt" target="readme.txt" />
51+
</files>
52+
</package>

0 commit comments

Comments
 (0)