Browse Source

Fixes

pull/21065/head
Mark Cilia Vincenti 1 year ago
parent
commit
d08b63a616
  1. 10
      framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs
  2. 4
      framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

10
framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs

@ -213,12 +213,12 @@ public class ExpressionStarter<T>
}
#endif
#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP)
/// <summary></summary>
public Func<T, bool> Compile(DebugInfoGenerator debugInfoGenerator) { return Predicate.Compile(debugInfoGenerator); }
#if !(NET35 || WINDOWS_APP || NETSTANDARD || NET5_0 || PORTABLE || PORTABLE40 || UAP)
/// <summary></summary>
public Func<T, bool> Compile(DebugInfoGenerator debugInfoGenerator) { return Predicate.Compile(debugInfoGenerator); }
/// <summary></summary>
public Expression<Func<T, bool>> Update(Expression body, IEnumerable<ParameterExpression> parameters) { return Predicate.Update(body, parameters); }
/// <summary></summary>
public Expression<Func<T, bool>> Update(Expression body, IEnumerable<ParameterExpression> parameters) { return Predicate.Update(body, parameters); }
#endif
#endregion

4
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@ -32,9 +32,7 @@
<PackageReference Include="System.Linq.Queryable" />
<PackageReference Include="JetBrains.Annotations" />
<PackageReference Include="Nito.AsyncEx.Context" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Threading.Tasks.Extensions" />
<PackageReference Include="System.Threading.Tasks.Extensions" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '2.1')) ">
<PackageReference Include="System.ComponentModel.Annotations" />

Loading…
Cancel
Save