Skip to content

Commit b527bc6

Browse files
committed
fix api compatibility
1 parent f028533 commit b527bc6

File tree

6 files changed

+48
-20
lines changed

6 files changed

+48
-20
lines changed

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<PropertyGroup>
12-
<LangVersion>12</LangVersion>
12+
<LangVersion>12.0</LangVersion>
1313
<ImplicitUsings>enable</ImplicitUsings>
1414
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1515
<Nullable>enable</Nullable>

Directory.Packages.props

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OtelVersion)" />
1818
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="$(OtelVersion)" />
1919
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OtelVersion)" />
20-
<PackageVersion Include="PolySharp" Version="1.14.1" />
2120
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="[7.0.2,)" />
2221
<PackageVersion Include="System.Threading.Channels" Version="[7.0.0,)" />
2322
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="[4.5.4,)" />

src/DCA.Extensions.BackgroundTask.MediatR/CompatibilitySuppressions.xml

-10
This file was deleted.

src/DCA.Extensions.BackgroundTask/CompatibilitySuppressions.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,19 @@
33
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
44
<Suppression>
55
<DiagnosticId>CP0001</DiagnosticId>
6-
<Target>T:System.Runtime.CompilerServices.IsExternalInit</Target>
6+
<Target>T:System.Diagnostics.CodeAnalysis.SetsRequiredMembersAttribute</Target>
7+
<Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
8+
<Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
9+
</Suppression>
10+
<Suppression>
11+
<DiagnosticId>CP0001</DiagnosticId>
12+
<Target>T:System.Runtime.CompilerServices.CompilerFeatureRequiredAttribute</Target>
13+
<Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
14+
<Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
15+
</Suppression>
16+
<Suppression>
17+
<DiagnosticId>CP0001</DiagnosticId>
18+
<Target>T:System.Runtime.CompilerServices.RequiredMemberAttribute</Target>
719
<Left>lib/net6.0/DCA.Extensions.BackgroundTask.dll</Left>
820
<Right>lib/net7.0/DCA.Extensions.BackgroundTask.dll</Right>
921
</Suppression>
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
#if NET5_0_OR_GREATER
2+
// context: https://github.com/StackExchange/StackExchange.Redis/issues/2619
3+
[assembly: System.Runtime.CompilerServices.TypeForwardedTo(typeof(System.Runtime.CompilerServices.IsExternalInit))]
4+
#else
5+
// To support { get; init; } properties
6+
using System.ComponentModel;
7+
8+
namespace System.Runtime.CompilerServices
9+
{
10+
[EditorBrowsable(EditorBrowsableState.Never)]
11+
internal static class IsExternalInit { }
12+
}
13+
#endif
14+
15+
#if !NET7_0_OR_GREATER
16+
namespace System.Runtime.CompilerServices
17+
{
18+
#pragma warning disable CA1018 // Mark attributes with AttributeUsageAttribute
19+
public class RequiredMemberAttribute : Attribute { }
20+
public class CompilerFeatureRequiredAttribute : Attribute
21+
{
22+
#pragma warning disable IDE0290 // Use primary constructor
23+
public CompilerFeatureRequiredAttribute(string name) { }
24+
}
25+
}
26+
27+
namespace System.Diagnostics.CodeAnalysis
28+
{
29+
[AttributeUsage(AttributeTargets.Constructor, AllowMultiple = false, Inherited = false)]
30+
public sealed class SetsRequiredMembersAttribute : Attribute
31+
{
32+
}
33+
}
34+
#endif

src/Directory.Build.props

-7
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,4 @@
4242
<None Include="$(RepositoryRoot)\LICENSE" Pack="true" PackagePath=""/>
4343
</ItemGroup>
4444

45-
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
46-
<PackageReference Include="PolySharp">
47-
<PrivateAssets>all</PrivateAssets>
48-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
49-
</PackageReference>
50-
</ItemGroup>
51-
5245
</Project>

0 commit comments

Comments
 (0)