From 7af6f17a1b0bc3a598086e3a1ba2fb9339739425 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Sat, 16 Jun 2018 09:16:56 -0400
Subject: [PATCH] stamp commit into package

---
 Source/Directory.Build.props                        | 2 +-
 Source/Directory.Build.targets                      | 7 +++++++
 Source/MSBuild.Sdk.Extras/MSBuild.Sdk.Extras.nuspec | 3 +--
 Tools/MSBuild.Packaging.targets                     | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index 10f29ab..595f821 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -23,7 +23,7 @@
     <Authors>Oren Novotny</Authors>
     <Copyright>© Oren Novotny</Copyright>
     <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>git://github.com/onovotny/MSBuildSdkExtras</RepositoryUrl>
+    <RepositoryUrl>https://github.com/onovotny/MSBuildSdkExtras</RepositoryUrl>
     <PackageProjectUrl>https://github.com/onovotny/MSBuildSdkExtras</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/onovotny/MSBuildSdkExtras/blob/master/LICENSE.md</PackageLicenseUrl>
     <PackageReleaseNotes>https://github.com/onovotny/MSBuildSdkExtras/blob/master/README.md</PackageReleaseNotes>
diff --git a/Source/Directory.Build.targets b/Source/Directory.Build.targets
index 768261e..96b2534 100644
--- a/Source/Directory.Build.targets
+++ b/Source/Directory.Build.targets
@@ -15,4 +15,11 @@
     <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.23" PrivateAssets="All"/>
   </ItemGroup>
 
+  <PropertyGroup>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-62925-02" PrivateAssets="All"/>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/MSBuild.Sdk.Extras/MSBuild.Sdk.Extras.nuspec b/Source/MSBuild.Sdk.Extras/MSBuild.Sdk.Extras.nuspec
index 7a9763d..6c3218b 100644
--- a/Source/MSBuild.Sdk.Extras/MSBuild.Sdk.Extras.nuspec
+++ b/Source/MSBuild.Sdk.Extras/MSBuild.Sdk.Extras.nuspec
@@ -12,10 +12,9 @@
     <licenseUrl>$licenseUrl$</licenseUrl>
     <projectUrl>$projectUrl$</projectUrl>
     <releaseNotes>$releaseNotes$</releaseNotes>
-    <repository type="$repositoryType$" url="$repositoryUrl$" />
+    <repository type="$repositoryType$" url="$repositoryUrl$" commit="$SourceRevisionId$" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <developmentDependency>true</developmentDependency>
-    <serviceable>true</serviceable>
     <packageTypes>
       <packageType name="$packageType$" />
     </packageTypes>
diff --git a/Tools/MSBuild.Packaging.targets b/Tools/MSBuild.Packaging.targets
index 816cea2..9e3edeb 100644
--- a/Tools/MSBuild.Packaging.targets
+++ b/Tools/MSBuild.Packaging.targets
@@ -30,6 +30,7 @@
   <PropertyGroup>
     <!-- This property must be overridden to remove a few targets that compile assemblies -->
     <CoreBuildDependsOn>
+      InitializeSourceControlInformationFromSourceControlManager;
       BuildOnlySettings;
       PrepareForBuild;
       PreBuildEvent;
@@ -65,7 +66,8 @@
         projectUrl=$(PackageProjectUrl);
         licenseUrl=$(PackageLicenseUrl);
         packageType=$(PackageType);
-        releaseNotes=$(PackageReleaseNotes)
+        releaseNotes=$(PackageReleaseNotes);
+        sourceRevisionId=$(SourceRevisionId)
       </NuspecProperties>
     </PropertyGroup>
   </Target>