Add .NET Standard 2.1 builds to remove ambiguous ext methods

mythz · mythz · commit e02f7ca7fe83 · 2019-10-09T18:18:43.000-04:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -33,7 +33,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_0</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ServiceStack.Memory/ServiceStack.Memory.csproj b/src/ServiceStack.Memory/ServiceStack.Memory.csproj
@@ -1,9 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.1</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETCORE2_1</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE2_1</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.Text\ServiceStack.Text.csproj" />
diff --git a/src/ServiceStack.Text/CharMemoryExtensions.cs b/src/ServiceStack.Text/CharMemoryExtensions.cs
@@ -381,6 +381,9 @@ public static int LastIndexOf(this ReadOnlyMemory<char> value, string needle, in
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static bool EqualsOrdinal(this ReadOnlyMemory<char> value, ReadOnlyMemory<char> other) => value.Span.Equals(other.Span, StringComparison.Ordinal);
 
+#if !NETSTANDARD2_1
+        //Ambiguous definitions in .NET Core 3.0 System MemoryExtensions.cs 
+        
         public static ReadOnlyMemory<char> Trim(this ReadOnlyMemory<char> span)
         {
             return span.TrimStart().TrimEnd();
@@ -411,6 +414,7 @@ public static ReadOnlyMemory<char> TrimEnd(this ReadOnlyMemory<char> value)
             }
             return value.Slice(0, end + 1);
         }
+#endif
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ReadOnlyMemory<char> SafeSlice(this ReadOnlyMemory<char> value, int startIndex) => SafeSlice(value, startIndex, value.Length);
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -14,7 +14,7 @@ static Env()
             if (PclExport.Instance == null)
                 throw new ArgumentException("PclExport.Instance needs to be initialized");
 
-#if NETSTANDARD2_0 || NETCORE2_1
+#if NETSTANDARD
             IsNetStandard = true;
             try
             {
@@ -64,6 +64,16 @@ static Env()
 #if NETCORE2_1
             IsNetStandard = false;
             IsNetCore = true;
+            IsNetCore21 = true;
+            SupportsDynamic = true;
+#endif
+
+#if NETSTANDARD2_0
+            IsNetStandard20 = true;
+#endif
+
+#if NETSTANDARD2_1
+            IsNetStandard21 = true;
             SupportsDynamic = true;
 #endif
 
@@ -127,6 +137,10 @@ static Env()
 
         public static bool IsNetStandard { get; set; }
 
+        public static bool IsNetCore21 { get; set; }
+        public static bool IsNetStandard20 { get; set; }
+        public static bool IsNetStandard21 { get; set; }
+
         public static bool IsNetFramework { get; set; }
 
         public static bool IsNetCore { get; set; }
@@ -203,7 +217,7 @@ public static string ReferenceAssemblyPath
             set => referenceAssemblyPath = value;
         }
 
-#if NETSTANDARD2_0
+#if NETSTANDARD
         private static bool IsRunningAsUwp()
         {
             try
diff --git a/src/ServiceStack.Text/JsConfigScope.cs b/src/ServiceStack.Text/JsConfigScope.cs
@@ -13,7 +13,7 @@ public sealed class JsConfigScope : Config, IDisposable
         bool disposed;
         readonly JsConfigScope parent;
 
-#if NETSTANDARD2_0        
+#if NETSTANDARD        
         private static AsyncLocal<JsConfigScope> head = new AsyncLocal<JsConfigScope>();
 #else
         [ThreadStatic] private static JsConfigScope head;
@@ -23,7 +23,7 @@ internal JsConfigScope()
         {
             PclExport.Instance.BeginThreadAffinity();
 
-#if NETSTANDARD2_0        
+#if NETSTANDARD        
             parent = head.Value;
             head.Value = this;
 #else
@@ -33,7 +33,7 @@ internal JsConfigScope()
         }
 
         internal static JsConfigScope Current => 
-#if NETSTANDARD2_0        
+#if NETSTANDARD        
             head.Value;
 #else
             head;
@@ -44,7 +44,7 @@ public void Dispose()
             if (!disposed)
             {
                 disposed = true;
-#if NETSTANDARD2_0        
+#if NETSTANDARD        
                 head.Value = parent;
 #else
                 head = parent;
diff --git a/src/ServiceStack.Text/NetCoreMemory.cs b/src/ServiceStack.Text/NetCoreMemory.cs
@@ -1,4 +1,4 @@
-﻿#if NETCORE2_1
+﻿#if NETCORE2_1 || NETSTANDARD2_1
 
 using System;
 using System.Buffers.Text;
diff --git a/src/ServiceStack.Text/PathUtils.cs b/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 !NETSTANDARD2_0
+#if !NETSTANDARD
             return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..");
 #else
             return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..{sep}..");
diff --git a/src/ServiceStack.Text/Pcl.Dynamic.cs b/src/ServiceStack.Text/Pcl.Dynamic.cs
@@ -1,8 +1,6 @@
 //Copyright (c) ServiceStack, Inc. All Rights Reserved.
 //License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
 
-#if NET45 || NETCORE2_1
-
 using System;
 using System.Collections.Generic;
 using System.Dynamic;
@@ -90,8 +88,6 @@ private static int VerifyAndGetStartIndex(ReadOnlySpan<char> value, Type createM
         }
     }
 
-//TODO: Workout how to fix broken CoreCLR SL5 build that uses dynamic
-
     public class DynamicJson : DynamicObject
     {
         private readonly IDictionary<string, object> _hash = new Dictionary<string, object>();
@@ -184,6 +180,4 @@ internal static string Underscored(IEnumerable<char> pascalCase)
             return StringBuilderCache.ReturnAndFree(sb).ToLowerInvariant();
         }
     }
