Skip to content

Commit d0f60f2

Browse files
JamesNKJamesNK
authored
Nullable cleanup (#43451)
* Nullable cleanup * Enable nullable in polly extension * PR feedback
1 parent 0579297 commit d0f60f2

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

‎src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public static class HttpRequestMessageExtensions
2626
/// to executing a <see cref="Policy"/>, if one does not already exist. The <see cref="Context"/> will be provided
2727
/// to the policy for use inside the <see cref="Policy"/> and in other message handlers.
2828
/// </remarks>
29-
public static Context GetPolicyExecutionContext(this HttpRequestMessage request)
29+
public static Context? GetPolicyExecutionContext(this HttpRequestMessage request)
3030
{
3131
if (request == null)
3232
{
@@ -47,7 +47,7 @@ public static Context GetPolicyExecutionContext(this HttpRequestMessage request)
4747
/// to executing a <see cref="Policy"/>, if one does not already exist. The <see cref="Context"/> will be provided
4848
/// to the policy for use inside the <see cref="Policy"/> and in other message handlers.
4949
/// </remarks>
50-
public static void SetPolicyExecutionContext(this HttpRequestMessage request, Context context)
50+
public static void SetPolicyExecutionContext(this HttpRequestMessage request, Context? context)
5151
{
5252
if (request == null)
5353
{

‎src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<Description>
@@ -13,7 +13,6 @@
1313
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
1414
<IsPackable>true</IsPackable>
1515
<IsShipping>true</IsShipping>
16-
<Nullable>disable</Nullable>
1716
</PropertyGroup>
1817

1918
<ItemGroup>

‎src/HttpClientFactory/Polly/src/PublicAPI.Shipped.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#nullable enable
2-
~Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage> policy) -> void
3-
~Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(System.Func<System.Net.Http.HttpRequestMessage, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> policySelector) -> void
4-
~override Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage>
5-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage> policy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
6-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func<System.IServiceProvider, System.Net.Http.HttpRequestMessage, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
7-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func<System.IServiceProvider, System.Net.Http.HttpRequestMessage, string, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> policyFactory, System.Func<System.Net.Http.HttpRequestMessage, string> keySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
8-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func<System.Net.Http.HttpRequestMessage, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
9-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, string policyKey) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
10-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func<Polly.Registry.IReadOnlyPolicyRegistry<string>, System.Net.Http.HttpRequestMessage, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
11-
~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddTransientHttpErrorPolicy(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func<Polly.PolicyBuilder<System.Net.Http.HttpResponseMessage>, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage>> configurePolicy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
12-
~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Polly.Registry.IPolicyRegistry<string>
13-
~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Polly.Registry.IPolicyRegistry<string> registry) -> Polly.Registry.IPolicyRegistry<string>
14-
~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action<System.IServiceProvider, Polly.Registry.IPolicyRegistry<string>> configureRegistry) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
15-
~static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage request) -> Polly.Context
16-
~static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage request, Polly.Context context) -> void
17-
~virtual Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage request, Polly.Context context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage>
2+
Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>! policy) -> void
3+
Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(System.Func<System.Net.Http.HttpRequestMessage!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! policySelector) -> void
4+
override Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage! request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage!>!
5+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>! policy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
6+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func<System.IServiceProvider!, System.Net.Http.HttpRequestMessage!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
7+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func<System.IServiceProvider!, System.Net.Http.HttpRequestMessage!, string!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! policyFactory, System.Func<System.Net.Http.HttpRequestMessage!, string!>! keySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
8+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func<System.Net.Http.HttpRequestMessage!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
9+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, string! policyKey) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
10+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func<Polly.Registry.IReadOnlyPolicyRegistry<string!>!, System.Net.Http.HttpRequestMessage!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
11+
static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddTransientHttpErrorPolicy(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func<Polly.PolicyBuilder<System.Net.Http.HttpResponseMessage!>!, Polly.IAsyncPolicy<System.Net.Http.HttpResponseMessage!>!>! configurePolicy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
12+
static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Polly.Registry.IPolicyRegistry<string!>!
13+
static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Polly.Registry.IPolicyRegistry<string!>! registry) -> Polly.Registry.IPolicyRegistry<string!>!
14+
static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action<System.IServiceProvider!, Polly.Registry.IPolicyRegistry<string!>!>! configureRegistry) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
15+
static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context!
16+
static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context! context) -> void
17+
virtual Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage! request, Polly.Context! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage!>!
1818
Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions
1919
Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions
2020
Microsoft.Extensions.Http.PolicyHttpMessageHandler

‎src/HttpClientFactory/Polly/src/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
#nullable enable
2+
*REMOVED*static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context!
3+
*REMOVED*static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context! context) -> void
4+
static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context?
5+
static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context? context) -> void

‎src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<CopySymbolsToArtifacts>true</CopySymbolsToArtifacts>
77
<IsPackable>false</IsPackable>
88
<IsShippingPackage>false</IsShippingPackage>
9+
<!-- Nullable disabled because package only targets .NET Framework. -->
910
<Nullable>disable</Nullable>
1011
</PropertyGroup>
1112

‎src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
88
<TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
99
<IsShippingPackage>false</IsShippingPackage>
10-
<Nullable>disable</Nullable>
1110
<NoWarn>$(NoWarn);nullable</NoWarn>
1211
</PropertyGroup>
1312

0 commit comments

Comments
 (0)