Merge pull request #591 from carbon/net60

Drop .netcoreapp2.1 target and cross target .net6.0
xoofx · Jan 30, 2022 · ff89b48 · ff89b48
2 parents 5e3527b + 58de5db
commit ff89b48
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/readme.md b/readme.md
@@ -103,7 +103,7 @@ You can have a look at the [MarkdownExtensions](https://github.com/lunet-io/mark
 
 ## Build
 
-In order to build Markdig, you need to install [.NET Core RTM](https://www.microsoft.com/net/core)
+In order to build Markdig, you need to install [.NET 6.0](https://dotnet.microsoft.com/en-us/download)
 
 ## License
 

diff --git a/src/Markdig.Benchmarks/Markdig.Benchmarks.csproj b/src/Markdig.Benchmarks/Markdig.Benchmarks.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net471</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>false</IsPackable>

diff --git a/src/Markdig/Helpers/CharacterMap.cs b/src/Markdig/Helpers/CharacterMap.cs
@@ -107,7 +107,7 @@ public int IndexOfOpeningCharacter(string text, int start, int end)
         {
             if (nonAsciiMap is null)
             {
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
                 ref char textRef = ref Unsafe.AsRef(in text.GetPinnableReference());
                 for (; start <= end; start++)
                 {
@@ -154,7 +154,7 @@ public int IndexOfOpeningCharacter(string text, int start, int end)
 
         private int IndexOfOpeningCharacterNonAscii(string text, int start, int end)
         {
-#if NETCOREAPP3_1
+#if NETCOREAPP3_1_OR_GREATER
             ref char textRef = ref Unsafe.AsRef(in text.GetPinnableReference());
             for (int i = start; i <= end; i++)
             {

diff --git a/src/Markdig/Markdig.targets b/src/Markdig/Markdig.targets
@@ -8,7 +8,7 @@
     <Authors>Alexandre Mutel</Authors>
     <!-- Markdig.Wpf still supports net452, a target still supported by by Microsoft until January 10, 2023 -->
     <!-- see: https://github.com/xoofx/markdig/pull/466 -->
-    <TargetFrameworks>net452;netstandard2.0;netstandard2.1;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0;netstandard2.1;netcoreapp3.1;net6.0</TargetFrameworks>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <PackageTags>Markdown CommonMark md html md2html</PackageTags>
     <PackageReleaseNotes>https://github.com/lunet-io/markdig/blob/master/changelog.md</PackageReleaseNotes>
@@ -17,7 +17,7 @@
     <PackageIcon>markdig.png</PackageIcon>
     <PackageProjectUrl>https://github.com/lunet-io/markdig</PackageProjectUrl>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -39,14 +39,14 @@
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <None Include="../../img/markdig.png" Pack="true" PackagePath="" />
     <None Include="../../readme.md" Pack="true" PackagePath="/"/>

diff --git a/src/Markdig/Polyfills/NullableAttributes.cs b/src/Markdig/Polyfills/NullableAttributes.cs
@@ -5,7 +5,7 @@
 
 namespace System.Diagnostics.CodeAnalysis
 {
-#if !NETCORE || NETCOREAPP2_1
+#if !NETCORE
     internal sealed class DoesNotReturnAttribute : Attribute { }
 
     [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
@@ -17,6 +17,7 @@ internal sealed class NotNullWhenAttribute : Attribute
     }
 #endif
 
+#if !NET5_0_OR_GREATER
     internal sealed class MemberNotNullAttribute : Attribute
     {
         public MemberNotNullAttribute(string member) => Members = new[] { member };
@@ -25,4 +26,5 @@ internal sealed class MemberNotNullAttribute : Attribute
 
         public string[] Members { get; }
     }
+#endif
 }