Refactor to use NETCORE/NETSTANDARD2_0 build symbols

Author: mythz

src/Directory.Build.props

@@ -4,7 +4,7 @@
     <Version>5.12.1</Version>
     <Authors>ServiceStack</Authors>
     <Company>ServiceStack, Inc.</Company>
-    <Copyright>&#169; 2008-2018 ServiceStack, Inc</Copyright>
+    <Copyright>&#169; 2008-2022 ServiceStack, Inc</Copyright>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageProjectUrl>https://github.com/ServiceStack/ServiceStack.Text</PackageProjectUrl>
     <PackageLicenseUrl>https://servicestack.net/terms</PackageLicenseUrl>
@@ -43,6 +43,14 @@
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);NET6_0;NET6_0_OR_GREATER</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);NETCORE;NETCORE_SUPPORT</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
   </ItemGroup>

src/ServiceStack.Memory/ServiceStack.Memory.csproj

@@ -3,7 +3,7 @@
     <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE2_1</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE;NETCORE2_1</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.Text\ServiceStack.Text.csproj" />

src/ServiceStack.Text.sln

@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F7FB50ED
 		Directory.Build.props = Directory.Build.props
 		ServiceStack.Text\ServiceStack.Text.Core.csproj = ServiceStack.Text\ServiceStack.Text.Core.csproj
 		..\build\build-core.proj = ..\build\build-core.proj
+		..\tests\Directory.Build.props = ..\tests\Directory.Build.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ServiceStack.Text", "ServiceStack.Text\ServiceStack.Text.csproj", "{579B3FDB-CDAD-44E1-8417-885C38E49A0E}"

src/ServiceStack.Text/Env.cs

@@ -17,7 +17,7 @@ static Env()
             if (PclExport.Instance == null)
                 throw new ArgumentException("PclExport.Instance needs to be initialized");
 
-#if NETSTANDARD
+#if NETCORE
             IsNetStandard = true;
             try
             {
@@ -64,7 +64,7 @@ static Env()
             SupportsDynamic = true;
 #endif
 
-#if NETCORE2_1 || NET6_0
+#if NETCORE
             IsNetStandard = false;
             IsNetCore = true;
             SupportsDynamic = true;
@@ -73,7 +73,6 @@ static Env()
 #if NET6_0
             IsNet6 = true;
 #endif
-
 #if NETSTANDARD2_0
             IsNetStandard20 = true;
 #endif
@@ -218,7 +217,7 @@ public static string ReferenceAssemblyPath
             set => referenceAssemblyPath = value;
         }
 
-#if NETSTANDARD
+#if NETCORE
         private static bool IsRunningAsUwp()
         {
             try
@@ -315,7 +314,7 @@ public static ConfiguredTaskAwaitable ConfigAwait(this Task task) =>
         public static ConfiguredTaskAwaitable<T> ConfigAwait<T>(this Task<T> task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);
 
-#if NETSTANDARD || NETCORE2_1 || NET6_0
+#if NETCORE
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ConfiguredValueTaskAwaitable ConfigAwait(this ValueTask task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);

src/ServiceStack.Text/JsConfigScope.cs

@@ -13,7 +13,7 @@ public sealed class JsConfigScope : Config, IDisposable
         bool disposed;
         readonly JsConfigScope parent;
 
-#if NETSTANDARD        
+#if NETCORE        
         private static AsyncLocal<JsConfigScope> head = new AsyncLocal<JsConfigScope>();
 #else
         [ThreadStatic] private static JsConfigScope head;
@@ -23,7 +23,7 @@ internal JsConfigScope()
         {
             PclExport.Instance.BeginThreadAffinity();
 
-#if NETSTANDARD        
+#if NETCORE        
             parent = head.Value;
             head.Value = this;
 #else
@@ -33,7 +33,7 @@ internal JsConfigScope()
         }
 
         internal static JsConfigScope Current => 
-#if NETSTANDARD        
+#if NETCORE        
             head.Value;
 #else
             head;
@@ -44,7 +44,7 @@ public void Dispose()
             if (!disposed)
             {
                 disposed = true;
-#if NETSTANDARD        
+#if NETCORE        
                 head.Value = parent;
 #else
                 head = parent;

src/ServiceStack.Text/LicenseUtils.cs

@@ -499,7 +499,7 @@ public static bool VerifySignedHash(byte[] DataToVerify, byte[] SignedData, Syst
 
         public static LicenseKey VerifyLicenseKeyText(string licenseKeyText)
         {
-#if NET45 || NETCORE2_1 || NET6_0
+#if NET45 || NETCORE
             LicenseKey key;
             try
             {

src/ServiceStack.Text/MemoryProvider.cs

@@ -12,7 +12,7 @@ namespace ServiceStack.Text
     public abstract class MemoryProvider
     {
         public static MemoryProvider Instance =
-#if NETCORE2_1 || NET6_0
+#if NETCORE && !NETSTANDARD2_0
             ServiceStack.Memory.NetCoreMemory.Provider;
 #else
             DefaultMemory.Provider;

src/ServiceStack.Text/NetCoreMemory.cs

@@ -1,4 +1,4 @@
-#if NETCORE2_1 || NET6_0
+#if NETCORE && !NETSTANDARD2_0
 
 using System;
 using System.Buffers.Text;

src/ServiceStack.Text/PathUtils.cs

@@ -66,7 +66,7 @@ public static string MapAbsolutePath(this string relativePath)
         public static string MapHostAbsolutePath(this string relativePath)
         {
             var sep = PclExport.Instance.DirSep;
-#if !NETSTANDARD
+#if !NETCORE
             return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..");
 #else
             return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..{sep}..");

src/ServiceStack.Text/PclExport.NetCore.cs

@@ -1,4 +1,4 @@
-#if NETCORE2_1 || NET6_0
+#if NETCORE && !NETSTANDARD2_0
 
 using System;
 using ServiceStack.Text;