Bump com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0 (#…

…9678) Context: https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger/31.8.0 Context: https://android.googlesource.com/platform/tools/base/+/master/build-system/manifest-merger Bumps com.android.tools.build:manifest-merger from 31.7.3 to 31.8.0. Note that I was unable to locate a specific git tag for this release. Other changes: * Trim dependabot branch names used by `XAVersionInfo.targets` Prevents the error caused by long branch names: error NU5123: Warning As Error: The file 'package/services/metadata/core-properties/fa5e195163194723b3dd0941982ab0e1.psmdcp' path, name, or both are too long. Your package might not work without long file path support. Please shorten the file path or file name. Co-authored-by: Peter Collins <[email protected]>
dotnet · Jan 13, 2025 · 6d9b295 · 6d9b295
1 parent 79ddd4f
commit 6d9b295
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/GitBranch.cs
@@ -15,7 +15,7 @@ namespace Xamarin.Android.BuildTools.PrepTasks
 	public sealed class GitBranch : Git
 	{
 		[Output]
-		public                  string      Branch              { get; set; }
+		public                  string      Branch              { get; set; } = string.Empty;
 
 		protected   override    bool        LogTaskMessages     {
 			get { return false; }
@@ -48,6 +48,12 @@ public override bool Execute ()
 				base.Execute ();
 			}
 
+			// Trim generated dependabot branch names that are too long to produce useful package names
+			var lastSlashIndex = Branch.LastIndexOf ('/');
+			if (Branch.StartsWith ("dependabot") && lastSlashIndex != -1 && Branch.Length > 60) {
+				Branch = Branch.Substring (lastSlashIndex + 1);
+			}
+
 			Log.LogMessage (MessageImportance.Low, $"  [Output] {nameof (Branch)}: {Branch}");
 
 			return !Log.HasLoggedErrors;

diff --git a/src/manifestmerger/build.gradle b/src/manifestmerger/build.gradle
@@ -19,7 +19,7 @@ repositories {
 
 dependencies {
     // https://mvnrepository.com/artifact/com.android.tools.build/manifest-merger
-    implementation 'com.android.tools.build:manifest-merger:31.7.3'
+    implementation 'com.android.tools.build:manifest-merger:31.8.0'
 }
 
 sourceSets {