Update AssemblyInformationalVersion and tests

Author: AArnott

LibGit2Sharp.Tests/GlobalSettingsFixture.cs

@@ -19,26 +19,26 @@ public void CanGetMinimumCompiledInFeatures()
         public void CanRetrieveValidVersionString()
         {
             // Version string format is:
-            //      Major.Minor.Patch[-somePreleaseTag]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)
+            //      Major.Minor.Patch[-somePreleaseTag]-libgit2_abbrev_hash (x86|x64 - features)
             // Example output:
-            //      "0.17.0[-pre20170914123547]-deadcafe-06d772d (x86 - Threads, Https)"
+            //      "0.17.0[-beta]+gdeadcafeee.LibGit2-06d772d (x86 - Threads, Https)"
 
             string versionInfo = GlobalSettings.Version.ToString();
 
             // The GlobalSettings.Version returned string should contain :
-            //      version: '0.17.0[-somePreleaseTag][+gSomeGitCommit]' LibGit2Sharp version number.
-            //      git2SharpHash:'unknown' ( when compiled from source ) else LibGit2Sharp library hash.
+            //      version: '0.17.0[-somePreleaseTag]+[gSomeGitCommit.]LibGit2-06d772d' LibGit2Sharp version number.
             //      git2hash: '06d772d' LibGit2 library hash.
             //      arch: 'x86' or 'x64' LibGit2 target.
             //      git2Features: 'Threads, Ssh' LibGit2 features compiled with.
-            string regex = @"^(?<version>\d+\.\d+\.\d+(-\w+)?(\+g[a-f0-9]{10})?)-(?<git2SharpHash>\w+)-(?<git2Hash>\w+) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
+            string regex = @"^(?<version>\d+\.\d+\.\d+(-\w+)?\+(g(?<git2SharpHash>[a-f0-9]{10})\.)?LibGit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
 
             Assert.NotNull(versionInfo);
 
             Match regexResult = Regex.Match(versionInfo, regex);
 
             Assert.True(regexResult.Success, "The following version string format is enforced:" +
-                                             "Major.Minor.Patch[-somePreleaseTag][+gSomeGitCommit]-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)");
+                                             "Major.Minor.Patch[-somePreleaseTag]+[gSomeGitCommit].LibGit2-abbrev_hash (x86|x64 - features). " +
+                                             "But found \"" + versionInfo + "\" instead.");
         }
 
         [Fact]

LibGit2Sharp/CodeGenerator.targets

@@ -61,6 +61,19 @@ namespace LibGit2Sharp.Core
     </ItemGroup>
   </Target>
 
+  <Target Name="AddNativeDllCommitShaToBuildMetadata"
+          BeforeTargets="GetBuildVersion"
+          Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
+    <ReadLinesFromFile File="@(EmbeddedResource)"
+                       Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' ">
+      <Output TaskParameter="Lines" PropertyName="libgit2hash" />
+    </ReadLinesFromFile>
+
+    <ItemGroup>
+      <BuildMetadata Include="LibGit2-$(libgit2hash.Substring(0,7))" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="GenerateCommitIdVersion"
           DependsOnTargets="GetBuildVersion">
     <WriteLinesToFile File="$(CommitIdVersionPath)"

LibGit2Sharp/Version.cs

@@ -80,10 +80,8 @@ private string RetrieveVersion()
             string features = Features.ToString();
 
             return string.Format(CultureInfo.InvariantCulture,
-                                 "{0}-{1}-{2} ({3} - {4})",
+                                 "{0} ({1} - {2})",
                                  InformationalVersion,
-                                 LibGit2SharpCommitSha,
-                                 LibGit2CommitSha,
                                  Platform.ProcessorArchitecture,
                                  features);
         }