[XABT] Replace String.Compare calls with a common helper method #10274

Copilot · 2025-07-10T10:27:22Z

This PR replaces repetitive String.Compare calls throughout the Xamarin.Android.Build.Tasks codebase with a common helper method, following the DRY (Don't Repeat Yourself) principle.

Changes Made

New Helper Method

Added MonoAndroidHelper.StringEquals method in MonoAndroidHelper.Basic.cs
Method signature: StringEquals(string? value1, string? value2, StringComparison comparisonType = StringComparison.OrdinalIgnoreCase)
Includes proper null safety checks
Uses String.Equals internally for the actual comparison
Defaults to StringComparison.OrdinalIgnoreCase for most common use case

String.Compare Replacements

Successfully replaced 123 out of 127 String.Compare calls (96.9% replacement rate)

Replaced patterns like:

// Before
String.Compare("typemap", Mode, StringComparison.OrdinalIgnoreCase) == 0

// After  
MonoAndroidHelper.StringEquals("typemap", Mode)

Handled complex cases including index-based comparisons and different comparison modes
Left 4 legitimate cases untouched that require int return values for sorting operations

Files Modified

31 files across Tasks and Utilities directories
Added comprehensive unit tests in MonoAndroidHelperTests.cs
All builds pass successfully

Testing

Created focused unit tests covering:
- Default OrdinalIgnoreCase comparison
- Explicit Ordinal comparison
- Null handling scenarios
- Real-world use case patterns from the codebase

Benefits

Eliminates code duplication and follows DRY principle
Centralizes string comparison logic for easier maintenance
Provides consistent null handling across the codebase
Improves code readability with more descriptive method name

Fixes #10273.

💬 Share your feedback on Copilot coding agent for the chance to win a $200 gift card! Click here to start the survey.

…er method Co-authored-by: grendello <[email protected]>

grendello · 2025-07-10T11:38:07Z

@copilot it seems StringComparison.Ordinal is the more frequent comparison. Modify MonoAndroidHelper.StringEquals to default its comparison operation to StringComparison.Ordinal and update remaining code accordingly.

…inal Co-authored-by: grendello <[email protected]>

Copilot · 2025-07-10T11:49:49Z

@copilot it seems StringComparison.Ordinal is the more frequent comparison. Modify MonoAndroidHelper.StringEquals to default its comparison operation to StringComparison.Ordinal and update remai...

Updated MonoAndroidHelper.StringEquals to default to StringComparison.Ordinal and added explicit StringComparison.OrdinalIgnoreCase to calls that need case-insensitive comparison (PrepareAbiItems.cs mode comparisons and GenerateNativeApplicationConfigSources.cs configuration comparisons). Also updated unit tests to match the new default behavior. Commit c02d626.

grendello · 2025-07-10T13:10:12Z

@copilot remove explicit StringComparison.Ordinal from all calls to MonoAndroidHelper.StringEquals, since this is the default value.

…gEquals calls Co-authored-by: grendello <[email protected]>

Copilot · 2025-07-10T13:16:53Z

@copilot remove explicit StringComparison.Ordinal from all calls to MonoAndroidHelper.StringEquals, since this is the default value.

Removed explicit StringComparison.Ordinal from all calls to MonoAndroidHelper.StringEquals since it's now the default. Updated 25 files and maintained explicit StringComparison.OrdinalIgnoreCase for cases that need case-insensitive comparison. Also updated test method name to reflect default behavior testing. Commit 21f7780.

grendello · 2025-07-10T14:34:16Z

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

+					first.Substring (0, firstRootLength), 
+					second.Substring (0, firstRootLength), 
+					comparisonType);
 		}


@copilot Revert this change. The code is used in xaprepare which doesn't reference XABT

Reverted PathUtil.cs to use original String.Compare implementation since it's used by xaprepare which doesn't reference XABT. Commit 9a6d7f0.

Co-authored-by: grendello <[email protected]>

grendello · 2025-07-10T15:02:07Z

...amarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/MonoAndroidHelperTests.cs

+		[Test]
+		public void TestStringEquals_DefaultComparison ()
+		{
+			// Test default comparison (Ordinal)
+			Assert.IsTrue (MonoAndroidHelper.StringEquals ("Hello", "Hello"));
+			Assert.IsFalse (MonoAndroidHelper.StringEquals ("Hello", "hello"));
+			Assert.IsFalse (MonoAndroidHelper.StringEquals ("WORLD", "world"));
+			Assert.IsTrue (MonoAndroidHelper.StringEquals ("", ""));
+		}


