From 1abc804228d6e93b5f75fa7884da8dbb90ae1e8b Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Mon, 9 Jan 2023 20:03:49 -0800 Subject: [PATCH] Bump .NET framework target to net462 --- src/Markdig.Tests/TestDescendantsOrder.cs | 19 +++++----- src/Markdig/Helpers/ArrayHelper.cs | 9 ----- src/Markdig/Helpers/FastStringWriter.cs | 37 ++++++++----------- src/Markdig/Markdig.targets | 6 +-- src/Markdig/Polyfills/ConcurrentQueue.cs | 2 +- src/Markdig/Syntax/ContainerBlock.cs | 2 +- src/Markdig/Syntax/Inlines/ContainerInline.cs | 2 +- .../Syntax/LinkReferenceDefinitionGroup.cs | 2 +- .../Syntax/MarkdownObjectExtensions.cs | 8 ++-- 9 files changed, 35 insertions(+), 52 deletions(-) diff --git a/src/Markdig.Tests/TestDescendantsOrder.cs b/src/Markdig.Tests/TestDescendantsOrder.cs index 6ab3e739..f62c8464 100644 --- a/src/Markdig.Tests/TestDescendantsOrder.cs +++ b/src/Markdig.Tests/TestDescendantsOrder.cs @@ -2,6 +2,7 @@ using NUnit.Framework; using Markdig.Helpers; using Markdig.Syntax; using Markdig.Syntax.Inlines; +using System; using System.Linq; using System.Collections.Generic; @@ -32,9 +33,9 @@ namespace Markdig.Tests foreach (LiteralInline literalInline in syntaxTree.Descendants()) { - Assert.AreSame(ArrayHelper.Empty(), literalInline.Descendants()); - Assert.AreSame(ArrayHelper.Empty(), literalInline.Descendants()); - Assert.AreSame(ArrayHelper.Empty(), literalInline.Descendants()); + Assert.AreSame(Array.Empty(), literalInline.Descendants()); + Assert.AreSame(Array.Empty(), literalInline.Descendants()); + Assert.AreSame(Array.Empty(), literalInline.Descendants()); } foreach (ContainerInline containerInline in syntaxTree.Descendants()) @@ -49,13 +50,13 @@ namespace Markdig.Tests if (containerInline.FirstChild is null) { - Assert.AreSame(ArrayHelper.Empty(), containerInline.Descendants()); - Assert.AreSame(ArrayHelper.Empty(), containerInline.FindDescendants()); - Assert.AreSame(ArrayHelper.Empty(), (containerInline as MarkdownObject).Descendants()); + Assert.AreSame(Array.Empty(), containerInline.Descendants()); + Assert.AreSame(Array.Empty(), containerInline.FindDescendants()); + Assert.AreSame(Array.Empty(), (containerInline as MarkdownObject).Descendants()); } - Assert.AreSame(ArrayHelper.Empty(), containerInline.Descendants()); - Assert.AreSame(ArrayHelper.Empty(), containerInline.Descendants()); + Assert.AreSame(Array.Empty(), containerInline.Descendants()); + Assert.AreSame(Array.Empty(), containerInline.Descendants()); } foreach (ParagraphBlock paragraphBlock in syntaxTree.Descendants()) @@ -64,7 +65,7 @@ namespace Markdig.Tests (paragraphBlock as MarkdownObject).Descendants(), paragraphBlock.Descendants()); - Assert.AreSame(ArrayHelper.Empty(), paragraphBlock.Descendants()); + Assert.AreSame(Array.Empty(), paragraphBlock.Descendants()); } foreach (ContainerBlock containerBlock in syntaxTree.Descendants()) diff --git a/src/Markdig/Helpers/ArrayHelper.cs b/src/Markdig/Helpers/ArrayHelper.cs index a20840ff..f2453321 100644 --- a/src/Markdig/Helpers/ArrayHelper.cs +++ b/src/Markdig/Helpers/ArrayHelper.cs @@ -12,15 +12,6 @@ namespace Markdig.Helpers /// /// An empty array. /// -#if NET452 - public static T[] Empty() => EmptyArray.Value; - - private static class EmptyArray - { - public static readonly T[] Value = new T[0]; - } -#else public static T[] Empty() => System.Array.Empty(); -#endif } } \ No newline at end of file diff --git a/src/Markdig/Helpers/FastStringWriter.cs b/src/Markdig/Helpers/FastStringWriter.cs index 8be2307f..367ab415 100644 --- a/src/Markdig/Helpers/FastStringWriter.cs +++ b/src/Markdig/Helpers/FastStringWriter.cs @@ -8,19 +8,12 @@ using System.Diagnostics.CodeAnalysis; using System.IO; using System.Runtime.CompilerServices; using System.Text; -using System.Threading; using System.Threading.Tasks; namespace Markdig.Helpers { internal sealed class FastStringWriter : TextWriter { -#if NET452 - private static Task CompletedTask => Task.FromResult(0); -#else - private static Task CompletedTask => Task.CompletedTask; -#endif - public override Encoding Encoding => Encoding.Unicode; private char[] _chars; @@ -66,13 +59,13 @@ namespace Markdig.Helpers public override Task WriteAsync(char value) { Write(value); - return CompletedTask; + return Task.CompletedTask; } public override Task WriteLineAsync(char value) { WriteLine(value); - return CompletedTask; + return Task.CompletedTask; } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -100,13 +93,13 @@ namespace Markdig.Helpers public override Task WriteAsync(string? value) { Write(value); - return CompletedTask; + return Task.CompletedTask; } public override Task WriteLineAsync(string? value) { WriteLine(value); - return CompletedTask; + return Task.CompletedTask; } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -156,16 +149,16 @@ namespace Markdig.Helpers public override Task WriteAsync(char[] buffer, int index, int count) { Write(buffer, index, count); - return CompletedTask; + return Task.CompletedTask; } public override Task WriteLineAsync(char[] buffer, int index, int count) { WriteLine(buffer, index, count); - return CompletedTask; + return Task.CompletedTask; } -#if !(NET452 || NETSTANDARD2_0) +#if !(NETFRAMEWORK || NETSTANDARD2_0) [MethodImpl(MethodImplOptions.AggressiveInlining)] public override void Write(ReadOnlySpan value) { @@ -188,17 +181,17 @@ namespace Markdig.Helpers public override Task WriteAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { Write(buffer.Span); - return CompletedTask; + return Task.CompletedTask; } public override Task WriteLineAsync(ReadOnlyMemory buffer, CancellationToken cancellationToken = default) { WriteLine(buffer.Span); - return CompletedTask; + return Task.CompletedTask; } #endif -#if !(NET452 || NETSTANDARD2_0 || NETSTANDARD2_1) +#if !(NETFRAMEWORK || NETSTANDARD2_0 || NETSTANDARD2_1) [MethodImpl(MethodImplOptions.AggressiveInlining)] public override void Write(StringBuilder? value) { @@ -225,13 +218,13 @@ namespace Markdig.Helpers public override Task WriteAsync(StringBuilder? value, CancellationToken cancellationToken = default) { Write(value); - return CompletedTask; + return Task.CompletedTask; } public override Task WriteLineAsync(StringBuilder? value, CancellationToken cancellationToken = default) { WriteLine(value); - return CompletedTask; + return Task.CompletedTask; } #endif @@ -247,7 +240,7 @@ namespace Markdig.Helpers public override Task WriteLineAsync() { WriteLine(); - return CompletedTask; + return Task.CompletedTask; } @@ -273,9 +266,9 @@ namespace Markdig.Helpers public override void Close() { } - public override Task FlushAsync() => CompletedTask; + public override Task FlushAsync() => Task.CompletedTask; -#if !(NET452 || NETSTANDARD2_0) +#if !(NETFRAMEWORK || NETSTANDARD2_0) public override ValueTask DisposeAsync() => default; #endif diff --git a/src/Markdig/Markdig.targets b/src/Markdig/Markdig.targets index 81420061..1ceb54dd 100644 --- a/src/Markdig/Markdig.targets +++ b/src/Markdig/Markdig.targets @@ -5,9 +5,7 @@ Alexandre Mutel en-US Alexandre Mutel - - - net452;netstandard2.0;netstandard2.1;net6.0 + net462;netstandard2.0;netstandard2.1;net6.0 false Markdown CommonMark md html md2html https://github.com/lunet-io/markdig/blob/master/changelog.md @@ -26,7 +24,7 @@ snupkg - + diff --git a/src/Markdig/Polyfills/ConcurrentQueue.cs b/src/Markdig/Polyfills/ConcurrentQueue.cs index 4566ae98..86437293 100644 --- a/src/Markdig/Polyfills/ConcurrentQueue.cs +++ b/src/Markdig/Polyfills/ConcurrentQueue.cs @@ -2,7 +2,7 @@ // This file is licensed under the BSD-Clause 2 license. // See the license.txt file in the project root for more information. -#if NET452 || NETSTANDARD2_0 +#if NETFRAMEWORK || NETSTANDARD2_0 namespace System.Collections.Concurrent { internal static class ConcurrentQueueExtensions diff --git a/src/Markdig/Syntax/ContainerBlock.cs b/src/Markdig/Syntax/ContainerBlock.cs index 43a1eb29..46143122 100644 --- a/src/Markdig/Syntax/ContainerBlock.cs +++ b/src/Markdig/Syntax/ContainerBlock.cs @@ -28,7 +28,7 @@ namespace Markdig.Syntax /// The parser used to create this block. protected ContainerBlock(BlockParser? parser) : base(parser) { - _children = ArrayHelper.Empty(); + _children = Array.Empty(); SetTypeKind(isInline: false, isContainer: true); } diff --git a/src/Markdig/Syntax/Inlines/ContainerInline.cs b/src/Markdig/Syntax/Inlines/ContainerInline.cs index 0099307a..404d21d1 100644 --- a/src/Markdig/Syntax/Inlines/ContainerInline.cs +++ b/src/Markdig/Syntax/Inlines/ContainerInline.cs @@ -109,7 +109,7 @@ namespace Markdig.Syntax.Inlines { if (FirstChild is null) { - return ArrayHelper.Empty(); + return Array.Empty(); } else { diff --git a/src/Markdig/Syntax/LinkReferenceDefinitionGroup.cs b/src/Markdig/Syntax/LinkReferenceDefinitionGroup.cs index 367e4e2b..b93962bb 100644 --- a/src/Markdig/Syntax/LinkReferenceDefinitionGroup.cs +++ b/src/Markdig/Syntax/LinkReferenceDefinitionGroup.cs @@ -16,7 +16,7 @@ namespace Markdig.Syntax /// public class LinkReferenceDefinitionGroup : ContainerBlock { -#if NET452 +#if NETFRAMEWORK private static readonly StringComparer _unicodeIgnoreCaseComparer = StringComparer.InvariantCultureIgnoreCase; #else private static readonly StringComparer _unicodeIgnoreCaseComparer = CultureInfo.InvariantCulture.CompareInfo.GetStringComparer(CompareOptions.IgnoreCase | CompareOptions.IgnoreNonSpace); diff --git a/src/Markdig/Syntax/MarkdownObjectExtensions.cs b/src/Markdig/Syntax/MarkdownObjectExtensions.cs index 72dd5414..fd39973b 100644 --- a/src/Markdig/Syntax/MarkdownObjectExtensions.cs +++ b/src/Markdig/Syntax/MarkdownObjectExtensions.cs @@ -23,8 +23,8 @@ namespace Markdig.Syntax /// An iteration over the descendant elements public static IEnumerable Descendants(this MarkdownObject markdownObject) { - Stack stack = new Stack(); - Stack pushStack = new Stack(); + var stack = new Stack(); + var pushStack = new Stack(); stack.Push(markdownObject); pushStack.Push(false); @@ -95,7 +95,7 @@ namespace Markdig.Syntax } } - return ArrayHelper.Empty(); + return Array.Empty(); } /// @@ -125,7 +125,7 @@ namespace Markdig.Syntax } else { - return ArrayHelper.Empty(); + return Array.Empty(); } }