Include branch and commit hash in the .ident string

Author: grendello

build-tools/scripts/XABuildConfig.cs.in

@@ -9,6 +9,8 @@ namespace Xamarin.Android.Tools
 		public const string NDKRevision = "@NDK_REVISION@";
 		public const string NDKRelease = "@NDK_RELEASE@";
 		public const string XamarinAndroidVersion = "@XAMARIN_ANDROID_VERSION@";
+		public const string XamarinAndroidCommitHash = "@XAMARIN_ANDROID_COMMIT_HASH@";
+		public const string XamarinAndroidBranch = "@XAMARIN_ANDROID_BRANCH@";
 		public const int NDKMinimumApiAvailable = @NDK_MINIMUM_API_AVAILABLE@;
 		public const int AndroidLatestStableApiLevel = @ANDROID_LATEST_STABLE_API_LEVEL@;
 		public static readonly Version NDKVersion = new Version (@NDK_VERSION_MAJOR@, @NDK_VERSION_MINOR@, @NDK_VERSION_MICRO@);

build-tools/xaprepare/xaprepare/Application/BuildInfo.cs

@@ -25,6 +25,9 @@ partial class BuildInfo : AppObject
 		public string MonoHash               { get; private set; } = String.Empty;
 		public string FullMonoHash           { get; private set; } = String.Empty;
 
+		public string XACommitHash           { get; private set; } = String.Empty;
+		public string XABranch               { get; private set; } = String.Empty;
+
 		public async Task GatherGitInfo (Context context)
 		{
 			if (context == null)
@@ -36,6 +39,14 @@ public async Task GatherGitInfo (Context context)
 			Log.StatusLine ();
 			DetermineMonoHash (context);
 			Log.StatusLine ();
+			DetermineXACommitInfo (context);
+		}
+
+		void DetermineXACommitInfo (Context context)
+		{
+			GitRunner git = CreateGitRunner (context);
+			XACommitHash = git.GetTopCommitHash (shortHash: false);
+			XABranch = git.GetBranchName ();
 		}
 
 		public bool GatherNDKInfo (Context context)

build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs

@@ -168,6 +168,8 @@ GeneratedFile Get_XABuildConfig_cs (Context context)
 				{ "@XA_SUPPORTED_ABIS@",         context.Properties.GetRequiredValue (KnownProperties.AndroidSupportedTargetJitAbis).Replace (':', ';') },
 				{ "@ANDROID_LATEST_STABLE_API_LEVEL@", context.Properties.GetRequiredValue (KnownProperties.AndroidLatestStableApiLevel) },
 				{ "@XAMARIN_ANDROID_VERSION@",   context.Properties.GetRequiredValue (KnownProperties.ProductVersion) },
+				{ "@XAMARIN_ANDROID_COMMIT_HASH@", context.BuildInfo.XACommitHash },
+				{ "@XAMARIN_ANDROID_BRANCH@", context.BuildInfo.XABranch },
 			};
 
 			return new GeneratedPlaceholdersFile (

build-tools/xaprepare/xaprepare/ToolRunners/GitRunner.cs

@@ -135,6 +135,33 @@ public async Task<bool> SubmoduleUpdate (string? workingDirectory = null, bool i
 			return await RunGit (runner, "submodule-update");
 		}
 
+		public string GetBranchName (string? workingDirectory = null)
+		{
+			string runnerWorkingDirectory = DetermineRunnerWorkingDirectory (workingDirectory);
+			var runner = CreateGitRunner (runnerWorkingDirectory);
+			runner
+				.AddArgument ("name-rev")
+				.AddArgument ("--name-only")
+				.AddArgument ("--exclude=tags/*")
+				.AddArgument ("HEAD");
+
+			string branchName = String.Empty;
+			using (var outputSink = (OutputSink)SetupOutputSink (runner)) {
+				outputSink.LineCallback = (string? line) => {
+					if (!String.IsNullOrEmpty (branchName)) {
+						return;
+					}
+					branchName = line?.Trim () ?? String.Empty;
+				};
+
+				if (!runner.Run ()) {
+					return String.Empty;
+				}
+
+				return branchName;
+			}
+		}
+
 		public string GetTopCommitHash (string? workingDirectory = null, bool shortHash = true)
 		{
 			string runnerWorkingDirectory = DetermineRunnerWorkingDirectory (workingDirectory);

src/Xamarin.Android.Build.Tasks/Utilities/NativeAssemblyGenerator/NativeAssemblyGenerator.cs

@@ -224,7 +224,7 @@ public virtual void WriteFileEnd ()
 				Output.WriteLine ();
 			}
 
-			WriteDirective (".ident", QuoteString ($"Xamarin.Android {XABuildConfig.XamarinAndroidVersion}"));
+			WriteDirective (".ident", QuoteString ($"Xamarin.Android {XABuildConfig.XamarinAndroidBranch} @ {XABuildConfig.XamarinAndroidCommitHash}"));
 		}
 
 		NativeType GetNativeType<T> ()