Update Version to not rely on embedded resources

Author: bording

LibGit2Sharp/CodeGenerator.targets

@@ -1,9 +1,14 @@
 <Project>
 
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
   <Target Name="DefineProperties">
     <PropertyGroup>
       <NativeDllNamePath>$(IntermediateOutputPath)NativeDllName.g.cs</NativeDllNamePath>
       <UniqueIdentifierPath>$(IntermediateOutputPath)UniqueIdentifier.g.cs</UniqueIdentifierPath>
+      <AssemblyCommitIdsPath>$(IntermediateOutputPath)AssemblyCommitIds.g.cs</AssemblyCommitIdsPath>
     </PropertyGroup>
   </Target>
 
@@ -16,13 +21,13 @@
 
     <PropertyGroup>
       <NativeDllNameSourceLines>
-namespace LibGit2Sharp.Core
-{
-    internal static class NativeDllName
-    {
+        namespace LibGit2Sharp.Core
+        {
+        internal static class NativeDllName
+        {
         public const string Name = "$(libgit2FileName)"%3b
-    }
-}
+        }
+        }
       </NativeDllNameSourceLines>
     </PropertyGroup>
 
@@ -40,13 +45,13 @@ namespace LibGit2Sharp.Core
 
     <PropertyGroup>
       <UniqueIdSourceLines>
-namespace LibGit2Sharp.Core
-{
-    internal static class UniqueId
-    {
+        namespace LibGit2Sharp.Core
+        {
+        internal static class UniqueId
+        {
         public const string UniqueIdentifier = "$([System.Guid]::NewGuid())"%3b
-    }
-}
+        }
+        }
       </UniqueIdSourceLines>
     </PropertyGroup>
 
@@ -72,4 +77,32 @@ namespace LibGit2Sharp.Core
 
   </Target>
 
+  <Target Name="GenerateAssemblyCommitIdsCs" Inputs="@(EmbeddedResource);$(VersionSourceFile)" Outputs="$(AssemblyCommitIdsPath)" BeforeTargets="CoreCompile" DependsOnTargets="DefineProperties;GenerateAssemblyVersionInfo">
+
+    <ReadLinesFromFile File="@(EmbeddedResource)" Condition=" '%(Filename)%(Extension)' == 'libgit2_hash.txt' ">
+      <Output TaskParameter="Lines" PropertyName="libgit2hash" />
+    </ReadLinesFromFile>
+
+    <PropertyGroup>
+      <AssemblyCommitIdsSourceLines>
+        namespace LibGit2Sharp
+        {
+        internal static class AssemblyCommitIds
+        {
+        public const string LibGit2CommitSha = "$(libgit2hash)"%3b
+        public const string LibGit2SharpCommitSha = "$(GitCommitId)"%3b
+        }
+        }
+      </AssemblyCommitIdsSourceLines>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(AssemblyCommitIdsPath)" Lines="$(AssemblyCommitIdsSourceLines)" Overwrite="true" />
+
+    <ItemGroup>
+      <Compile Include="$(AssemblyCommitIdsPath)" />
+      <FileWrites Include="$(AssemblyCommitIdsPath)" />
+    </ItemGroup>
+
+  </Target>
+
 </Project>

LibGit2Sharp/Version.cs

@@ -1,7 +1,4 @@
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Reflection;
 using LibGit2Sharp.Core;
 
 namespace LibGit2Sharp
@@ -11,8 +8,6 @@ namespace LibGit2Sharp
     /// </summary>
     public class Version
     {
-        private readonly Assembly assembly = typeof(Repository).Assembly;
-
         /// <summary>
         /// Needed for mocking purposes.
         /// </summary>
@@ -42,23 +37,15 @@ public virtual BuiltInFeatures Features
         /// <summary>
         /// Returns the SHA hash for the libgit2 library.
         /// </summary>
-        public virtual string LibGit2CommitSha
-        {
-            get { return RetrieveAbbrevShaFrom("libgit2_hash.txt"); }
-        }
+        public virtual string LibGit2CommitSha => RetrieveAbbrevShaFrom(AssemblyCommitIds.LibGit2CommitSha);
 
         /// <summary>
         /// Returns the SHA hash for the LibGit2Sharp library.
         /// </summary>
-        public virtual string LibGit2SharpCommitSha
-        {
-            get { return RetrieveAbbrevShaFrom("libgit2sharp_hash.txt"); }
-        }
+        public virtual string LibGit2SharpCommitSha => RetrieveAbbrevShaFrom(AssemblyCommitIds.LibGit2SharpCommitSha);
 
-        private string RetrieveAbbrevShaFrom(string name)
+        private string RetrieveAbbrevShaFrom(string sha)
         {
-            string sha = ReadContentFromResource(assembly, name) ?? "unknown";
-
             var index = sha.Length > 7 ? 7 : sha.Length;
             return sha.Substring(0, index);
         }
@@ -68,7 +55,7 @@ private string RetrieveAbbrevShaFrom(string name)
         /// </summary>
         /// <para>
         ///   The format of the version number is as follows:
-        ///   <para>Major.Minor.Patch-LibGit2Sharp_abbrev_hash-libgit2_abbrev_hash (x86|x64 - features)</para>
+        ///   <para>Major.Minor.Patch+g{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)</para>
         /// </para>
         /// <returns></returns>
         public override string ToString()
@@ -86,14 +73,5 @@ private string RetrieveVersion()
                                  Platform.ProcessorArchitecture,
                                  features);
         }
-
-        private string ReadContentFromResource(Assembly assembly, string partialResourceName)
-        {
-            string name = string.Format(CultureInfo.InvariantCulture, "LibGit2Sharp.{0}", partialResourceName);
-            using (var sr = new StreamReader(assembly.GetManifestResourceStream(name)))
-            {
-                return sr.ReadLine();
-            }
-        }
     }
 }