Skip to content

Commit 21f7780

Browse files
Copilotgrendello
Copilot
and
grendello
committed
Remove explicit StringComparison.Ordinal from MonoAndroidHelper.StringEquals calls
Co-authored-by: grendello <[email protected]>
1 parent c02d626 commit 21f7780

25 files changed

+114
-114
lines changed

‎src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,10 @@ bool LoadLayout (string filePath, Dictionary <string, LayoutGroup> groupIndex, r
218218

219219
// <merge> anywhere is ignored - Android always returns 'null' if you try to find such
220220
// an element. Prevents https://github.com/xamarin/xamarin-android/issues/1929
221-
if (MonoAndroidHelper.StringEquals ("merge", current.LocalName, StringComparison.Ordinal))
221+
if (MonoAndroidHelper.StringEquals ("merge", current.LocalName))
222222
continue;
223223

224-
bool isInclude = MonoAndroidHelper.StringEquals ("include", current.LocalName, StringComparison.Ordinal);
224+
bool isInclude = MonoAndroidHelper.StringEquals ("include", current.LocalName);
225225

226226
if (!GetAndParseId (current, filePath, androidNS, isInclude, out id, out parsedId, out name) && !isInclude) {
227227
errors = true;
@@ -258,7 +258,7 @@ bool LoadLayout (string filePath, Dictionary <string, LayoutGroup> groupIndex, r
258258

259259
void CreateWidget (XPathNavigator current, string filePath, string androidNS, string xamarinNS, string id, string parsedId, string name, string partialClasses, ref IDictionary <string, LayoutWidget> widgets)
260260
{
261-
bool isFragment = MonoAndroidHelper.StringEquals ("fragment", current.LocalName, StringComparison.Ordinal);
261+
bool isFragment = MonoAndroidHelper.StringEquals ("fragment", current.LocalName);
262262
string managedType = current.GetAttribute (XamarinManagedTypeAttribute, xamarinNS);
263263
string oldType = null;
264264

@@ -327,7 +327,7 @@ void CreateWidget (XPathNavigator current, string filePath, string androidNS, st
327327
if (fresh)
328328
return;
329329

330-
if (widget.Type != null && MonoAndroidHelper.StringEquals (widget.Type, managedType, StringComparison.Ordinal))
330+
if (widget.Type != null && MonoAndroidHelper.StringEquals (widget.Type, managedType))
331331
return;
332332

333333
widget.Type = null;

‎src/Xamarin.Android.Build.Tasks/Tasks/GenerateJniRemappingNativeCode.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,15 @@ void ReadXml (XmlReader reader, List<JniRemappingTypeReplacement> typeReplacemen
111111
}
112112

113113
haveAllAttributes = true;
114-
if (MonoAndroidHelper.StringEquals ("replace-type", reader.LocalName, StringComparison.Ordinal)) {
114+
if (MonoAndroidHelper.StringEquals ("replace-type", reader.LocalName)) {
115115
haveAllAttributes &= GetRequiredAttribute ("from", out string from);
116116
haveAllAttributes &= GetRequiredAttribute ("to", out string to);
117117
if (!haveAllAttributes) {
118118
continue;
119119
}
120120

121121
typeReplacements.Add (new JniRemappingTypeReplacement (from, to));
122-
} else if (MonoAndroidHelper.StringEquals ("replace-method", reader.LocalName, StringComparison.Ordinal)) {
122+
} else if (MonoAndroidHelper.StringEquals ("replace-method", reader.LocalName)) {
123123
haveAllAttributes &= GetRequiredAttribute ("source-type", out string sourceType);
124124
haveAllAttributes &= GetRequiredAttribute ("source-method-name", out string sourceMethodName);
125125
haveAllAttributes &= GetRequiredAttribute ("target-type", out string targetType);

‎src/Xamarin.Android.Build.Tasks/Tasks/GenerateNativeApplicationConfigSources.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ void GetRequiredTokens (MetadataReader reader, out int android_runtime_jnienv_cl
391391
MethodDefinition md = reader.GetMethodDefinition (methodHandle);
392392
string name = reader.GetString (md.Name);
393393

394-
if (jnienv_initialize_method_token == -1 && MonoAndroidHelper.StringEquals (name, "Initialize", StringComparison.Ordinal)) {
394+
if (jnienv_initialize_method_token == -1 && MonoAndroidHelper.StringEquals (name, "Initialize")) {
395395
jnienv_initialize_method_token = MetadataTokens.GetToken (reader, methodHandle);
396-
} else if (jnienv_registerjninatives_method_token == -1 && MonoAndroidHelper.StringEquals (name, "RegisterJniNatives", StringComparison.Ordinal)) {
396+
} else if (jnienv_registerjninatives_method_token == -1 && MonoAndroidHelper.StringEquals (name, "RegisterJniNatives")) {
397397
jnienv_registerjninatives_method_token = MetadataTokens.GetToken (reader, methodHandle);
398398
}
399399

@@ -406,12 +406,12 @@ void GetRequiredTokens (MetadataReader reader, out int android_runtime_jnienv_cl
406406
bool TypeMatches (TypeDefinition td)
407407
{
408408
string ns = reader.GetString (td.Namespace);
409-
if (!MonoAndroidHelper.StringEquals (ns, "Android.Runtime", StringComparison.Ordinal)) {
409+
if (!MonoAndroidHelper.StringEquals (ns, "Android.Runtime")) {
410410
return false;
411411
}
412412

413413
string name = reader.GetString (td.Name);
414-
if (!MonoAndroidHelper.StringEquals (name, "JNIEnvInit", StringComparison.Ordinal)) {
414+
if (!MonoAndroidHelper.StringEquals (name, "JNIEnvInit")) {
415415
return false;
416416
}
417417

‎src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ List<ITaskItem> GetItemsForABI (string abi, ITaskItem[] items)
9898
{
9999
var ret = new List <ITaskItem> ();
100100
foreach (ITaskItem item in items) {
101-
if (!MonoAndroidHelper.StringEquals (abi, item.GetMetadata (KnownMetadata.Abi), StringComparison.Ordinal)) {
101+
if (!MonoAndroidHelper.StringEquals (abi, item.GetMetadata (KnownMetadata.Abi))) {
102102
continue;
103103
}
104104
ret.Add (item);

‎src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/MonoAndroidHelperTests.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ public void TestStringEquals_DefaultComparison ()
1818
}
1919

2020
[Test]
21-
public void TestStringEquals_OrdinalComparison ()
21+
public void TestStringEquals_DefaultComparison ()
2222
{
23-
// Test explicit Ordinal comparison
24-
Assert.IsTrue (MonoAndroidHelper.StringEquals ("Hello", "Hello", StringComparison.Ordinal));
25-
Assert.IsFalse (MonoAndroidHelper.StringEquals ("Hello", "hello", StringComparison.Ordinal));
26-
Assert.IsFalse (MonoAndroidHelper.StringEquals ("WORLD", "world", StringComparison.Ordinal));
27-
Assert.IsTrue (MonoAndroidHelper.StringEquals ("", "", StringComparison.Ordinal));
23+
// Test default comparison (Ordinal)
24+
Assert.IsTrue (MonoAndroidHelper.StringEquals ("Hello", "Hello"));
25+
Assert.IsFalse (MonoAndroidHelper.StringEquals ("Hello", "hello"));
26+
Assert.IsFalse (MonoAndroidHelper.StringEquals ("WORLD", "world"));
27+
Assert.IsTrue (MonoAndroidHelper.StringEquals ("", ""));
2828
}
2929

3030
[Test]
@@ -64,11 +64,11 @@ public void TestStringEquals_ReplaceStringCompareUseCases ()
6464
// Replaces: String.Compare(abi, item.GetMetadata(), StringComparison.Ordinal) != 0
6565
string abi = "arm64-v8a";
6666
string metadata = "x86_64";
67-
Assert.IsFalse (MonoAndroidHelper.StringEquals (abi, metadata, StringComparison.Ordinal));
67+
Assert.IsFalse (MonoAndroidHelper.StringEquals (abi, metadata));
6868

6969
// Replaces: String.Compare("merge", current.LocalName, StringComparison.Ordinal) == 0
7070
string localName = "merge";
71-
Assert.IsTrue (MonoAndroidHelper.StringEquals ("merge", localName, StringComparison.Ordinal));
71+
Assert.IsTrue (MonoAndroidHelper.StringEquals ("merge", localName));
7272
}
7373
}
7474
}

‎src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGenerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ sealed class DSOCacheEntryContextDataProvider : NativeAssemblerStructContextData
2929
public override string GetComment (object data, string fieldName)
3030
{
3131
var dso_entry = EnsureType<DSOCacheEntry> (data);
32-
if (MonoAndroidHelper.StringEquals ("hash", fieldName, StringComparison.Ordinal)) {
32+
if (MonoAndroidHelper.StringEquals ("hash", fieldName)) {
3333
return $" from name: {dso_entry.HashedName}";
3434
}
3535

36-
if (MonoAndroidHelper.StringEquals ("name", fieldName, StringComparison.Ordinal)) {
36+
if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
3737
return $" name: {dso_entry.name}";
3838
}
3939

@@ -123,11 +123,11 @@ sealed class XamarinAndroidBundledAssemblyContextDataProvider : NativeAssemblerS
123123
public override ulong GetBufferSize (object data, string fieldName)
124124
{
125125
var xaba = EnsureType<XamarinAndroidBundledAssembly> (data);
126-
if (MonoAndroidHelper.StringEquals ("name", fieldName, StringComparison.Ordinal)) {
126+
if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
127127
return xaba.name_length;
128128
}
129129

130-
if (MonoAndroidHelper.StringEquals ("file_name", fieldName, StringComparison.Ordinal)) {
130+
if (MonoAndroidHelper.StringEquals ("file_name", fieldName)) {
131131
return xaba.name_length + MonoAndroidHelper.GetMangledAssemblyNameSizeOverhead ();
132132
}
133133

‎src/Xamarin.Android.Build.Tasks/Utilities/ApplicationConfigNativeAssemblyGeneratorCLR.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ sealed class DSOCacheEntryContextDataProvider : NativeAssemblerStructContextData
2424
public override string GetComment (object data, string fieldName)
2525
{
2626
var dso_entry = EnsureType<DSOCacheEntry> (data);
27-
if (MonoAndroidHelper.StringEquals ("hash", fieldName, StringComparison.Ordinal)) {
27+
if (MonoAndroidHelper.StringEquals ("hash", fieldName)) {
2828
return $" from name: {dso_entry.HashedName}";
2929
}
3030

31-
if (MonoAndroidHelper.StringEquals ("name_index", fieldName, StringComparison.Ordinal)) {
31+
if (MonoAndroidHelper.StringEquals ("name_index", fieldName)) {
3232
return $" name: {dso_entry.RealName}";
3333
}
3434

@@ -121,11 +121,11 @@ sealed class RuntimePropertyContextDataProvider : NativeAssemblerStructContextDa
121121
public override string GetComment (object data, string fieldName)
122122
{
123123
var runtimeProp = EnsureType<RuntimeProperty> (data);
124-
if (MonoAndroidHelper.StringEquals ("key_index", fieldName, StringComparison.Ordinal)) {
124+
if (MonoAndroidHelper.StringEquals ("key_index", fieldName)) {
125125
return $" '{runtimeProp.Key}'";
126126
}
127127

128-
if (MonoAndroidHelper.StringEquals ("value_index", fieldName, StringComparison.Ordinal)) {
128+
if (MonoAndroidHelper.StringEquals ("value_index", fieldName)) {
129129
return $" '{runtimeProp.Value}'";
130130
}
131131

@@ -170,11 +170,11 @@ public override string GetComment (object data, string fieldName)
170170
{
171171
var envVar = EnsureType<AppEnvironmentVariable> (data);
172172

173-
if (MonoAndroidHelper.StringEquals ("name_index", fieldName, StringComparison.Ordinal)) {
173+
if (MonoAndroidHelper.StringEquals ("name_index", fieldName)) {
174174
return $" '{envVar.Name}'";
175175
}
176176

177-
if (MonoAndroidHelper.StringEquals ("value_index", fieldName, StringComparison.Ordinal)) {
177+
if (MonoAndroidHelper.StringEquals ("value_index", fieldName)) {
178178
return $" '{envVar.Value}'";
179179
}
180180

@@ -205,11 +205,11 @@ sealed class XamarinAndroidBundledAssemblyContextDataProvider : NativeAssemblerS
205205
public override ulong GetBufferSize (object data, string fieldName)
206206
{
207207
var xaba = EnsureType<XamarinAndroidBundledAssembly> (data);
208-
if (MonoAndroidHelper.StringEquals ("name", fieldName, StringComparison.Ordinal)) {
208+
if (MonoAndroidHelper.StringEquals ("name", fieldName)) {
209209
return xaba.name_length;
210210
}
211211

212-
if (MonoAndroidHelper.StringEquals ("file_name", fieldName, StringComparison.Ordinal)) {
212+
if (MonoAndroidHelper.StringEquals ("file_name", fieldName)) {
213213
return xaba.name_length + MonoAndroidHelper.GetMangledAssemblyNameSizeOverhead ();
214214
}
215215

@@ -424,7 +424,7 @@ protected override void Construct (LlvmIrModule module)
424424
};
425425

426426
foreach (var kvp in runtimeProperties) {
427-
if (MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_CONTRACT, StringComparison.Ordinal)) {
427+
if (MonoAndroidHelper.StringEquals (kvp.Key, HOST_PROPERTY_RUNTIME_CONTRACT)) {
428428
continue;
429429
}
430430
runtime_property_names.Add (kvp.Key);

‎src/Xamarin.Android.Build.Tasks/Utilities/BundleConfigSplitConfigsChecker.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void CheckSplitDimensionProperty (Utf8JsonReader reader, Strings strings,
139139
if (reader.ValueTextEquals (strings.ValuePropertyName)) {
140140
reader.Read ();
141141
string? v = reader.GetString ();
142-
valueIsAbi = Xamarin.Android.Tasks.MonoAndroidHelper.StringEquals ("ABI", v, StringComparison.Ordinal);
142+
valueIsAbi = Xamarin.Android.Tasks.MonoAndroidHelper.StringEquals ("ABI", v);
143143
return;
144144
}
145145
}
@@ -181,7 +181,7 @@ static void TransitionState (Strings strings, Utf8JsonReader reader, Stack<Bundl
181181
_ => throw new InvalidOperationException ($"Internal error: unsupported state transition to '{need}'")
182182
};
183183

184-
if (!String.IsNullOrEmpty (objectName) && Xamarin.Android.Tasks.MonoAndroidHelper.StringEquals (needName, objectName, StringComparison.Ordinal)) {
184+
if (!String.IsNullOrEmpty (objectName) && Xamarin.Android.Tasks.MonoAndroidHelper.StringEquals (needName, objectName)) {
185185
state.Push (need);
186186
} else {
187187
state.Push (BundleConfigObject.Other);

‎src/Xamarin.Android.Build.Tasks/Utilities/ELFHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static bool IsLibraryReference (IStringTable stringTable, IDynamicEntry dynEntry
157157
return false;
158158
}
159159

160-
return MonoAndroidHelper.StringEquals (referencedLibraryName, stringTable[(long)index], StringComparison.Ordinal);
160+
return MonoAndroidHelper.StringEquals (referencedLibraryName, stringTable[(long)index]);
161161
}
162162

163163
static bool IsEmptyAOTLibrary (TaskLoggingHelper log, string path, IELF elf)
@@ -170,7 +170,7 @@ static bool IsEmptyAOTLibrary (TaskLoggingHelper log, string path, IELF elf)
170170

171171
bool mono_aot_file_info_found = false;
172172
foreach (var entry in symtab.Entries) {
173-
if (MonoAndroidHelper.StringEquals ("mono_aot_file_info", entry.Name, StringComparison.Ordinal) && entry.Type == ELFSymbolType.Object) {
173+
if (MonoAndroidHelper.StringEquals ("mono_aot_file_info", entry.Name) && entry.Type == ELFSymbolType.Object) {
174174
mono_aot_file_info_found = true;
175175
break;
176176
}

‎src/Xamarin.Android.Build.Tasks/Utilities/JCWGenerator.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static void EnsureIdenticalCollections (TaskLoggingHelper logger, NativeCodeGenS
200200
static bool CheckWhetherTypesMatch (TypeDefinition templateType, TypeDefinition type)
201201
{
202202
// TODO: should we compare individual methods, fields, properties?
203-
return MonoAndroidHelper.StringEquals (templateType.FullName, type.FullName, StringComparison.Ordinal);
203+
return MonoAndroidHelper.StringEquals (templateType.FullName, type.FullName);
204204
}
205205

206206
static void EnsureClassifiersMatch (TaskLoggingHelper logger, NativeCodeGenState templateState, NativeCodeGenState state)
@@ -290,19 +290,19 @@ static bool CheckWhetherMethodsMatch (TaskLoggingHelper logger, MarshalMethodEnt
290290
}
291291

292292
if (!skipJniCheck) {
293-
if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodName, method.JniMethodName, StringComparison.Ordinal)) {
293+
if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodName, method.JniMethodName)) {
294294
logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method name than architecture '{templateArch}':");
295295
logger.LogDebugMessage ($" Expected: '{templateMethod.JniMethodName}', found: '{method.JniMethodName}'");
296296
success = false;
297297
}
298298

299-
if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodSignature, method.JniMethodSignature, StringComparison.Ordinal)) {
299+
if (!MonoAndroidHelper.StringEquals (templateMethod.JniMethodSignature, method.JniMethodSignature)) {
300300
logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI method signature than architecture '{templateArch}':");
301301
logger.LogDebugMessage ($" Expected: '{templateMethod.JniMethodSignature}', found: '{method.JniMethodSignature}'");
302302
success = false;
303303
}
304304

305-
if (!MonoAndroidHelper.StringEquals (templateMethod.JniTypeName, method.JniTypeName, StringComparison.Ordinal)) {
305+
if (!MonoAndroidHelper.StringEquals (templateMethod.JniTypeName, method.JniTypeName)) {
306306
logger.LogDebugMessage ($"Marshal method '{methodName}' for architecture '{arch}' has a different JNI type name than architecture '{templateArch}':");
307307
logger.LogDebugMessage ($" Expected: '{templateMethod.JniTypeName}', found: '{method.JniTypeName}'");
308308
success = false;
@@ -349,6 +349,6 @@ static bool CheckWhetherMembersMatch (TaskLoggingHelper logger, string marshalMe
349349
return false;
350350
}
351351

352-
return MonoAndroidHelper.StringEquals (templateMethod.FullName, method?.FullName, StringComparison.Ordinal);
352+
return MonoAndroidHelper.StringEquals (templateMethod.FullName, method?.FullName);
353353
}
354354
}

0 commit comments

Comments
 (0)