Add new options interfaces for new filters

src/Microsoft.DotNet.ImageBuilder/src/Commands/IFilterableOptions.cs

@@ -8,4 +8,14 @@ public interface IFilterableOptions
     {
         ManifestFilterOptions FilterOptions { get; }
     }
+
+    public interface IPlatformFilterableOptions
+    {
+        PlatformFilterOptions Platform { get; }
+    }
+
+    public interface IDockerfileFilterableOptions
+    {
+        DockerfileFilterOptions Dockerfile { get; }
+    }
 }

src/Microsoft.DotNet.ImageBuilder/src/Commands/ManifestOptions.cs

@@ -27,14 +27,35 @@ public virtual ManifestFilter GetManifestFilter()
 
             if (this is IFilterableOptions options)
             {
-                ManifestFilterOptions filterOptions = options.FilterOptions;
-                filter.IncludeArchitecture = filterOptions.Platform.Architecture;
-                filter.IncludeOsType = filterOptions.Platform.OsType;
-                filter.IncludeOsVersions = filterOptions.Platform.OsVersions;
-                filter.IncludePaths = filterOptions.Dockerfile.Paths;
-                filter.IncludeProductVersions = filterOptions.Dockerfile.ProductVersions;
+                filter = SetPlatformFilters(filter, options.FilterOptions.Platform);
+                filter = SetDockerfileFilters(filter, options.FilterOptions.Dockerfile);
             }
 
+            if (this is IPlatformFilterableOptions platformFilterOptions)
+            {
+                filter = SetPlatformFilters(filter, platformFilterOptions.Platform);
+            }
+
+            if (this is IDockerfileFilterableOptions dockerfileFilterOptions)
+            {
+                filter = SetDockerfileFilters(filter, dockerfileFilterOptions.Dockerfile);
+            }
+
+            return filter;
+        }
+
+        private static ManifestFilter SetDockerfileFilters(ManifestFilter filter, DockerfileFilterOptions options)
+        {
+            filter.IncludePaths = options.Paths;
+            filter.IncludeProductVersions = options.ProductVersions;
+            return filter;
+        }
+
+        private static ManifestFilter SetPlatformFilters(ManifestFilter filter, PlatformFilterOptions options)
+        {
+            filter.IncludeArchitecture = options.Architecture;
+            filter.IncludeOsType = options.OsType;
+            filter.IncludeOsVersions = options.OsVersions;
             return filter;
         }
     }