Add source code control properties to the NuGet packages.

Also, fix a small bug with the nupkgproj files. The intermediate output folders conflict between the nupkgproj and csproj with the same name. This causes issues because the project.assets.json file is being shared between the two projects, which isn't correct.

Author: eerhardt

Directory.Build.props

@@ -63,12 +63,22 @@
     <VersionSuffix Condition="'$(IncludeBuildNumberInPackageVersion)' == 'true'">$(VersionSuffix)-$(BuildNumberMajor)-$(BuildNumberMinor)</VersionSuffix>
   </PropertyGroup>
 
-  <!-- SourceLink properties - need to be set before importing $(ToolsDir)versioning.props -->
+  <!-- SourceLink properties used by dotnet/buildtools - need to be set before importing $(ToolsDir)versioning.props -->
   <PropertyGroup>
     <UseSourceLink>true</UseSourceLink>
     <GitHubRepositoryName>machinelearning</GitHubRepositoryName>
   </PropertyGroup>
 
+  <!--
+  Source code control properties used by the .NET Core SDK to inject SCC info into the NuGet package.
+  In future versions, these will be used for SourceLink and to generate AssemblyInfo.
+  -->
+  <PropertyGroup>
+    <PrivateRepositoryUrl>https://github.com/dotnet/$(GitHubRepositoryName)</PrivateRepositoryUrl>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <SourceRevisionId>$(LatestCommit)</SourceRevisionId>
+  </PropertyGroup>
+
   <!--
   Ensure to import versioning.props before overwriting BaseIntermediateOutputPath since
   the source link file exists in the root bin/obj folder.

pkg/Directory.Build.props

@@ -5,6 +5,14 @@
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
+
+    <!--
+    Our .nupkgproj files have conflicting names with src projects, which puts their intermediate
+    output in the same folder (like project.assets.json). Override the intermediate output to
+    make it unique for the .nupkgprojs.
+    -->
+    <IntermediateOutputPath>$(IntermediateOutputRootPath)$(MSBuildProjectName).NupkgProj\</IntermediateOutputPath>
+    <BaseIntermediateOutputPath>$(IntermediateOutputPath)</BaseIntermediateOutputPath>
   </PropertyGroup>
 
   <!-- nuspec properties -->