Simplify logic (no need for short SHAs)

Author: Julien Couvreur

src/Compilers/CSharp/Portable/Parser/DirectiveParser.cs

@@ -332,7 +332,7 @@ private DirectiveTriviaSyntax ParseErrorOrWarningDirective(SyntaxToken hash, Syn
                 {
                     if (errorText.Equals("version", StringComparison.Ordinal))
                     {
-                        string version = CommonCompiler.GetProductVersionWithFullHash(typeof(CSharpCompiler));
+                        string version = CommonCompiler.GetProductVersion(typeof(CSharpCompiler));
                         string assemblyPath = CommonCompiler.GetAssemblyLocation(typeof(CSharpCompiler));
                         var specified = this.Options.SpecifiedLanguageVersion;
                         var effective = specified.MapSpecifiedToEffectiveVersion();

src/Compilers/CSharp/Test/CommandLine/CommandLineTests.cs

@@ -7052,19 +7052,6 @@ private static string ReplaceCommitHash(string s)
             return Regex.Replace(s, "(\\((<developer build>|[a-fA-F0-9]{8})\\))", "(HASH)");
         }
 
-        [Fact]
-        public void ExtractShortCommitHash()
-        {
-            Assert.Null(CommonCompiler.ExtractShortCommitHash(null));
-            Assert.Equal("", CommonCompiler.ExtractShortCommitHash(""));
-            Assert.Equal("<", CommonCompiler.ExtractShortCommitHash("<"));
-            Assert.Equal("<developer build>", CommonCompiler.ExtractShortCommitHash("<developer build>"));
-            Assert.Equal("1", CommonCompiler.ExtractShortCommitHash("1"));
-            Assert.Equal("1234567", CommonCompiler.ExtractShortCommitHash("1234567"));
-            Assert.Equal("12345678", CommonCompiler.ExtractShortCommitHash("12345678"));
-            Assert.Equal("12345678", CommonCompiler.ExtractShortCommitHash("123456789"));
-        }
-
         private void CheckOutputFileName(string source1, string source2, string inputName1, string inputName2, string[] commandLineArguments, string expectedOutputName)
         {
             var dir = Temp.CreateDirectory();

src/Compilers/CSharp/Test/Syntax/LexicalAndXml/PreprocessorTests.cs

@@ -4657,7 +4657,7 @@ public void NullableExcludedUnrecognizedSetting()
 
         private static string GetExpectedVersion()
         {
-            return CommonCompiler.GetProductVersionWithFullHash(typeof(CSharpCompiler));
+            return CommonCompiler.GetProductVersion(typeof(CSharpCompiler));
         }
 
         private static string GetExpectedAssemblyPath()

src/Compilers/Core/Portable/CommandLine/CommonCompiler.cs

@@ -157,46 +157,12 @@ internal string GetCompilerVersion()
         }
 
         internal static string GetProductVersion(Type type)
-        {
-            string? assemblyVersion = GetInformationalVersionWithoutHash(type);
-            string? hash = GetShortCommitHash(type);
-            return $"{assemblyVersion} ({hash})";
-        }
-
-        [return: NotNullIfNotNull(nameof(hash))]
-        internal static string? ExtractShortCommitHash(string? hash)
-        {
-            // leave "<developer build>" alone, but truncate SHA to 8 characters
-            if (hash != null && hash.Length >= 8 && hash[0] != '<')
-            {
-                return hash.Substring(0, 8);
-            }
-
-            return hash;
-        }
-
-        private static string? GetInformationalVersionWithoutHash(Type type)
         {
             // The attribute stores a SemVer2-formatted string: `A.B.C(-...)?(+...)?`
             // We remove the section after the + (if any is present)
-            return type.Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0];
-        }
-
-        private static string? GetShortCommitHash(Type type)
-        {
-            var hash = type.Assembly.GetCustomAttribute<CommitHashAttribute>()?.Hash;
-            return ExtractShortCommitHash(hash);
-        }
+            string? assemblyVersion = type.Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion.Split('+')[0];
 
-        private static string? GetFullCommitHash(Type type)
-        {
-            return type.Assembly.GetCustomAttribute<CommitHashAttribute>()?.Hash;
-        }
-
-        internal static string GetProductVersionWithFullHash(Type type)
-        {
-            string? assemblyVersion = GetInformationalVersionWithoutHash(type);
-            string? hash = GetFullCommitHash(type);
+            string? hash = type.Assembly.GetCustomAttribute<CommitHashAttribute>()?.Hash;
             return $"{assemblyVersion} ({hash})";
         }