Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion PolyShim/NetCore21/ManualResetValueTaskSourceCore.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// System.Threading.Tasks.Extensions compatibility package does NOT provide this type, so no FEATURE_VALUETASK* guards
#if (NETCOREAPP && !NETCOREAPP2_1_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD && !NETSTANDARD2_1_OR_GREATER)
#if FEATURE_TASK
#if !FEATURE_VALUETASK_SOURCES_MANUALRESET
#nullable enable
#pragma warning disable CS0436

Expand Down
22 changes: 0 additions & 22 deletions PolyShim/PolyShim.targets
Original file line number Diff line number Diff line change
Expand Up @@ -260,28 +260,6 @@
>$(DefineConstants);FEATURE_VALUETASK_SOURCES</DefineConstants
>

<!--
FEATURE_VALUETASK_SOURCES_MANUALRESET: ManualResetValueTaskSourceCore<T> is available.
The compatibility package provides this type on .NET Standard >= 2.0, but not on .NET Framework
or on .NET Standard < 2.0. On .NET Core >= 2.1 and .NET Standard >= 2.1, it is available natively.
-->
<FeatureValueTaskSourcesManualReset>false</FeatureValueTaskSourcesManualReset>
<FeatureValueTaskSourcesManualReset
Condition="$(IsNetCoreApp) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))"
>true</FeatureValueTaskSourcesManualReset
>
<FeatureValueTaskSourcesManualReset
Condition="$(IsNetStandard) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1'))"
>true</FeatureValueTaskSourcesManualReset
>
<FeatureValueTaskSourcesManualReset
Condition="$(IsNetStandard) AND $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.0')) AND @(ReferencePath-&gt;AnyHaveMetadataValue('Filename', 'System.Threading.Tasks.Extensions'))"
>true</FeatureValueTaskSourcesManualReset
>
<DefineConstants Condition="$(FeatureValueTaskSourcesManualReset)"
>$(DefineConstants);FEATURE_VALUETASK_SOURCES_MANUALRESET</DefineConstants
>

<FeatureValueTuple>false</FeatureValueTuple>
<FeatureValueTuple
Condition="@(ReferencePath-&gt;AnyHaveMetadataValue('Filename', 'System.ValueTuple'))"
Expand Down
Loading