Skip to content

Commit 56da5d8

Browse files
Fix Array.Empty<T>() and string.Empty patterns in Utilities directory
Co-authored-by: jonathanpeppers <840039+jonathanpeppers@users.noreply.github.com>
1 parent 4149101 commit 56da5d8

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class EnvironmentFilesParser
2121

2222
public bool AreBrokenExceptionTransitionsEnabled (ITaskItem[] environments)
2323
{
24-
foreach (ITaskItem env in environments ?? Array.Empty<ITaskItem> ()) {
24+
foreach (ITaskItem env in environments ?? []) {
2525
foreach (string line in File.ReadLines (env.ItemSpec)) {
2626
if (IsBrokenExceptionTransitionsLine (line.Trim ())) {
2727
return true;
@@ -34,7 +34,7 @@ public bool AreBrokenExceptionTransitionsEnabled (ITaskItem[] environments)
3434

3535
public void Parse (ITaskItem[]? environments, SequencePointsMode sequencePointsMode, TaskLoggingHelper log)
3636
{
37-
foreach (ITaskItem env in environments ?? Array.Empty<ITaskItem> ()) {
37+
foreach (ITaskItem env in environments ?? []) {
3838
foreach (string line in File.ReadLines (env.ItemSpec)) {
3939
var lineToWrite = line.Trim ();
4040
if (lineToWrite.StartsWith ("MONO_LOG_LEVEL=", StringComparison.Ordinal))

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public IList<R> Parse (string resourceDirectory, IEnumerable<string> additionalR
6565
ProcessResourceFile (file, resources);
6666
}
6767
}
68-
foreach (var dir in additionalResourceDirectories ?? Array.Empty<string>()) {
68+
foreach (var dir in additionalResourceDirectories ?? []) {
6969
Log.LogDebugMessage ($"Processing Directory {dir}");
7070
if (Directory.Exists (dir)) {
7171
foreach (var file in Directory.EnumerateFiles (dir, "*.*", SearchOption.AllDirectories)) {
@@ -75,7 +75,7 @@ public IList<R> Parse (string resourceDirectory, IEnumerable<string> additionalR
7575
Log.LogDebugMessage ($"Skipping non-existent directory: {dir}");
7676
}
7777
}
78-
foreach (var aar in aarLibraries ?? Array.Empty<string>()) {
78+
foreach (var aar in aarLibraries ?? []) {
7979
Log.LogDebugMessage ($"Processing Aar file {aar}");
8080
if (!File.Exists (aar)) {
8181
Log.LogDebugMessage ($"Skipping non-existent aar: {aar}");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public bool GenerateCode (CallableWrapperType generator, TypeDefinition type, st
127127
endLineNumber: 0,
128128
endColumnNumber: 0,
129129
message: xae.MessageWithoutCode,
130-
messageArgs: Array.Empty<object> ()
130+
messageArgs: []
131131
);
132132
} catch (DirectoryNotFoundException ex) {
133133
ok = false;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ public void SetAbi (string abi)
10921092
public bool ValidateVersionCode (out string error, out string errorCode)
10931093
{
10941094
int code;
1095-
error = errorCode = string.Empty;
1095+
error = errorCode = "";
10961096
if (!int.TryParse (VersionCode, out code)) {
10971097
error = string.Format (Properties.Resources.XA0003, VersionCode);
10981098
errorCode = "XA0003";
@@ -1110,7 +1110,7 @@ public void CalculateVersionCode (string currentAbi, string versionCodePattern,
11101110
{
11111111
var regex = new Regex ("\\{(?<key>([A-Za-z]+)):?[D0-9]*[\\}]");
11121112
var kvp = new Dictionary<string, int> ();
1113-
foreach (var item in versionCodeProperties?.Split (new char [] { ';', ':' }) ?? Array.Empty<string> ()) {
1113+
foreach (var item in versionCodeProperties?.Split (new char [] { ';', ':' }) ?? []) {
11141114
var keyValue = item.Split (new char [] { '=' });
11151115
int val;
11161116
if (!int.TryParse (keyValue [1], out val))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static class MavenExtensions
2727
// Helps to 'foreach' into a possibly null array
2828
public static T [] OrEmpty<T> (this T []? value)
2929
{
30-
return value ?? Array.Empty<T> ();
30+
return value ?? [];
3131
}
3232

3333
// Removes AggregateException wrapping around an exception

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ internal static bool LogInternalExceptions {
238238
#if MSBUILD
239239
public static IEnumerable<string> ExpandFiles (ITaskItem[] libraryProjectJars)
240240
{
241-
libraryProjectJars = libraryProjectJars ?? Array.Empty<ITaskItem> ();
241+
libraryProjectJars = libraryProjectJars ?? [];
242242
return (from path in libraryProjectJars
243243
let dir = Path.GetDirectoryName (path.ItemSpec)
244244
let pattern = Path.GetFileName (path.ItemSpec)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ void GenerateRelease (string outputDirectory)
184184

185185
foreach (ModuleReleaseData module in modules) {
186186
if (module.TypesScratch.Count == 0) {
187-
module.Types = Array.Empty<TypeMapReleaseEntry> ();
187+
module.Types = [];
188188
continue;
189189
}
190190

0 commit comments

Comments
 (0)