[OutputCaching] OutputCacheOptions.ApplicationServices is always null during initialization (dotnet#55847)

feiyun0112 · web-flow · commit 2287c7825621 · 2024-10-07T09:31:00.000-07:00
diff --git a/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs b/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs
@@ -50,8 +50,8 @@ public static IServiceCollection AddOutputCache(this IServiceCollection services
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(configureOptions);
 
-        services.Configure(configureOptions);
         services.AddOutputCache();
+        services.Configure(configureOptions);
 
         return services;
     }
diff --git a/src/Middleware/OutputCaching/test/TestUtils.cs b/src/Middleware/OutputCaching/test/TestUtils.cs
@@ -159,6 +159,7 @@ private static IEnumerable<IHostBuilder> CreateBuildersWithOutputCaching(
                     {
                         services.AddOutputCache(outputCachingOptions =>
                         {
+                            Assert.NotNull(outputCachingOptions.ApplicationServices);
                             if (options != null)
                             {
                                 outputCachingOptions.MaximumBodySize = options.MaximumBodySize;

Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ public static IServiceCollection AddOutputCache(this IServiceCollection services`
`50`	`50`	`ArgumentNullException.ThrowIfNull(services);`
`51`	`51`	`ArgumentNullException.ThrowIfNull(configureOptions);`
`52`	`52`
`53`		`- services.Configure(configureOptions);`
`54`	`53`	`services.AddOutputCache();`
	`54`	`+ services.Configure(configureOptions);`
`55`	`55`
`56`	`56`	`return services;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,7 @@ private static IEnumerable<IHostBuilder> CreateBuildersWithOutputCaching(`
`159`	`159`	`{`
`160`	`160`	`services.AddOutputCache(outputCachingOptions =>`
`161`	`161`	`{`
	`162`	`+ Assert.NotNull(outputCachingOptions.ApplicationServices);`
`162`	`163`	`if (options != null)`
`163`	`164`	`{`
`164`	`165`	`outputCachingOptions.MaximumBodySize = options.MaximumBodySize;`