Add Bcl.Async/ValueTask to NETStd

mythz · mythz · commit ab1c9dcc586b · 2020-08-12T03:43:13.000+08:00
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -311,12 +311,15 @@ public static ConfiguredTaskAwaitable ConfigAwait(this Task task) =>
         public static ConfiguredTaskAwaitable<T> ConfigAwait<T>(this Task<T> task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);
 
+#if NETSTANDARD || NETCORE2_1
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ConfiguredValueTaskAwaitable ConfigAwait(this ValueTask task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public static ConfiguredValueTaskAwaitable<T> ConfigAwait<T>(this ValueTask<T> task) => 
             task.ConfigureAwait(ContinueOnCapturedContext);
+#endif
+
     }
 }
diff --git a/src/ServiceStack.Text/ServiceStack.Text.Core.csproj b/src/ServiceStack.Text/ServiceStack.Text.Core.csproj
@@ -21,6 +21,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
diff --git a/src/ServiceStack.Text/ServiceStack.Text.csproj b/src/ServiceStack.Text/ServiceStack.Text.csproj
@@ -23,6 +23,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />

Original file line number	Diff line number	Diff line change
`@@ -311,12 +311,15 @@ public static ConfiguredTaskAwaitable ConfigAwait(this Task task) =>`
`311`	`311`	`public static ConfiguredTaskAwaitable<T> ConfigAwait<T>(this Task<T> task) =>`
`312`	`312`	`task.ConfigureAwait(ContinueOnCapturedContext);`
`313`	`313`
	`314`	`+#if NETSTANDARD \|\| NETCORE2_1`
`314`	`315`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`315`	`316`	`public static ConfiguredValueTaskAwaitable ConfigAwait(this ValueTask task) =>`
`316`	`317`	`task.ConfigureAwait(ContinueOnCapturedContext);`
`317`	`318`
`318`	`319`	`[MethodImpl(MethodImplOptions.AggressiveInlining)]`
`319`	`320`	`public static ConfiguredValueTaskAwaitable<T> ConfigAwait<T>(this ValueTask<T> task) =>`
`320`	`321`	`task.ConfigureAwait(ContinueOnCapturedContext);`
	`322`	`+#endif`
	`323`	`+`
`321`	`324`	`}`
`322`	`325`	`}`