Require options and fix resolving of root path

Author: ronaldbarendse

src/ImageSharp.Web/Caching/PhysicalFileSystemCache.cs

@@ -47,14 +47,11 @@ public PhysicalFileSystemCache(
 #endif
             FormatUtilities formatUtilities)
         {
+            Guard.NotNull(options, nameof(options));
             Guard.NotNull(environment, nameof(environment));
-            Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
-
-            // Allow configuration of the cache without having to register everything
-            PhysicalFileSystemCacheOptions cacheOptions = options != null ? options.Value : new();
-            this.cacheRootPath = GetCacheRoot(cacheOptions, environment.WebRootPath, environment.ContentRootPath);
-            this.cacheFolderDepth = (int)cacheOptions.CacheFolderDepth;
 
+            this.cacheRootPath = GetCacheRoot(options.Value, environment.WebRootPath, environment.ContentRootPath);
+            this.cacheFolderDepth = (int)options.Value.CacheFolderDepth;
             this.formatUtilities = formatUtilities;
         }
 
@@ -67,9 +64,7 @@ public PhysicalFileSystemCache(
         /// <returns><see cref="string"/> representing the fully qualified cache root path.</returns>
         internal static string GetCacheRoot(PhysicalFileSystemCacheOptions cacheOptions, string webRootPath, string contentRootPath)
         {
-            string cacheRoot = string.IsNullOrWhiteSpace(cacheOptions.CacheRootPath)
-                ? webRootPath
-                : cacheOptions.CacheRootPath;
+            string cacheRoot = cacheOptions.CacheRootPath ?? webRootPath ?? "wwwroot";
 
             return Path.IsPathFullyQualified(cacheRoot)
                 ? Path.Combine(cacheRoot, cacheOptions.CacheFolder)

src/ImageSharp.Web/Providers/PhysicalFileSystemProvider.cs

@@ -42,13 +42,10 @@ public PhysicalFileSystemProvider(
 #endif
             FormatUtilities formatUtilities)
         {
+            Guard.NotNull(options, nameof(options));
             Guard.NotNull(environment, nameof(environment));
-            Guard.NotNullOrWhiteSpace(environment.WebRootPath, nameof(environment.WebRootPath));
-
-            // Allow configuration of the provider without having to register everything
-            PhysicalFileSystemProviderOptions providerOptions = options != null ? options.Value : new();
-            this.providerRootPath = GetProviderRoot(providerOptions, environment.WebRootPath, environment.ContentRootPath);
 
+            this.providerRootPath = GetProviderRoot(options.Value, environment.WebRootPath, environment.ContentRootPath);
             this.formatUtilities = formatUtilities;
         }
 
@@ -87,9 +84,7 @@ public Task<IImageResolver> GetAsync(HttpContext context)
         /// <returns><see cref="string"/> representing the fully qualified provider root path.</returns>
         internal static string GetProviderRoot(PhysicalFileSystemProviderOptions providerOptions, string webRootPath, string contentRootPath)
         {
-            string providerRoot = string.IsNullOrWhiteSpace(providerOptions.ProviderRootPath)
-                ? webRootPath
-                : providerOptions.ProviderRootPath;
+            string providerRoot = providerOptions.ProviderRootPath ?? webRootPath ?? "wwwroot";
 
             return Path.IsPathFullyQualified(providerRoot)
                 ? providerRoot