Remove AOT warning suppressions

amcasey · amcasey · commit d8c97de19e75 · 2023-01-17T10:09:51.000-08:00
...introduced in dotnet#45604 now that dotnet/runtime#79425 is available.
diff --git a/src/DataProtection/Extensions/src/DataProtectionProvider.cs b/src/DataProtection/Extensions/src/DataProtectionProvider.cs
@@ -146,9 +146,6 @@ internal static IDataProtectionProvider CreateProvider(
         setupAction(builder);
 
         // extract the provider instance from the service collection
-        // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
         return serviceCollection.BuildServiceProvider().GetRequiredService<IDataProtectionProvider>();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
     }
 }
diff --git a/src/DefaultBuilder/src/WebApplicationBuilder.cs b/src/DefaultBuilder/src/WebApplicationBuilder.cs
@@ -33,8 +33,6 @@ internal WebApplicationBuilder(WebApplicationOptions options, Action<IHostBuilde
 
         configuration.AddEnvironmentVariables(prefix: "ASPNETCORE_");
 
-        // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
         _hostApplicationBuilder = new HostApplicationBuilder(new HostApplicationBuilderSettings
         {
             Args = options.Args,
@@ -43,7 +41,6 @@ internal WebApplicationBuilder(WebApplicationOptions options, Action<IHostBuilde
             ContentRootPath = options.ContentRootPath,
             Configuration = configuration,
         });
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
 
         // Set WebRootPath if necessary
         if (options.WebRootPath is not null)
diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostBuilder.cs
@@ -211,10 +211,7 @@ public IWebHostBuilder UseDefaultServiceProvider(Action<WebHostBuilderContext, S
             var webHostBuilderContext = GetWebHostBuilderContext(context);
             var options = new ServiceProviderOptions();
             configure(webHostBuilderContext, options);
-            // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             return new DefaultServiceProviderFactory(options);
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
         });
 
         return this;
diff --git a/src/Hosting/Hosting/src/Internal/StartupLoader.cs b/src/Hosting/Hosting/src/Internal/StartupLoader.cs
@@ -161,10 +161,7 @@ IServiceProvider ConfigureServicesWithContainerConfiguration(IServiceCollection
                     applicationServiceProvider = serviceProviderFactory.CreateServiceProvider(builder);
                 }
 
-                // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
                 return applicationServiceProvider ?? services.BuildServiceProvider();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             }
         }
 
diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
@@ -104,10 +104,7 @@ public void Initialize()
             // EnsureApplicationServices may have failed due to a missing or throwing Startup class.
             if (_applicationServices == null)
             {
-                // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
                 _applicationServices = _applicationServiceCollection.BuildServiceProvider();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             }
 
             if (!_options.CaptureStartupErrors)
diff --git a/src/Hosting/Hosting/src/Startup/StartupBase.cs b/src/Hosting/Hosting/src/Startup/StartupBase.cs
@@ -38,10 +38,7 @@ public virtual void ConfigureServices(IServiceCollection services)
     /// <returns>The <see cref="IServiceProvider"/>.</returns>
     public virtual IServiceProvider CreateServiceProvider(IServiceCollection services)
     {
-        // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
         return services.BuildServiceProvider();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
     }
 }
 
diff --git a/src/Hosting/Hosting/src/WebHostBuilder.cs b/src/Hosting/Hosting/src/WebHostBuilder.cs
@@ -197,10 +197,7 @@ public IWebHost Build()
 
         static IServiceProvider GetProviderFromFactory(IServiceCollection collection)
         {
-            // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             var provider = collection.BuildServiceProvider();
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             var factory = provider.GetService<IServiceProviderFactory<IServiceCollection>>();
 
             if (factory != null && factory is not DefaultServiceProviderFactory)
diff --git a/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs b/src/Hosting/Hosting/src/WebHostBuilderExtensions.cs
@@ -204,10 +204,7 @@ public static IWebHostBuilder UseDefaultServiceProvider(this IWebHostBuilder hos
         {
             var options = new ServiceProviderOptions();
             configure(context, options);
-            // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
             services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(new DefaultServiceProviderFactory(options)));
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
         });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -146,9 +146,6 @@ internal static IDataProtectionProvider CreateProvider(`
`146`	`146`	`setupAction(builder);`
`147`	`147`
`148`	`148`	`// extract the provider instance from the service collection`
`149`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`150`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`151`	`149`	`return serviceCollection.BuildServiceProvider().GetRequiredService<IDataProtectionProvider>();`
`152`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`153`	`150`	`}`
`154`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,7 @@ IServiceProvider ConfigureServicesWithContainerConfiguration(IServiceCollection`
`161`	`161`	`applicationServiceProvider = serviceProviderFactory.CreateServiceProvider(builder);`
`162`	`162`	`}`
`163`	`163`
`164`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`165`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`166`	`164`	`return applicationServiceProvider ?? services.BuildServiceProvider();`
`167`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`168`	`165`	`}`
`169`	`166`	`}`
`170`	`167`
Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,7 @@ public void Initialize()`
`104`	`104`	`// EnsureApplicationServices may have failed due to a missing or throwing Startup class.`
`105`	`105`	`if (_applicationServices == null)`
`106`	`106`	`{`
`107`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`108`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`109`	`107`	`_applicationServices = _applicationServiceCollection.BuildServiceProvider();`
`110`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`111`	`108`	`}`
`112`	`109`
`113`	`110`	`if (!_options.CaptureStartupErrors)`
Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,7 @@ public virtual void ConfigureServices(IServiceCollection services)`
`38`	`38`	`/// <returns>The <see cref="IServiceProvider"/>.</returns>`
`39`	`39`	`public virtual IServiceProvider CreateServiceProvider(IServiceCollection services)`
`40`	`40`	`{`
`41`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`42`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`43`	`41`	`return services.BuildServiceProvider();`
`44`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`45`	`42`	`}`
`46`	`43`	`}`
`47`	`44`
Original file line number	Diff line number	Diff line change
`@@ -197,10 +197,7 @@ public IWebHost Build()`
`197`	`197`
`198`	`198`	`static IServiceProvider GetProviderFromFactory(IServiceCollection collection)`
`199`	`199`	`{`
`200`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`201`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`202`	`200`	`var provider = collection.BuildServiceProvider();`
`203`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`204`	`201`	`var factory = provider.GetService<IServiceProviderFactory<IServiceCollection>>();`
`205`	`202`
`206`	`203`	`if (factory != null && factory is not DefaultServiceProviderFactory)`
Original file line number	Diff line number	Diff line change
`@@ -204,10 +204,7 @@ public static IWebHostBuilder UseDefaultServiceProvider(this IWebHostBuilder hos`
`204`	`204`	`{`
`205`	`205`	`var options = new ServiceProviderOptions();`
`206`	`206`	`configure(context, options);`
`207`		`- // TODO: Remove when DI no longer has RequiresDynamicCodeAttribute https://github.com/dotnet/runtime/pull/79425`
`208`		`-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`209`	`207`	`services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(new DefaultServiceProviderFactory(options)));`
`210`		`-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.`
`211`	`208`	`});`
`212`	`209`	`}`
`213`	`210`