@copilot Remove this method, it is a duplicate

Removed the duplicate TestStringEquals_DefaultComparison method. Commit a928f06.

…ndroidHelperTests Co-authored-by: grendello <[email protected]>

Initial plan

caba68a

Copilot AI assigned Copilot and grendello Jul 10, 2025

Copilot started work on behalf of grendello July 10, 2025 10:27 View session

Replace String.Compare calls with MonoAndroidHelper.StringEquals help…

870d735

…er method Co-authored-by: grendello <[email protected]>

Copilot AI changed the title ~~[WIP] [XABT] Replace String.Compare calls with a common helper method~~ [XABT] Replace String.Compare calls with a common helper method Jul 10, 2025

Copilot finished work on behalf of grendello July 10, 2025 11:12

Copilot AI requested a review from grendello July 10, 2025 11:12

Copilot started work on behalf of grendello July 10, 2025 11:38 View session

Change MonoAndroidHelper.StringEquals default to StringComparison.Ord…

c02d626

…inal Co-authored-by: grendello <[email protected]>

Copilot finished work on behalf of grendello July 10, 2025 11:50

Copilot started work on behalf of grendello July 10, 2025 13:10 View session

Remove explicit StringComparison.Ordinal from MonoAndroidHelper.Strin…

21f7780

…gEquals calls Co-authored-by: grendello <[email protected]>

Copilot finished work on behalf of grendello July 10, 2025 13:17

jonathanpeppers marked this pull request as ready for review July 10, 2025 13:20

jonathanpeppers self-requested a review as a code owner July 10, 2025 13:20

grendello reviewed Jul 10, 2025

View reviewed changes

Copilot started work on behalf of grendello July 10, 2025 14:34 View session

Revert PathUtil.cs to original String.Compare implementation

4b4ed3a

Co-authored-by: grendello <[email protected]>

Copilot AI requested a review from grendello July 10, 2025 14:38

Copilot finished work on behalf of grendello July 10, 2025 14:38

grendello approved these changes Jul 10, 2025

View reviewed changes

grendello reviewed Jul 10, 2025

View reviewed changes

Copilot started work on behalf of grendello July 10, 2025 15:02 View session

Remove duplicate TestStringEquals_DefaultComparison method from MonoA…

a928f06

…ndroidHelperTests Co-authored-by: grendello <[email protected]>

Copilot AI requested a review from grendello July 10, 2025 15:23

Copilot finished work on behalf of grendello July 10, 2025 15:23

grendello approved these changes Jul 10, 2025

View reviewed changes

jonathanpeppers approved these changes Jul 10, 2025

View reviewed changes

jonathanpeppers merged commit acfdf8a into main Jul 10, 2025
59 checks passed

jonathanpeppers deleted the copilot/fix-10273 branch July 10, 2025 16:31

github-actions bot locked and limited conversation to collaborators Aug 10, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[XABT] Replace String.Compare calls with a common helper method #10274

[XABT] Replace String.Compare calls with a common helper method #10274

Uh oh!

Copilot AI commented Jul 10, 2025 •

edited

Loading

Uh oh!

grendello commented Jul 10, 2025

Uh oh!

Copilot AI commented Jul 10, 2025

Uh oh!

grendello commented Jul 10, 2025

Uh oh!

Copilot AI commented Jul 10, 2025

Uh oh!

grendello Jul 10, 2025

Uh oh!

Copilot AI Jul 10, 2025

Uh oh!

grendello Jul 10, 2025

Uh oh!

Copilot AI Jul 10, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

[XABT] Replace String.Compare calls with a common helper method #10274

[XABT] Replace String.Compare calls with a common helper method #10274

Uh oh!

Conversation

Copilot AI commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

New Helper Method

String.Compare Replacements

Files Modified

Testing

Benefits

Uh oh!

grendello commented Jul 10, 2025

Uh oh!

Copilot AI commented Jul 10, 2025

Uh oh!

grendello commented Jul 10, 2025

Uh oh!

Copilot AI commented Jul 10, 2025

Uh oh!

grendello Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

grendello Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Copilot AI commented Jul 10, 2025 •

edited

Loading