diff --git a/src/Avalonia.Controls/AppBuilderBase.cs b/src/Avalonia.Controls/AppBuilderBase.cs index c5dd072d8a..1f6870d60d 100644 --- a/src/Avalonia.Controls/AppBuilderBase.cs +++ b/src/Avalonia.Controls/AppBuilderBase.cs @@ -210,7 +210,7 @@ namespace Avalonia.Controls var platformClassName = assemblyName.Replace("Avalonia.", string.Empty) + "Platform"; var platformClassFullName = assemblyName + "." + platformClassName; var platformClass = assembly.GetType(platformClassFullName); - var init = platformClass.GetRuntimeMethod("Initialize", new Type[0]); + var init = platformClass.GetRuntimeMethod("Initialize", Type.EmptyTypes); init.Invoke(null, null); }; @@ -245,7 +245,7 @@ namespace Avalonia.Controls select (from constructor in moduleType.GetTypeInfo().DeclaredConstructors where constructor.GetParameters().Length == 0 && !constructor.IsStatic select constructor).Single() into constructor - select (Action)(() => constructor.Invoke(new object[0])); + select (Action)(() => constructor.Invoke(Array.Empty())); Delegate.Combine(moduleInitializers.ToArray()).DynamicInvoke(); } diff --git a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs index c40ddc37ad..f9bbcff9c2 100644 --- a/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs +++ b/src/Avalonia.Controls/Primitives/SelectingItemsControl.cs @@ -99,7 +99,7 @@ namespace Avalonia.Controls.Primitives "SelectionChanged", RoutingStrategies.Bubble); - private static readonly IList Empty = new object[0]; + private static readonly IList Empty = Array.Empty(); private int _selectedIndex = -1; private object _selectedItem; diff --git a/src/Avalonia.Controls/SystemDialog.cs b/src/Avalonia.Controls/SystemDialog.cs index e7cb4763ed..f321625bcc 100644 --- a/src/Avalonia.Controls/SystemDialog.cs +++ b/src/Avalonia.Controls/SystemDialog.cs @@ -27,7 +27,7 @@ namespace Avalonia.Controls throw new ArgumentNullException(nameof(parent)); return ((await AvaloniaLocator.Current.GetService() .ShowFileDialogAsync(this, parent?.PlatformImpl)) ?? - new string[0]).FirstOrDefault(); + Array.Empty()).FirstOrDefault(); } } diff --git a/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs b/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs index fb909dd58d..8e17dbccfd 100644 --- a/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs +++ b/src/Avalonia.Remote.Protocol/DefaultMessageTypeResolver.cs @@ -12,7 +12,7 @@ namespace Avalonia.Remote.Protocol public DefaultMessageTypeResolver(params Assembly[] assemblies) { foreach (var asm in - (assemblies ?? new Assembly[0]).Concat(new[] + (assemblies ?? Array.Empty()).Concat(new[] {typeof(AvaloniaRemoteMessageGuidAttribute).GetTypeInfo().Assembly})) { foreach (var t in asm.ExportedTypes) diff --git a/src/Avalonia.Remote.Protocol/MetsysBson.cs b/src/Avalonia.Remote.Protocol/MetsysBson.cs index 5593112bd6..524ec09ca9 100644 --- a/src/Avalonia.Remote.Protocol/MetsysBson.cs +++ b/src/Avalonia.Remote.Protocol/MetsysBson.cs @@ -806,7 +806,7 @@ namespace Metsys.Bson { return Activator.CreateInstance(typeof(List<>).MakeGenericType(itemType)); } - if (type.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, new Type[0], null) != null) + if (type.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, Type.EmptyTypes, null) != null) { return Activator.CreateInstance(type); } @@ -853,7 +853,7 @@ namespace Metsys.Bson return (IDictionary)Activator.CreateInstance(typeof(Dictionary<,>).MakeGenericType(keyType, valueType)); } - if (dictionaryType.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, new Type[0], null) != null) + if (dictionaryType.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null, Type.EmptyTypes, null) != null) { return (IDictionary)Activator.CreateInstance(dictionaryType); } diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs index 19fb54e125..4e95d21a48 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/VisualNode.cs @@ -17,8 +17,8 @@ namespace Avalonia.Rendering.SceneGraph /// internal class VisualNode : IVisualNode { - private static readonly IReadOnlyList EmptyChildren = new IVisualNode[0]; - private static readonly IReadOnlyList> EmptyDrawOperations = new IRef[0]; + private static readonly IReadOnlyList EmptyChildren = Array.Empty(); + private static readonly IReadOnlyList> EmptyDrawOperations = Array.Empty>(); private Rect? _bounds; private double _opacity; diff --git a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs index d792ad9991..c452290afc 100644 --- a/src/Windows/Avalonia.Win32/SystemDialogImpl.cs +++ b/src/Windows/Avalonia.Win32/SystemDialogImpl.cs @@ -21,7 +21,7 @@ namespace Avalonia.Win32 var hWnd = parent?.Handle?.Handle ?? IntPtr.Zero; return Task.Factory.StartNew(() => { - var result = new string[0]; + var result = Array.Empty(); Guid clsid = dialog is OpenFileDialog ? UnmanagedMethods.ShellIds.OpenFileDialog : UnmanagedMethods.ShellIds.SaveFileDialog; Guid iid = UnmanagedMethods.ShellIds.IFileDialog;