Skip to content

Commit 33f94a5

Browse files
Add [NotNullWhen(true)] to IsAbuseRateLimit
1 parent 6ed9912 commit 33f94a5

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

Src/GitHubApiStatus.Extensions/GitHubApiStatus.Extensions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.0;net5.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>GitHubApiStatus.Extensions.snk</AssemblyOriginatorKeyFile>
77
<AssemblyName>GitHubApiStatus.Extensions</AssemblyName>
@@ -28,7 +28,7 @@ New In This Release:
2828
- Add Support for Microsoft.Extensions.DependencyInjection
2929
- Implements Microsoft.Extensions.Http
3030
</PackageReleaseNotes>
31-
<Version>2.0.1</Version>
31+
<Version>2.0.2</Version>
3232
<RepositoryUrl>https://github.com/brminnick/GitHubApiStatus</RepositoryUrl>
3333
<Product>$(AssemblyName) ($(TargetFramework))</Product>
3434
<AssemblyVersion>1.0.0.0</AssemblyVersion>

Src/GitHubApiStatus.UnitTests/Tests/IsAbuseRateLimitTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public void IsAbuseRateLimit()
1212
var httpResponseHeaders = CreateHttpResponseHeaders(500, DateTimeOffset.UtcNow, 0, isAbuseRateLimit: true);
1313

1414
//Act
15-
var isAbuseRateLimit = GitHubApiStatusService.IsAbuseRateLimit(httpResponseHeaders, out TimeSpan? delta);
15+
var isAbuseRateLimit = GitHubApiStatusService.IsAbuseRateLimit(httpResponseHeaders, out var delta);
1616

1717
//Assert
1818
Assert.IsTrue(isAbuseRateLimit);

Src/GitHubApiStatus/GitHubApiStatus.csproj

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp3.0;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.0;net5.0</TargetFrameworks>
55
<SignAssembly>true</SignAssembly>
66
<AssemblyOriginatorKeyFile>GitHubApiStatus.snk</AssemblyOriginatorKeyFile>
77
<AssemblyName>GitHubApiStatus</AssemblyName>
@@ -39,7 +39,7 @@ Calculate the GitHub API Rate Limits for the following GitHub APIs
3939
New In This Release:
4040
- Use System.Text.Json for .NET Standard 2.0
4141
</PackageReleaseNotes>
42-
<Version>2.0.1</Version>
42+
<Version>2.0.2</Version>
4343
<RepositoryUrl>https://github.com/brminnick/GitHubApiStatus</RepositoryUrl>
4444
<Product>$(AssemblyName) ($(TargetFramework))</Product>
4545
<AssemblyVersion>1.0.0.0</AssemblyVersion>
@@ -66,18 +66,9 @@ New In This Release:
6666
</PropertyGroup>
6767
<ItemGroup>
6868
<Compile Include="Models\GitHubApiRateLimitsMutable.cs" />
69-
<Compile Include="Services\GitHubApiStatusService.cs">
70-
<SubType>
71-
</SubType>
72-
</Compile>
73-
<Compile Include="Models\RateLimitStatus.cs">
74-
<SubType>
75-
</SubType>
76-
</Compile>
77-
<Compile Include="Models\GitHubApiRateLimits.cs">
78-
<SubType>
79-
</SubType>
80-
</Compile>
69+
<Compile Include="Services\GitHubApiStatusService.cs" />
70+
<Compile Include="Models\RateLimitStatus.cs" />
71+
<Compile Include="Models\GitHubApiRateLimits.cs" />
8172
<Compile Include="Interfaces\IGitHubApiRateLimitResponse.cs" />
8273
<Compile Include="Interfaces\IGitHubApiRateLimits.cs" />
8374
<Compile Include="Interfaces\IRateLimitStatus.cs" />
@@ -100,7 +91,7 @@ New In This Release:
10091
<Folder Include="Services\" />
10192
<Folder Include="Interfaces\" />
10293
</ItemGroup>
103-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
94+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard2')) ">
10495
<PackageReference Include="System.Text.Json" Version="4.6.0" />
10596
</ItemGroup>
10697
</Project>

Src/GitHubApiStatus/Services/GitHubApiStatusService.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
using System.Text.Json;
1313
#endif
1414

15+
#if NETSTANDARD2_1 || NET
16+
using System.Diagnostics.CodeAnalysis;
17+
#endif
18+
1519
namespace GitHubApiStatus
1620
{
1721
/// <summary>
@@ -189,7 +193,12 @@ public int GetRateLimit(in HttpResponseHeaders httpResponseHeaders)
189193
/// <param name="httpResponseHeaders">HttpResponseHeaders from GitHub API Response</param>
190194
/// <param name="delta">Time Remaining in Retry-After Header</param>
191195
/// <returns></returns>
192-
public bool IsAbuseRateLimit(in HttpResponseHeaders httpResponseHeaders, out TimeSpan? delta)
196+
public bool IsAbuseRateLimit(in HttpResponseHeaders httpResponseHeaders,
197+
#if NETSTANDARD2_1 || NET
198+
[NotNullWhen(true)] out TimeSpan? delta)
199+
#else
200+
out TimeSpan? delta)
201+
#endif
193202
{
194203
ValidateHttpResponseHeaders(httpResponseHeaders);
195204

0 commit comments

Comments
 (0)