diff --git a/src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs b/src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs
index 39dd5b3b72fb..779d1f1f4ef4 100644
--- a/src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs
+++ b/src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs
@@ -26,7 +26,7 @@ public static class HttpRequestMessageExtensions
/// to executing a , if one does not already exist. The will be provided
/// to the policy for use inside the and in other message handlers.
///
- public static Context GetPolicyExecutionContext(this HttpRequestMessage request)
+ public static Context? GetPolicyExecutionContext(this HttpRequestMessage request)
{
if (request == null)
{
@@ -47,7 +47,7 @@ public static Context GetPolicyExecutionContext(this HttpRequestMessage request)
/// to executing a , if one does not already exist. The will be provided
/// to the policy for use inside the and in other message handlers.
///
- public static void SetPolicyExecutionContext(this HttpRequestMessage request, Context context)
+ public static void SetPolicyExecutionContext(this HttpRequestMessage request, Context? context)
{
if (request == null)
{
diff --git a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj
index 2788a6591811..061acc9775d0 100644
--- a/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj
+++ b/src/HttpClientFactory/Polly/src/Microsoft.Extensions.Http.Polly.csproj
@@ -1,4 +1,4 @@
-
+
@@ -13,7 +13,6 @@
true
true
true
- disable
diff --git a/src/HttpClientFactory/Polly/src/PublicAPI.Shipped.txt b/src/HttpClientFactory/Polly/src/PublicAPI.Shipped.txt
index f415546a8da1..cd36b8065e3a 100644
--- a/src/HttpClientFactory/Polly/src/PublicAPI.Shipped.txt
+++ b/src/HttpClientFactory/Polly/src/PublicAPI.Shipped.txt
@@ -1,20 +1,20 @@
#nullable enable
-~Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(Polly.IAsyncPolicy policy) -> void
-~Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(System.Func> policySelector) -> void
-~override Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, Polly.IAsyncPolicy policy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func> policyFactory, System.Func keySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, string policyKey) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func, System.Net.Http.HttpRequestMessage, Polly.IAsyncPolicy> policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddTransientHttpErrorPolicy(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder builder, System.Func, Polly.IAsyncPolicy> configurePolicy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder
-~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services) -> Polly.Registry.IPolicyRegistry
-~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, Polly.Registry.IPolicyRegistry registry) -> Polly.Registry.IPolicyRegistry
-~static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection services, System.Action> configureRegistry) -> Microsoft.Extensions.DependencyInjection.IServiceCollection
-~static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage request) -> Polly.Context
-~static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage request, Polly.Context context) -> void
-~virtual Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage request, Polly.Context context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task
+Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(Polly.IAsyncPolicy! policy) -> void
+Microsoft.Extensions.Http.PolicyHttpMessageHandler.PolicyHttpMessageHandler(System.Func!>! policySelector) -> void
+override Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendAsync(System.Net.Http.HttpRequestMessage! request, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, Polly.IAsyncPolicy! policy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func!>! policyFactory, System.Func! keySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandler(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, string! policyKey) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddPolicyHandlerFromRegistry(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func!, System.Net.Http.HttpRequestMessage!, Polly.IAsyncPolicy!>! policySelector) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions.AddTransientHttpErrorPolicy(this Microsoft.Extensions.DependencyInjection.IHttpClientBuilder! builder, System.Func!, Polly.IAsyncPolicy!>! configurePolicy) -> Microsoft.Extensions.DependencyInjection.IHttpClientBuilder!
+static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Polly.Registry.IPolicyRegistry!
+static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Polly.Registry.IPolicyRegistry! registry) -> Polly.Registry.IPolicyRegistry!
+static Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions.AddPolicyRegistry(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services, System.Action!>! configureRegistry) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context!
+static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context! context) -> void
+virtual Microsoft.Extensions.Http.PolicyHttpMessageHandler.SendCoreAsync(System.Net.Http.HttpRequestMessage! request, Polly.Context! context, System.Threading.CancellationToken cancellationToken) -> System.Threading.Tasks.Task!
Microsoft.Extensions.DependencyInjection.PollyHttpClientBuilderExtensions
Microsoft.Extensions.DependencyInjection.PollyServiceCollectionExtensions
Microsoft.Extensions.Http.PolicyHttpMessageHandler
diff --git a/src/HttpClientFactory/Polly/src/PublicAPI.Unshipped.txt b/src/HttpClientFactory/Polly/src/PublicAPI.Unshipped.txt
index 7dc5c58110bf..dd50bb0c66ed 100644
--- a/src/HttpClientFactory/Polly/src/PublicAPI.Unshipped.txt
+++ b/src/HttpClientFactory/Polly/src/PublicAPI.Unshipped.txt
@@ -1 +1,5 @@
#nullable enable
+*REMOVED*static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context!
+*REMOVED*static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context! context) -> void
+static Polly.HttpRequestMessageExtensions.GetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request) -> Polly.Context?
+static Polly.HttpRequestMessageExtensions.SetPolicyExecutionContext(this System.Net.Http.HttpRequestMessage! request, Polly.Context? context) -> void
diff --git a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
index 7985b489fad6..4133099e1116 100644
--- a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
+++ b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
@@ -6,6 +6,7 @@
true
false
false
+
disable
diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
index f16e884f76f3..70b25e68309c 100644
--- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
@@ -7,7 +7,6 @@
Microsoft.Extensions.ApiDescription.Tool
netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)
false
- disable
$(NoWarn);nullable