Sourcelink and include PDBs in nuget packages (#4224)

* Sourcelink and include PDBs in nuget packages

This commit reinstates sourcelinking of PDB files and including them in nuget packages.

Closes #4095

* Include Repository metadata in packages

This commit adds repository metadata in packages, including branch and commit, for SourceLink.

(cherry picked from commit 415630a)

Author: russcam

build/Elasticsearch.Net.nuspec

@@ -15,6 +15,7 @@
 		<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
 		<copyright>2014-$year$ Elasticsearch BV</copyright>
 		<tags>elasticsearch,elastic,search,lucene,nest</tags>
+		<repository type="git" url="https://github.com/elastic/elasticsearch-net.git" branch="$branch$" commit="$commit$" />
 		<dependencies>
 			<group targetFramework="netstandard2.0" />
 			<group targetFramework="net461" />
@@ -24,9 +25,11 @@
 		<file src="..\license.txt" target="" />
 
 		<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.dll" target="lib\netstandard2.0"/>
+		<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.pdb" target="lib\netstandard2.0"/>
 		<file src="output\Elasticsearch.Net\netstandard2.0\Elasticsearch.Net.xml" target="lib\netstandard2.0"/>
 
 		<file src="output\Elasticsearch.Net\net461\Elasticsearch.Net.dll" target="lib\net461"/>
+		<file src="output\Elasticsearch.Net\net461\Elasticsearch.Net.pdb" target="lib\net461"/>
 		<file src="output\Elasticsearch.Net\net461\Elasticsearch.Net.xml" target="lib\net461"/>
 	</files>
 </package>

build/NEST.JsonNetSerializer.nuspec

@@ -15,6 +15,7 @@
 		<releaseNotes>See https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
 		<copyright>2017-$year$ Elasticsearch BV</copyright>
 		<tags>elasticsearch,elastic,search,lucene,nest,serializer,json</tags>
+		<repository type="git" url="https://github.com/elastic/elasticsearch-net.git" branch="$branch$" commit="$commit$" />
 		<dependencies>
 			<group targetFramework="net461">
 				<dependency id="NEST" version="[$version$, $nextMajorVersion$)" />
@@ -30,9 +31,11 @@
 		<file src="..\license.txt" target="" />
 
 		<file src="output\Nest.JsonNetSerializer\net461\Nest.JsonNetSerializer.dll" target="lib\net461"/>
+		<file src="output\Nest.JsonNetSerializer\net461\Nest.JsonNetSerializer.pdb" target="lib\net461"/>
 		<file src="output\Nest.JsonNetSerializer\net461\Nest.JsonNetSerializer.xml" target="lib\net461"/>
 
 		<file src="output\Nest.JsonNetSerializer\netstandard2.0\Nest.JsonNetSerializer.dll" target="lib\netstandard2.0"/>
+		<file src="output\Nest.JsonNetSerializer\netstandard2.0\Nest.JsonNetSerializer.pdb" target="lib\netstandard2.0"/>
 		<file src="output\Nest.JsonNetSerializer\netstandard2.0\Nest.JsonNetSerializer.xml" target="lib\netstandard2.0"/>
 	</files>
 </package>

build/NEST.nuspec

@@ -18,7 +18,7 @@
 		<summary>Strongly typed interface to Elasticsearch. Fluent and classic object initializer mappings of requests and responses. Uses and exposes Elasticsearch.Net</summary>
 		<releaseNotes>https://github.com/elastic/elasticsearch-net/releases/tag/$version$</releaseNotes>
 		<tags>elasticsearch,elastic,search,lucene,nest</tags>
-		
+		<repository type="git" url="https://github.com/elastic/elasticsearch-net.git" branch="$branch$" commit="$commit$" />
 		<dependencies>
 			<group targetFramework="net461">
 				<dependency id="Elasticsearch.Net" version="[$version$, $nextMajorVersion$)" />
@@ -32,9 +32,11 @@
 		<file src="..\license.txt" target="" />
 
 		<file src="output\Nest\net461\Nest.dll" target="lib\net461"/>
-		<file src="output\Nest\net461\Nest.XML" target="lib\net461"/>
+		<file src="output\Nest\net461\Nest.pdb" target="lib\net461"/>
+		<file src="output\Nest\net461\Nest.xml" target="lib\net461"/>
 
 		<file src="output\Nest\netstandard2.0\Nest.dll" target="lib\netstandard2.0"/>
+		<file src="output\Nest\netstandard2.0\Nest.pdb" target="lib\netstandard2.0"/>
 		<file src="output\Nest\netstandard2.0\Nest.xml" target="lib\netstandard2.0"/>
 	</files>
 </package>

build/scripts/Commandline.fs

@@ -202,9 +202,8 @@ Execution hints can be provided anywhere on the command line
         | "diff" :: tail -> { parsed with RemainingArguments = tail }
         | ["canary"; ] -> parsed
 
-        | ["release"; version] -> { parsed with CommandArguments = SetVersion { Version = version }  }
-
-        | ["test"; testFilter] -> { parsed with CommandArguments = Test { TestFilter = Some testFilter }  }
+        | ["release"; version] -> { parsed with CommandArguments = SetVersion { Version = version }; DoSourceLink = true }
+        | ["test"; testFilter] -> { parsed with CommandArguments = Test { TestFilter = Some testFilter } }
 
         | ["benchmark"; IsUrl elasticsearch; username; password] ->
             {

build/scripts/Releasing.fs

@@ -39,14 +39,23 @@ module Release =
 
     let private currentMajorVersion version = sprintf "%i" <| version.Full.Major
     let private nextMajorVersion version = sprintf "%i" <| version.Full.Major + 1u
+    
+    let private gitInfo args =
+        let result = Tooling.Git.ReadInWithTimeout "." args (TimeSpan.FromSeconds(10.))
+        (Seq.head result.Output).Line.Trim()
 
     let private props version =
         let currentMajorVersion = currentMajorVersion version
-        let nextMajorVersion = nextMajorVersion version
+        let nextMajorVersion = nextMajorVersion version      
+        let branch = gitInfo ["rev-parse"; "--abbrev-ref"; "HEAD"]     
+        let commit = gitInfo ["rev-parse"; "HEAD"]
+        
         new StringBuilder()
         |> addKeyValue "currentMajorVersion" currentMajorVersion
         |> addKeyValue "nextMajorVersion" nextMajorVersion
         |> addKeyValue "year" year
+        |> addKeyValue "branch" branch
+        |> addKeyValue "commit" commit
 
     let pack file n properties version  = 
         Tooling.Nuget.Exec [ "pack"; file; 

build/scripts/Tooling.fs

@@ -61,6 +61,7 @@ module Tooling =
     let nugetFile = Path.GetFullPath "build/scripts/bin/Release/netcoreapp3.0/NuGet.exe" 
     let Nuget = BuildTooling(None, nugetFile)
     let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp3.0/ILRepack.exe")
-    let DotNet = BuildTooling(Some <| TimeSpan.FromMinutes(5.), "dotnet")
+    let DotNet = BuildTooling(None, "dotnet")
+    let Git = BuildTooling(None, "git")
 
 

src/PublishArtifacts.build.props

@@ -19,7 +19,7 @@
     <SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink>
     <!-- we need to referenced assemblies during the command line build so that ILRepack can pick them up -->
     <CopyLocalLockFileAssemblies Condition="'$(TargetFramework)'=='netstandard2.0'">true</CopyLocalLockFileAssemblies>
-
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
 
   <Target Name="GenerateSourceLink" BeforeTargets="CoreCompile" Condition="'$(DoSourceLink)'!=''">