-
 }
-#endif
diff --git a/src/ServiceStack.Text/PclExport.NetStandard.cs b/src/ServiceStack.Text/PclExport.NetStandard.cs
@@ -1,7 +1,7 @@
 //Copyright (c) ServiceStack, Inc. All Rights Reserved.
 //License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt
 
-#if NETSTANDARD2_0
+#if NETSTANDARD
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/ServiceStack.Text/ReflectionOptimizer.Emit.cs b/src/ServiceStack.Text/ReflectionOptimizer.Emit.cs
@@ -320,7 +320,7 @@ static string ProxyName(Type targetType)
         static DynamicProxy()
         {
             var assemblyName = new AssemblyName("DynImpl");
-#if NETSTANDARD2_0
+#if NETSTANDARD
             DynamicAssembly = AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run);
 #else
             DynamicAssembly = AppDomain.CurrentDomain.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.RunAndSave);
@@ -344,7 +344,7 @@ static Type GetConstructedType(Type targetType)
             foreach (var face in targetType.GetInterfaces())
                 IncludeType(face, typeBuilder);
 
-#if NETSTANDARD2_0
+#if NETSTANDARD
             return typeBuilder.CreateTypeInfo().AsType();
 #else
             return typeBuilder.CreateType();
diff --git a/src/ServiceStack.Text/ServiceStack.Text.csproj b/src/ServiceStack.Text/ServiceStack.Text.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.Text</PackageId>
     <AssemblyName>ServiceStack.Text</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;netcoreapp2.1;netstandard2.1</TargetFrameworks>
     <Title>.NET's fastest JSON Serializer by ServiceStack</Title>
     <PackageDescription>
       .NET's fastest JSON, JSV and CSV Text Serializers. Fast, Light, Resilient.
@@ -12,23 +12,32 @@
     <PackageTags>JSON;Text;Serializer;CSV;JSV;HTTP;Auto Mapping;Dump;Reflection;JS;Utils;Fast</PackageTags>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETCORE2_1</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE2_1</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="System.Memory" Version="4.5.3" />
+  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System.Configuration" />
     <Reference Include="Microsoft.CSharp" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.3.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="System.Memory" Version="4.5.3" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit.LightWeight" Version="4.3.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
   </ItemGroup>
 </Project>
diff --git a/src/ServiceStack.Text/TypeFields.cs b/src/ServiceStack.Text/TypeFields.cs
@@ -4,12 +4,6 @@
 using System.Threading;
 using ServiceStack.Text;
 
-using System.Linq.Expressions;
-
-#if NET45 || NETSTANDARD2_0
-using System.Reflection.Emit;
-#endif
-
 namespace ServiceStack
 {
     public class FieldAccessor
diff --git a/src/ServiceStack.Text/TypeProperties.cs b/src/ServiceStack.Text/TypeProperties.cs
@@ -4,12 +4,6 @@
 using System.Threading;
 using ServiceStack.Text;
 
-using System.Linq.Expressions;
-
-#if NET45 || NETSTANDARD2_0
-using System.Reflection.Emit;
-#endif
-
 namespace ServiceStack
 {
     public class PropertyAccessor
diff --git a/tests/ServiceStack.Text.Benchmarks/MiniProfiler/MiniProfiler.cs b/tests/ServiceStack.Text.Benchmarks/MiniProfiler/MiniProfiler.cs
@@ -280,7 +280,7 @@ public IEnumerable<Timing> GetTimingHierarchy()
             }
         }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD
         /// <summary>
         /// Create a DEEP clone of this MiniProfiler.
         /// </summary>
