Cleanup compiled model tooling

src/EFCore.Design/Design/Internal/DbContextOperations.cs

@@ -138,7 +138,7 @@ public virtual string ScriptDbContext(string? contextType)
         ///     any release. You should only use it directly in your code with extreme caution and knowing that
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
-        public virtual IReadOnlyList<string> Optimize(string? outputDir, string? modelNamespace, string? contextType)
+        public virtual void Optimize(string? outputDir, string? modelNamespace, string? contextType)
         {
             using var context = CreateContext(contextType);
 
@@ -151,7 +151,7 @@ public virtual IReadOnlyList<string> Optimize(string? outputDir, string? modelNa
 
             var finalModelNamespace = modelNamespace ?? GetNamespaceFromOutputPath(outputDir) ?? "";
 
-            var scaffoldedModel = scaffolder.ScaffoldModel(
+            scaffolder.ScaffoldModel(
                 context.GetService<IDesignTimeModel>().Model,
                 outputDir,
                 new CompiledModelCodeGenerationOptions
@@ -175,8 +175,6 @@ public virtual IReadOnlyList<string> Optimize(string? outputDir, string? modelNa
             {
                 _reporter.WriteWarning(DesignStrings.CompiledModelCustomCacheKeyFactory(cacheKeyFactory.GetType().ShortDisplayName()));
             }
-
-            return scaffoldedModel;
         }
 
         private string? GetNamespaceFromOutputPath(string directoryPath)

src/EFCore.Design/Design/OperationExecutor.cs

@@ -516,7 +516,7 @@ public Optimize(
             }
         }
 
-        private IReadOnlyList<string> OptimizeImpl(string? outputDir, string? modelNamespace, string? contextType)
+        private void OptimizeImpl(string? outputDir, string? modelNamespace, string? contextType)
             => ContextOperations.Optimize(outputDir, modelNamespace, contextType);
 
         /// <summary>

src/EFCore.Tools/EFCore.Tools.csproj

@@ -17,8 +17,8 @@ Add-Migration
 Drop-Database
 Get-DbContext
 Get-Migration
-Remove-Migration
 Optimize-DbContext
+Remove-Migration
 Scaffold-DbContext
 Script-Migration
 Update-Database

src/EFCore.Tools/EntityFrameworkCore.psd1.in

@@ -71,8 +71,8 @@ FunctionsToExport = (
     'Enable-Migrations',
     'Get-DbContext',
     'Get-Migration',
-    'Remove-Migration',
     'Optimize-DbContext',
+    'Remove-Migration',
     'Scaffold-DbContext',
     'Script-DbContext',
     'Script-Migration',

src/EFCore.Tools/tools/EntityFrameworkCore.psm1

@@ -370,11 +370,9 @@ function Remove-Migration
 #
 
 Register-TabExpansion Optimize-DbContext @{
-    Provider = { param($x) GetProviders $x.Project }
     Project = { GetProjects }
     StartupProject = { GetProjects }
     OutputDir = { <# Disabled. Otherwise, paths would be relative to the solution directory. #> }
-    ContextDir = { <# Disabled. Otherwise, paths would be relative to the solution directory. #> }
 }
 
 <#

src/EFCore.Tools/tools/about_EntityFrameworkCore.help.txt

@@ -28,10 +28,10 @@ LONG DESCRIPTION
 
         Get-Migration               Lists available migrations.
 
-        Remove-Migration            Removes the last migration.
-
         Optimize-DbContext          Generates a compiled version of the model used by the DbContext.
 
+        Remove-Migration            Removes the last migration.
+
         Scaffold-DbContext          Scaffolds a DbContext and entity types for a database.
 
         Script-DbContext            Generates a SQL script from the DbContext. Bypasses any migrations.
@@ -45,8 +45,8 @@ SEE ALSO
     Drop-Database
     Get-DbContext
     Get-Migration
-    Remove-Migration
     Optimize-DbContext
+    Remove-Migration
     Scaffold-DbContext
     Script-DbContext
     Script-Migration

src/ef/Commands/DbContextOptimizeCommand.Configure.cs

@@ -10,15 +10,13 @@ internal partial class DbContextOptimizeCommand : ContextCommandBase
     {
         private CommandOption? _outputDir;
         private CommandOption? _namespace;
-        private CommandOption? _json;
 
         public override void Configure(CommandLineApplication command)
         {
             command.Description = Resources.DbContextOptimizeDescription;
 
             _outputDir = command.Option("-o|--output-dir <PATH>", Resources.OutputDirDescription);
             _namespace = command.Option("-n|--namespace <NAMESPACE>", Resources.NamespaceDescription);
-            _json = Json.ConfigureOption(command);
 
             base.Configure(command);
         }

src/ef/Commands/DbContextOptimizeCommand.cs

@@ -1,8 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
-
 namespace Microsoft.EntityFrameworkCore.Tools.Commands
 {
     // ReSharper disable once ArrangeTypeModifiers
@@ -11,36 +9,12 @@ internal partial class DbContextOptimizeCommand
         protected override int Execute(string[] args)
         {
             using var executor = CreateExecutor(args);
-            var result = executor.Optimize(
+            executor.Optimize(
                 _outputDir!.Value(),
                 _namespace!.Value(),
                 Context!.Value());
 
-            if (_json!.HasValue())
-            {
-                ReportJsonResults(result);
-            }
-
             return base.Execute(args);
         }
-        private static void ReportJsonResults(IReadOnlyList<string> result)
-        {
-            Reporter.WriteData("{");
-            Reporter.WriteData("  \"files\": [");
-
-            for (var i = 0; i < result.Count; i++)
-            {
-                var line = "    " + Json.Literal(result[i]);
-                if (i != result.Count - 1)
-                {
-                    line += ",";
-                }
-
-                Reporter.WriteData(line);
-            }
-
-            Reporter.WriteData("  ]");
-            Reporter.WriteData("}");
-        }
     }
 }

src/ef/IOperationExecutor.cs

@@ -16,7 +16,7 @@ internal interface IOperationExecutor : IDisposable
         IDictionary GetContextInfo(string? name);
         void UpdateDatabase(string? migration, string? connectionString, string? contextType);
         IEnumerable<IDictionary> GetContextTypes();
-        IReadOnlyList<string> Optimize(string? outputDir, string? modelNamespace, string? contextType);
+        void Optimize(string? outputDir, string? modelNamespace, string? contextType);
 
         IDictionary ScaffoldContext(
             string provider,

src/ef/OperationExecutorBase.cs

@@ -140,8 +140,8 @@ public void UpdateDatabase(string? migration, string? connectionString, string?
         public IEnumerable<IDictionary> GetContextTypes()
             => InvokeOperation<IEnumerable<IDictionary>>("GetContextTypes");
 
-        public IReadOnlyList<string> Optimize(string? outputDir, string? modelNamespace, string? contextType)
-            => InvokeOperation<IReadOnlyList<string>>(
+        public void Optimize(string? outputDir, string? modelNamespace, string? contextType)
+            => InvokeOperation(
                 "Optimize",
                 new Dictionary<string, object?>
                 {