Browse Source
Merge branch 'master' into features/NetAnalyzers/CA1802
pull/9162/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
9 additions and
7 deletions
-
.editorconfig
-
src/Avalonia.Base/Media/TextFormatting/Unicode/GraphemeBreak.cs
-
src/Avalonia.Controls.ColorPicker/Helpers/ColorPickerHelpers.cs
-
src/Avalonia.DesignerSupport/Remote/HtmlTransport/SimpleWebSocketHttpServer.cs
-
src/Avalonia.FreeDesktop/DBusMenuExporter.cs
-
src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs
|
|
|
@ -139,6 +139,8 @@ dotnet_analyzer_diagnostic.category-Performance.severity = none #error - Uncomme |
|
|
|
|
|
|
|
# CA1802: Use literals where appropriate |
|
|
|
dotnet_diagnostic.CA1802.severity = warning |
|
|
|
# CA1825: Avoid zero-length array allocations |
|
|
|
dotnet_diagnostic.CA1825.severity = warning |
|
|
|
|
|
|
|
# Wrapping preferences |
|
|
|
csharp_wrap_before_ternary_opsigns = false |
|
|
|
|
|
|
|
@ -2,6 +2,6 @@ namespace Avalonia.Media.TextFormatting.Unicode |
|
|
|
{ |
|
|
|
internal static class GraphemeBreak |
|
|
|
{ |
|
|
|
public static byte[] Data => new byte[0]; |
|
|
|
public static byte[] Data => System.Array.Empty<byte>(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -49,7 +49,7 @@ namespace Avalonia.Controls.Primitives |
|
|
|
{ |
|
|
|
if (width == 0 || height == 0) |
|
|
|
{ |
|
|
|
return new byte[0]; |
|
|
|
return Array.Empty<byte>(); |
|
|
|
} |
|
|
|
|
|
|
|
var bitmap = await Task.Run<byte[]>(() => |
|
|
|
|
|
|
|
@ -140,7 +140,7 @@ namespace Avalonia.DesignerSupport.Remote.HtmlTransport |
|
|
|
IsWebsocketRequest = true; |
|
|
|
if (headers.TryGetValue("Sec-WebSocket-Protocol", out h)) |
|
|
|
WebSocketProtocols = h.Split(',').Select(x => x.Trim()).ToArray(); |
|
|
|
else WebSocketProtocols = new string[0]; |
|
|
|
else WebSocketProtocols = Array.Empty<string>(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -340,7 +340,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
{ |
|
|
|
var id = item == null ? 0 : GetId(item); |
|
|
|
var props = GetProperties((item, menu), propertyNames); |
|
|
|
var children = (depth == 0 || menu == null) ? new object[0] : new object[menu.Items.Count]; |
|
|
|
var children = (depth == 0 || menu == null) ? Array.Empty<object>() : new object[menu.Items.Count]; |
|
|
|
if(menu != null) |
|
|
|
for (var c = 0; c < children.Length; c++) |
|
|
|
{ |
|
|
|
@ -397,7 +397,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
{ |
|
|
|
foreach (var e in Events) |
|
|
|
HandleEvent(e.id, e.eventId, e.data, e.timestamp); |
|
|
|
return Task.FromResult(new int[0]); |
|
|
|
return Task.FromResult(Array.Empty<int>()); |
|
|
|
} |
|
|
|
|
|
|
|
public async Task<bool> AboutToShowAsync(int Id) |
|
|
|
@ -407,7 +407,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
|
|
|
|
public async Task<(int[] updatesNeeded, int[] idErrors)> AboutToShowGroupAsync(int[] Ids) |
|
|
|
{ |
|
|
|
return (new int[0], new int[0]); |
|
|
|
return (Array.Empty<int>(), Array.Empty<int>()); |
|
|
|
} |
|
|
|
|
|
|
|
#region Events
|
|
|
|
|
|
|
|
@ -99,7 +99,7 @@ namespace Avalonia.LinuxFramebuffer.Output |
|
|
|
// prepare for the new ioctl call
|
|
|
|
var handles = new uint[] {handle, 0, 0, 0}; |
|
|
|
var pitches = new uint[] {stride, 0, 0, 0}; |
|
|
|
var offsets = new uint[] {}; |
|
|
|
var offsets = Array.Empty<uint>(); |
|
|
|
|
|
|
|
var ret = drmModeAddFB2(_card.Fd, w, h, format, handles, pitches, |
|
|
|
offsets, out var fbHandle, 0); |
|
|
|
|