Don't allow modifying WebRootPath after initialization (#37147) (#37325)

captainsafia · web-flow · commit 0fa7c01c948e · 2021-10-06T16:45:04.000-07:00
* Don't allow modifying WebRootPath after initialization

* Address feedback from review

* Clean up directory handling in tests

* Add tests for WebRootPath resolution
diff --git a/src/DefaultBuilder/src/BootstrapHostBuilder.cs b/src/DefaultBuilder/src/BootstrapHostBuilder.cs
@@ -105,7 +105,7 @@ public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Func<HostBuilde
             {
                 ApplicationName = hostConfiguration[HostDefaults.ApplicationKey],
                 EnvironmentName = hostConfiguration[HostDefaults.EnvironmentKey] ?? Environments.Production,
-                ContentRootPath = ContentRootResolver.ResolvePath(hostConfiguration[HostDefaults.ContentRootKey]),
+                ContentRootPath = HostingPathResolver.ResolvePath(hostConfiguration[HostDefaults.ContentRootKey]),
             };
 
             hostingEnvironment.ContentRootFileProvider = new PhysicalFileProvider(hostingEnvironment.ContentRootPath);
diff --git a/src/DefaultBuilder/src/ConfigureHostBuilder.cs b/src/DefaultBuilder/src/ConfigureHostBuilder.cs
@@ -74,9 +74,9 @@ public IHostBuilder ConfigureHostConfiguration(Action<IConfigurationBuilder> con
                 throw new NotSupportedException($"The application name changed from \"{previousApplicationName}\" to \"{_configuration[HostDefaults.ApplicationKey]}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
 
-            if (!string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))
+            if (!string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))
             {
-                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
+                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
 
             if (!string.Equals(previousEnvironment, _configuration[HostDefaults.EnvironmentKey], StringComparison.OrdinalIgnoreCase))
diff --git a/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs b/src/DefaultBuilder/src/ConfigureWebHostBuilder.cs
@@ -39,7 +39,7 @@ IWebHost IWebHostBuilder.Build()
         public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)
         {
             var previousContentRoot = _context.HostingEnvironment.ContentRootPath;
-            var previousWebRoot = _configuration[WebHostDefaults.ContentRootKey];
+            var previousWebRoot = _context.HostingEnvironment.WebRootPath;
             var previousApplication = _configuration[WebHostDefaults.ApplicationKey];
             var previousEnvironment = _configuration[WebHostDefaults.EnvironmentKey];
             var previousHostingStartupAssemblies = _configuration[WebHostDefaults.HostingStartupAssembliesKey];
@@ -48,21 +48,20 @@ public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, I
             // Run these immediately so that they are observable by the imperative code
             configureDelegate(_context, _configuration);
 
-            if (_configuration[WebHostDefaults.WebRootKey] is string value && !string.Equals(previousWebRoot, value, StringComparison.OrdinalIgnoreCase))
+            if (!string.Equals(HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot), HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.WebRootKey], previousContentRoot), StringComparison.OrdinalIgnoreCase))
             {
-                // We allow changing the web root since it's based off the content root and typically
-                // read after the host is built.
-                _environment.WebRootPath = Path.Combine(_environment.ContentRootPath, value);
+                // Diasllow changing the web root for consistency with other types.
+                throw new NotSupportedException($"The web root changed from \"{HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot)}\" to \"{HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.WebRootKey], previousContentRoot)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
             else if (!string.Equals(previousApplication, _configuration[WebHostDefaults.ApplicationKey], StringComparison.OrdinalIgnoreCase))
             {
                 // Disallow changing any host configuration
                 throw new NotSupportedException($"The application name changed from \"{previousApplication}\" to \"{_configuration[WebHostDefaults.ApplicationKey]}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
-            else if (!string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))
+            else if (!string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))
             {
                 // Disallow changing any host configuration
-                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
+                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
             else if (!string.Equals(previousEnvironment, _configuration[WebHostDefaults.EnvironmentKey], StringComparison.OrdinalIgnoreCase))
             {
@@ -113,16 +112,18 @@ public IWebHostBuilder UseSetting(string key, string? value)
             }
 
             var previousContentRoot = _context.HostingEnvironment.ContentRootPath;
+            var previousWebRoot = _context.HostingEnvironment.WebRootPath;
             var previousApplication = _configuration[WebHostDefaults.ApplicationKey];
             var previousEnvironment = _configuration[WebHostDefaults.EnvironmentKey];
             var previousHostingStartupAssemblies = _configuration[WebHostDefaults.HostingStartupAssembliesKey];
             var previousHostingStartupAssembliesExclude = _configuration[WebHostDefaults.HostingStartupExcludeAssembliesKey];
 
-            if (string.Equals(key, WebHostDefaults.WebRootKey, StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(key, WebHostDefaults.WebRootKey, StringComparison.OrdinalIgnoreCase) &&
+                    !string.Equals(HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot), HostingPathResolver.ResolvePath(value, previousContentRoot), StringComparison.OrdinalIgnoreCase))
             {
-                // We allow changing the web root since it's based off the content root and typically
-                // read after the host is built.
-                _environment.WebRootPath = Path.Combine(_environment.ContentRootPath, value);
+                // Disallow changing any host configuration
+                throw new NotSupportedException($"The web root changed from \"{HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot)}\" to \"{HostingPathResolver.ResolvePath(value, previousContentRoot)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
+
             }
             else if (string.Equals(key, WebHostDefaults.ApplicationKey, StringComparison.OrdinalIgnoreCase) &&
                     !string.Equals(previousApplication, value, StringComparison.OrdinalIgnoreCase))
@@ -131,10 +132,10 @@ public IWebHostBuilder UseSetting(string key, string? value)
                 throw new NotSupportedException($"The application name changed from \"{previousApplication}\" to \"{value}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
             else if (string.Equals(key, WebHostDefaults.ContentRootKey, StringComparison.OrdinalIgnoreCase) &&
-                    !string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(value), StringComparison.OrdinalIgnoreCase))
+                    !string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(value), StringComparison.OrdinalIgnoreCase))
             {
                 // Disallow changing any host configuration
-                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(value)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
+                throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(value)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");
             }
             else if (string.Equals(key, WebHostDefaults.EnvironmentKey, StringComparison.OrdinalIgnoreCase) &&
                     !string.Equals(previousEnvironment, value, StringComparison.OrdinalIgnoreCase))
diff --git a/src/DefaultBuilder/src/HostingPathResolver.cs b/src/DefaultBuilder/src/HostingPathResolver.cs
@@ -3,15 +3,15 @@
 
 namespace Microsoft.AspNetCore
 {
-    internal static class ContentRootResolver
+    internal static class HostingPathResolver
     {
         public static string ResolvePath(string contentRootPath)
         {
             var canonicalPath = ResolvePath(contentRootPath, AppContext.BaseDirectory);
             return Path.EndsInDirectorySeparator(canonicalPath) ? canonicalPath : canonicalPath + Path.DirectorySeparatorChar;
         }
 
-        private static string ResolvePath(string contentRootPath, string basePath)
+        public static string ResolvePath(string contentRootPath, string basePath)
         {
             if (string.IsNullOrEmpty(contentRootPath))
             {
diff --git a/src/DefaultBuilder/src/PublicAPI.Unshipped.txt b/src/DefaultBuilder/src/PublicAPI.Unshipped.txt
@@ -42,6 +42,8 @@ Microsoft.AspNetCore.Builder.WebApplicationOptions.ContentRootPath.get -> string
 Microsoft.AspNetCore.Builder.WebApplicationOptions.ContentRootPath.init -> void
 Microsoft.AspNetCore.Builder.WebApplicationOptions.EnvironmentName.get -> string?
 Microsoft.AspNetCore.Builder.WebApplicationOptions.EnvironmentName.init -> void
+Microsoft.AspNetCore.Builder.WebApplicationOptions.WebRootPath.get -> string?
+Microsoft.AspNetCore.Builder.WebApplicationOptions.WebRootPath.init -> void
 Microsoft.AspNetCore.Builder.WebApplicationOptions.WebApplicationOptions() -> void
 static Microsoft.AspNetCore.Builder.WebApplication.Create(string![]? args = null) -> Microsoft.AspNetCore.Builder.WebApplication!
 static Microsoft.AspNetCore.Builder.WebApplication.CreateBuilder() -> Microsoft.AspNetCore.Builder.WebApplicationBuilder!
diff --git a/src/DefaultBuilder/src/WebApplicationOptions.cs b/src/DefaultBuilder/src/WebApplicationOptions.cs
@@ -38,6 +38,11 @@ public class WebApplicationOptions
         /// </summary>
         public string? ContentRootPath { get; init; }
 
+        /// <summary>
+        /// The web root path.
+        /// </summary>
+        public string? WebRootPath { get; init; }
+
         internal void ApplyHostConfiguration(IConfigurationBuilder builder)
         {
             Dictionary<string, string>? config = null;
@@ -60,6 +65,12 @@ internal void ApplyHostConfiguration(IConfigurationBuilder builder)
                 config[HostDefaults.ContentRootKey] = ContentRootPath;
             }
 
+            if (WebRootPath is not null)
+            {
+                config ??= new();
+                config[WebHostDefaults.WebRootKey] = WebRootPath;
+            }
+
             if (config is not null)
             {
                 builder.AddInMemoryCollection(config);
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs
diff --git a/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs b/src/Mvc/test/Mvc.FunctionalTests/SimpleWithWebApplicationBuilderTests.cs
diff --git a/src/Mvc/test/WebSites/SimpleWebSiteWithWebApplicationBuilder/Program.cs b/src/Mvc/test/WebSites/SimpleWebSiteWithWebApplicationBuilder/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public IHostBuilder UseServiceProviderFactory<TContainerBuilder>(Func<HostBuilde`
`105`	`105`	`{`
`106`	`106`	`ApplicationName = hostConfiguration[HostDefaults.ApplicationKey],`
`107`	`107`	`EnvironmentName = hostConfiguration[HostDefaults.EnvironmentKey] ?? Environments.Production,`
`108`		`- ContentRootPath = ContentRootResolver.ResolvePath(hostConfiguration[HostDefaults.ContentRootKey]),`
	`108`	`+ ContentRootPath = HostingPathResolver.ResolvePath(hostConfiguration[HostDefaults.ContentRootKey]),`
`109`	`109`	`};`
`110`	`110`
`111`	`111`	`hostingEnvironment.ContentRootFileProvider = new PhysicalFileProvider(hostingEnvironment.ContentRootPath);`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ public IHostBuilder ConfigureHostConfiguration(Action<IConfigurationBuilder> con`
`74`	`74`	`throw new NotSupportedException($"The application name changed from \"{previousApplicationName}\" to \"{_configuration[HostDefaults.ApplicationKey]}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`75`	`75`	`}`
`76`	`76`
`77`		`- if (!string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))`
	`77`	`+ if (!string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))`
`78`	`78`	`{`
`79`		`- throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
	`79`	`+ throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(_configuration[HostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.Host is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`if (!string.Equals(previousEnvironment, _configuration[HostDefaults.EnvironmentKey], StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ IWebHost IWebHostBuilder.Build()`
`39`	`39`	`public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, IConfigurationBuilder> configureDelegate)`
`40`	`40`	`{`
`41`	`41`	`var previousContentRoot = _context.HostingEnvironment.ContentRootPath;`
`42`		`- var previousWebRoot = _configuration[WebHostDefaults.ContentRootKey];`
	`42`	`+ var previousWebRoot = _context.HostingEnvironment.WebRootPath;`
`43`	`43`	`var previousApplication = _configuration[WebHostDefaults.ApplicationKey];`
`44`	`44`	`var previousEnvironment = _configuration[WebHostDefaults.EnvironmentKey];`
`45`	`45`	`var previousHostingStartupAssemblies = _configuration[WebHostDefaults.HostingStartupAssembliesKey];`
`@@ -48,21 +48,20 @@ public IWebHostBuilder ConfigureAppConfiguration(Action<WebHostBuilderContext, I`
`48`	`48`	`// Run these immediately so that they are observable by the imperative code`
`49`	`49`	`configureDelegate(_context, _configuration);`
`50`	`50`
`51`		`- if (_configuration[WebHostDefaults.WebRootKey] is string value && !string.Equals(previousWebRoot, value, StringComparison.OrdinalIgnoreCase))`
	`51`	`+ if (!string.Equals(HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot), HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.WebRootKey], previousContentRoot), StringComparison.OrdinalIgnoreCase))`
`52`	`52`	`{`
`53`		`- // We allow changing the web root since it's based off the content root and typically`
`54`		`- // read after the host is built.`
`55`		`- _environment.WebRootPath = Path.Combine(_environment.ContentRootPath, value);`
	`53`	`+ // Diasllow changing the web root for consistency with other types.`
	`54`	`+ throw new NotSupportedException($"The web root changed from \"{HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot)}\" to \"{HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.WebRootKey], previousContentRoot)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`56`	`55`	`}`
`57`	`56`	`else if (!string.Equals(previousApplication, _configuration[WebHostDefaults.ApplicationKey], StringComparison.OrdinalIgnoreCase))`
`58`	`57`	`{`
`59`	`58`	`// Disallow changing any host configuration`
`60`	`59`	`throw new NotSupportedException($"The application name changed from \"{previousApplication}\" to \"{_configuration[WebHostDefaults.ApplicationKey]}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`61`	`60`	`}`
`62`		`- else if (!string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))`
	`61`	`+ else if (!string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey]), StringComparison.OrdinalIgnoreCase))`
`63`	`62`	`{`
`64`	`63`	`// Disallow changing any host configuration`
`65`		`- throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
	`64`	`+ throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(_configuration[WebHostDefaults.ContentRootKey])}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`66`	`65`	`}`
`67`	`66`	`else if (!string.Equals(previousEnvironment, _configuration[WebHostDefaults.EnvironmentKey], StringComparison.OrdinalIgnoreCase))`
`68`	`67`	`{`
`@@ -113,16 +112,18 @@ public IWebHostBuilder UseSetting(string key, string? value)`
`113`	`112`	`}`
`114`	`113`
`115`	`114`	`var previousContentRoot = _context.HostingEnvironment.ContentRootPath;`
	`115`	`+ var previousWebRoot = _context.HostingEnvironment.WebRootPath;`
`116`	`116`	`var previousApplication = _configuration[WebHostDefaults.ApplicationKey];`
`117`	`117`	`var previousEnvironment = _configuration[WebHostDefaults.EnvironmentKey];`
`118`	`118`	`var previousHostingStartupAssemblies = _configuration[WebHostDefaults.HostingStartupAssembliesKey];`
`119`	`119`	`var previousHostingStartupAssembliesExclude = _configuration[WebHostDefaults.HostingStartupExcludeAssembliesKey];`
`120`	`120`
`121`		`- if (string.Equals(key, WebHostDefaults.WebRootKey, StringComparison.OrdinalIgnoreCase))`
	`121`	`+ if (string.Equals(key, WebHostDefaults.WebRootKey, StringComparison.OrdinalIgnoreCase) &&`
	`122`	`+ !string.Equals(HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot), HostingPathResolver.ResolvePath(value, previousContentRoot), StringComparison.OrdinalIgnoreCase))`
`122`	`123`	`{`
`123`		`- // We allow changing the web root since it's based off the content root and typically`
`124`		`- // read after the host is built.`
`125`		`- _environment.WebRootPath = Path.Combine(_environment.ContentRootPath, value);`
	`124`	`+ // Disallow changing any host configuration`
	`125`	`+ throw new NotSupportedException($"The web root changed from \"{HostingPathResolver.ResolvePath(previousWebRoot, previousContentRoot)}\" to \"{HostingPathResolver.ResolvePath(value, previousContentRoot)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
	`126`	`+`
`126`	`127`	`}`
`127`	`128`	`else if (string.Equals(key, WebHostDefaults.ApplicationKey, StringComparison.OrdinalIgnoreCase) &&`
`128`	`129`	`!string.Equals(previousApplication, value, StringComparison.OrdinalIgnoreCase))`
`@@ -131,10 +132,10 @@ public IWebHostBuilder UseSetting(string key, string? value)`
`131`	`132`	`throw new NotSupportedException($"The application name changed from \"{previousApplication}\" to \"{value}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`132`	`133`	`}`
`133`	`134`	`else if (string.Equals(key, WebHostDefaults.ContentRootKey, StringComparison.OrdinalIgnoreCase) &&`
`134`		`- !string.Equals(previousContentRoot, ContentRootResolver.ResolvePath(value), StringComparison.OrdinalIgnoreCase))`
	`135`	`+ !string.Equals(previousContentRoot, HostingPathResolver.ResolvePath(value), StringComparison.OrdinalIgnoreCase))`
`135`	`136`	`{`
`136`	`137`	`// Disallow changing any host configuration`
`137`		`- throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{ContentRootResolver.ResolvePath(value)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
	`138`	`+ throw new NotSupportedException($"The content root changed from \"{previousContentRoot}\" to \"{HostingPathResolver.ResolvePath(value)}\". Changing the host configuration using WebApplicationBuilder.WebHost is not supported. Use WebApplication.CreateBuilder(WebApplicationOptions) instead.");`
`138`	`139`	`}`
`139`	`140`	`else if (string.Equals(key, WebHostDefaults.EnvironmentKey, StringComparison.OrdinalIgnoreCase) &&`
`140`	`141`	`!string.Equals(previousEnvironment, value, StringComparison.OrdinalIgnoreCase))`
Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@`
`3`	`3`
`4`	`4`	`namespace Microsoft.AspNetCore`
`5`	`5`	`{`
`6`		`- internal static class ContentRootResolver`
	`6`	`+ internal static class HostingPathResolver`
`7`	`7`	`{`
`8`	`8`	`public static string ResolvePath(string contentRootPath)`
`9`	`9`	`{`
`10`	`10`	`var canonicalPath = ResolvePath(contentRootPath, AppContext.BaseDirectory);`
`11`	`11`	`return Path.EndsInDirectorySeparator(canonicalPath) ? canonicalPath : canonicalPath + Path.DirectorySeparatorChar;`
`12`	`12`	`}`
`13`	`13`
`14`		`- private static string ResolvePath(string contentRootPath, string basePath)`
	`14`	`+ public static string ResolvePath(string contentRootPath, string basePath)`
`15`	`15`	`{`
`16`	`16`	`if (string.IsNullOrEmpty(contentRootPath))`
`17`	`17`	`{`