diff --git a/src/Markdig/Helpers/CompactPrefixTree.cs b/src/Markdig/Helpers/CompactPrefixTree.cs
index b9729ef4..7a239e12 100644
--- a/src/Markdig/Helpers/CompactPrefixTree.cs
+++ b/src/Markdig/Helpers/CompactPrefixTree.cs
@@ -19,8 +19,6 @@ using System.Runtime.CompilerServices;
* Please note the lack of a Remove method on this data structure
*/
-// Relies on NETCORE being set for selective use of Spans
-
//namespace SharpCollections.Generic
namespace Markdig.Helpers
{
diff --git a/src/Markdig/Helpers/EntityHelper.cs b/src/Markdig/Helpers/EntityHelper.cs
index 303077ad..3877ce7c 100644
--- a/src/Markdig/Helpers/EntityHelper.cs
+++ b/src/Markdig/Helpers/EntityHelper.cs
@@ -69,7 +69,7 @@ namespace Markdig.Helpers
utf32 -= 65536;
return new string(
-#if NETCORE
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
stackalloc
#else
new
diff --git a/src/Markdig/Markdig.targets b/src/Markdig/Markdig.targets
index bda486ed..688bb733 100644
--- a/src/Markdig/Markdig.targets
+++ b/src/Markdig/Markdig.targets
@@ -34,18 +34,6 @@
-
-
- $(DefineConstants);NETCORE
-
-
-
- $(DefineConstants);NETCORE
-
-
-
- $(DefineConstants);NETCORE
-
diff --git a/src/Markdig/Polyfills/NullableAttributes.cs b/src/Markdig/Polyfills/NullableAttributes.cs
index cd576ab0..8655646b 100644
--- a/src/Markdig/Polyfills/NullableAttributes.cs
+++ b/src/Markdig/Polyfills/NullableAttributes.cs
@@ -5,7 +5,7 @@
namespace System.Diagnostics.CodeAnalysis
{
-#if !NETCORE
+#if !NETSTANDARD2_1_OR_GREATER && !NETCOREAPP3_1_OR_GREATER
internal sealed class DoesNotReturnAttribute : Attribute { }
[AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
diff --git a/src/Markdig/Renderers/TextRendererBase.cs b/src/Markdig/Renderers/TextRendererBase.cs
index afc27084..0ac1c240 100644
--- a/src/Markdig/Renderers/TextRendererBase.cs
+++ b/src/Markdig/Renderers/TextRendererBase.cs
@@ -102,7 +102,7 @@ namespace Markdig.Renderers
}
protected bool previousWasLine;
-#if !NETCORE
+#if !NETSTANDARD2_1_OR_GREATER && !NETCOREAPP3_1_OR_GREATER
private char[] buffer;
#endif
private readonly List indents;
@@ -113,7 +113,7 @@ namespace Markdig.Renderers
/// The writer.
protected TextRendererBase(TextWriter writer) : base(writer)
{
-#if !NETCORE
+#if !NETSTANDARD2_1_OR_GREATER && !NETCOREAPP3_1_OR_GREATER
buffer = new char[1024];
#endif
// We assume that we are starting as if we had previously a newline
@@ -263,7 +263,7 @@ namespace Markdig.Renderers
WriteIndent();
previousWasLine = false;
-#if NETCORE
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_1_OR_GREATER
Writer.Write(content.AsSpan(offset, length));
#else
if (offset == 0 && content.Length == length)