Fix packaging to include portable assembly

Author: AArnott

nuget.package/BuildNugetPackage.ps1

@@ -7,8 +7,6 @@
 #>
 
 Param(
-    [Parameter(Mandatory=$true)]
-    [string]$commitSha,
     [scriptblock]$postBuild
 )
 
@@ -60,34 +58,37 @@ Function Get-MSBuild {
 
 #################
 
+$configuration = 'release'
 $root = Split-Path -Parent -Path $MyInvocation.MyCommand.Definition
+$OutDir = Join-Path $root "bin\$configuration"
 $projectPath = Join-Path $root "..\LibGit2Sharp"
 $slnPath = Join-Path $projectPath "..\LibGit2Sharp.sln"
+$nuspecPath = Join-Path $root 'LibGit2Sharp.nuspec'
 
-Remove-Item (Join-Path $projectPath "*.nupkg")
-
-Clean-OutputFolder (Join-Path $projectPath "bin\")
-Clean-OutputFolder (Join-Path $projectPath "obj\")
-
-# The nuspec file needs to be next to the csproj, so copy it there during the pack operation
-Copy-Item (Join-Path $root "LibGit2Sharp.nuspec") $projectPath
+if (-not (Test-Path $OutDir)) {
+    $null = md $OutDir
+}
+Remove-Item (Join-Path $OutDir "*.nupkg")
 
-Push-Location $projectPath
+Push-Location $root
 
 try {
+  $DependencyBasePath = $null # workaround script issue in NB.GV
+  $versionInfo = & "$env:userprofile\.nuget\packages\Nerdbank.GitVersioning\1.5.51\tools\Get-Version.ps1"
+  $commitSha = $versionInfo.GitCommitId
+
   Set-Content -Encoding ASCII $(Join-Path $projectPath "libgit2sharp_hash.txt") $commitSha
   Run-Command { & "$(Join-Path $projectPath "..\Lib\NuGet\Nuget.exe")" Restore "$slnPath" }
-  Run-Command { & (Get-MSBuild) "$slnPath" "/verbosity:minimal" "/p:Configuration=Release" "/m" }
+  Run-Command { & (Get-MSBuild) "$slnPath" "/verbosity:minimal" "/p:Configuration=$configuration" "/m" }
 
   If ($postBuild) {
     Write-Host -ForegroundColor "Green" "Run post build script..."
     Run-Command { & ($postBuild) }
   }
 
-  Run-Command { & "$(Join-Path $projectPath "..\Lib\NuGet\Nuget.exe")" Pack -Prop Configuration=Release }
+  Run-Command { & "$(Join-Path $projectPath "..\Lib\NuGet\Nuget.exe")" Pack $nuspecPath -OutputDirectory $OutDir -Prop "Configuration=$configuration;GitCommitIdShort=$($versionInfo.GitCommitIdShort)" -Version "$($versionInfo.NuGetPackageVersion)" }
 }
 finally {
   Pop-Location
-  Remove-Item (Join-Path $projectPath "LibGit2Sharp.nuspec")
   Set-Content -Encoding ASCII $(Join-Path $projectPath "libgit2sharp_hash.txt") "unknown"
 }

nuget.package/LibGit2Sharp.nuspec

@@ -1,23 +1,26 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
   <metadata minClientVersion="2.7">
-    <id>$id$</id>
+    <id>LibGit2Sharp</id>
     <version>$version$</version>
-    <authors>$author$</authors>
-    <owners>nulltoken</owners>
-    <licenseUrl>https://github.com/libgit2/libgit2sharp/raw/master/LICENSE.md</licenseUrl>
+    <authors>LibGit2Sharp contributors</authors>
+    <owners>LibGit2Sharp contributors</owners>
+    <licenseUrl>https://github.com/libgit2/libgit2sharp/raw/$GitCommitIdShort$/LICENSE.md</licenseUrl>
     <projectUrl>https://github.com/libgit2/libgit2sharp/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <releaseNotes>https://github.com/libgit2/libgit2sharp/blob/master/CHANGES.md#libgit2sharp-changes</releaseNotes>
-    <iconUrl>https://github.com/libgit2/libgit2sharp/raw/master/square-logo.png</iconUrl>
+    <description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.</description>
+    <releaseNotes>https://github.com/libgit2/libgit2sharp/blob/$GitCommitIdShort$/CHANGES.md#libgit2sharp-changes</releaseNotes>
+    <iconUrl>https://github.com/libgit2/libgit2sharp/raw/$GitCommitIdShort$/square-logo.png</iconUrl>
     <tags>libgit2 git wrapper bindings API dvcs vcs</tags>
+    <dependencies>
+      <dependency id="LibGit2Sharp.NativeBinaries" version="[1.0.164]" exclude="Build,Analyzers" />
+    </dependencies>
   </metadata>
   <files>
     <file src="..\README.md" target="App_Readme\LibGit2Sharp.README.md" />
     <file src="..\LICENSE.md" target="App_Readme\LibGit2Sharp.LICENSE.md" />
     <file src="..\CHANGES.md" target="App_Readme\LibGit2Sharp.CHANGES.md" />
-    <file src="bin\$configuration$\$id$.pdb" target="lib\net40" />
-    <file src="..\LibGit2Sharp.Portable\bin\$configuration$\$id$.dll" target="lib\netstandard1.3" /> 
+    <file src="..\LibGit2Sharp\bin\$configuration$\LibGit2Sharp.???" target="lib\net40" />
+    <file src="..\LibGit2Sharp.Portable\bin\$configuration$\LibGit2Sharp.???" target="lib\netstandard1.3" /> 
   </files>
 </package>