diff --git a/tests/ServiceStack.Text.Benchmarks/ServiceStack.Text.Benchmarks.csproj b/tests/ServiceStack.Text.Benchmarks/ServiceStack.Text.Benchmarks.csproj
@@ -10,10 +10,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\ServiceStack.Text\ServiceStack.Text.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net47' ">
-    <DefineConstants>$(DefineConstants);NET45;NET47</DefineConstants>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
-    <DefineConstants>$(DefineConstants);NETSTANDARD2_0;NETCORE</DefineConstants>
+    <DefineConstants>$(DefineConstants);NETSTANDARD;NETCORE2_1</DefineConstants>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,9 @@ public static int LastIndexOf(this ReadOnlyMemory<char> value, string needle, in`
`381`	`381`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`382`	`382`	`public static bool EqualsOrdinal(this ReadOnlyMemory<char> value, ReadOnlyMemory<char> other) => value.Span.Equals(other.Span, StringComparison.Ordinal);`
`383`	`383`
	`384`	`+#if !NETSTANDARD2_1`
	`385`	`+ //Ambiguous definitions in .NET Core 3.0 System MemoryExtensions.cs`
	`386`	`+`
`384`	`387`	`public static ReadOnlyMemory<char> Trim(this ReadOnlyMemory<char> span)`
`385`	`388`	`{`
`386`	`389`	`return span.TrimStart().TrimEnd();`
`@@ -411,6 +414,7 @@ public static ReadOnlyMemory<char> TrimEnd(this ReadOnlyMemory<char> value)`
`411`	`414`	`}`
`412`	`415`	`return value.Slice(0, end + 1);`
`413`	`416`	`}`
	`417`	`+#endif`
`414`	`418`
`415`	`419`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`416`	`420`	`public static ReadOnlyMemory<char> SafeSlice(this ReadOnlyMemory<char> value, int startIndex) => SafeSlice(value, startIndex, value.Length);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#if NETCORE2_1`
	`1`	`+#if NETCORE2_1 \|\| NETSTANDARD2_1`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Buffers.Text;`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public static string MapAbsolutePath(this string relativePath)`
`66`	`66`	`public static string MapHostAbsolutePath(this string relativePath)`
`67`	`67`	`{`
`68`	`68`	`var sep = PclExport.Instance.DirSep;`
`69`		`-#if !NETSTANDARD2_0`
	`69`	`+#if !NETSTANDARD`
`70`	`70`	`return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..");`
`71`	`71`	`#else`
`72`	`72`	`return PclExport.Instance.MapAbsolutePath(relativePath, $"{sep}..{sep}..{sep}..");`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`//Copyright (c) ServiceStack, Inc. All Rights Reserved.`
`2`	`2`	`//License: https://raw.github.com/ServiceStack/ServiceStack/master/license.txt`
`3`	`3`
`4`		`-#if NET45 \|\| NETCORE2_1`
`5`		`-`
`6`	`4`	`using System;`
`7`	`5`	`using System.Collections.Generic;`
`8`	`6`	`using System.Dynamic;`
`@@ -90,8 +88,6 @@ private static int VerifyAndGetStartIndex(ReadOnlySpan<char> value, Type createM`
`90`	`88`	`}`
`91`	`89`	`}`
`92`	`90`
`93`		`-//TODO: Workout how to fix broken CoreCLR SL5 build that uses dynamic`
`94`		`-`
`95`	`91`	`public class DynamicJson : DynamicObject`
`96`	`92`	`{`
`97`	`93`	`private readonly IDictionary<string, object> _hash = new Dictionary<string, object>();`
`@@ -184,6 +180,4 @@ internal static string Underscored(IEnumerable<char> pascalCase)`
`184`	`180`	`return StringBuilderCache.ReturnAndFree(sb).ToLowerInvariant();`
`185`	`181`	`}`
`186`	`182`	`}`
`187`		`-`
`188`	`183`	`}`
`189`		`-#endif`