Bundles: Flow configuration from project

Resolves #25906
dotnet · Sep 15, 2021 · 302b246 · 302b246
1 parent 5d7ca16
commit 302b246
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 31 deletions.
diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1
@@ -122,9 +122,6 @@ Register-TabExpansion Bundle-Migration @{
 .PARAMETER TargetRuntime
     The target runtime to bundle for.
 
-.PARAMETER Configuration
-    The configuration to use for the bundle.
-
 .PARAMETER Framework
     The target framework. Defaults to the first one in the project.
 
@@ -153,7 +150,6 @@ function Bundle-Migration
         [switch] $Force,
         [switch] $SelfContained,
         [string] $TargetRuntime,
-        [string] $Configuration,
         [string] $Framework,
         [string] $Context,
         [string] $Project,
@@ -190,11 +186,6 @@ function Bundle-Migration
         $params += '--target-runtime', $TargetRuntime
     }
 
-    if ($Configuration)
-    {
-        $params += '--target-configuration', $Configuration
-    }
-
     $params += GetParams $Context
 
     EF $dteProject $dteStartupProject $params $Args
@@ -1308,6 +1299,7 @@ function EF($project, $startupProject, $params, $applicationArgs, [switch] $skip
         '--startup-project', $startupProject.FullName,
         '--project-dir', $projectDir,
         '--language', $language,
+        '--configuration', $activeConfiguration.ConfigurationName,
         '--working-dir', $PWD.Path
 
     if (IsWeb $startupProject)

diff --git a/src/dotnet-ef/Properties/Resources.Designer.cs b/src/dotnet-ef/Properties/Resources.Designer.cs
diff --git a/src/dotnet-ef/Properties/Resources.resx b/src/dotnet-ef/Properties/Resources.resx
@@ -216,9 +216,6 @@
   <data name="MigrationsAddDescription" xml:space="preserve">
     <value>Adds a new migration.</value>
   </data>
-  <data name="MigrationsBundleConfigurationDescription" xml:space="preserve">
-    <value>The configuration to use for the bundle.</value>
-  </data>
   <data name="MigrationsBundleDescription" xml:space="preserve">
     <value>Creates an executable to update the database.</value>
   </data>

diff --git a/src/dotnet-ef/RootCommand.cs b/src/dotnet-ef/RootCommand.cs
@@ -184,6 +184,12 @@ protected override int Execute(string[] _)
             args.Add("--framework");
             args.Add(startupProject.TargetFramework!);
 
+            if (_configuration.HasValue())
+            {
+                args.Add("--configuration");
+                args.Add(_configuration.Value()!);
+            }
+
             if (string.Equals(project.Nullable, "enable", StringComparison.OrdinalIgnoreCase)
                 || string.Equals(project.Nullable, "annotations", StringComparison.OrdinalIgnoreCase))
             {

diff --git a/src/ef/Commands/MigrationsBundleCommand.Configure.cs b/src/ef/Commands/MigrationsBundleCommand.Configure.cs
@@ -12,7 +12,6 @@ internal partial class MigrationsBundleCommand : ContextCommandBase
         private CommandOption? _force;
         private CommandOption? _selfContained;
         private CommandOption? _runtime;
-        private CommandOption? _configuration;
 
         public override void Configure(CommandLineApplication command)
         {
@@ -22,7 +21,6 @@ public override void Configure(CommandLineApplication command)
             _force = command.Option("-f|--force", Resources.DbContextScaffoldForceDescription);
             _selfContained = command.Option("--self-contained", Resources.SelfContainedDescription);
             _runtime = command.Option("-r|--target-runtime <RUNTIME_IDENTIFIER>", Resources.MigrationsBundleRuntimeDescription);
-            _configuration = command.Option("--target-configuration <CONFIGURATION>", Resources.MigrationsBundleConfigurationDescription);
 
             base.Configure(command);
         }

diff --git a/src/ef/Commands/MigrationsBundleCommand.cs b/src/ef/Commands/MigrationsBundleCommand.cs
@@ -165,10 +165,12 @@ protected override int Execute(string[] args)
                         ? "--self-contained"
                         : "--no-self-contained");
 
-                if (_configuration!.HasValue())
+                var configuration = Configuration!.Value();
+                if (string.Equals(configuration, "Debug", StringComparison.OrdinalIgnoreCase)
+                    || string.Equals(configuration, "Release", StringComparison.OrdinalIgnoreCase))
                 {
                     publishArgs.Add("--configuration");
-                    publishArgs.Add(_configuration!.Value()!);
+                    publishArgs.Add(configuration!);
                 }
 
                 var exitCode = Exe.Run("dotnet", publishArgs, directory, interceptOutput: true);

diff --git a/src/ef/Commands/ProjectCommandBase.cs b/src/ef/Commands/ProjectCommandBase.cs
@@ -28,6 +28,7 @@ internal abstract class ProjectCommandBase : EFCommandBase
         protected CommandOption? StartupProject { get; private set; }
         protected CommandOption? WorkingDir { get; private set; }
         protected CommandOption? Framework { get; private set; }
+        protected CommandOption? Configuration { get; private set; }
 
         protected string? EFCoreVersion
             => _efcoreVersion ??= System.Reflection.Assembly.Load("Microsoft.EntityFrameworkCore.Design")
@@ -49,6 +50,7 @@ public override void Configure(CommandLineApplication command)
             _nullable = command.Option("--nullable", Resources.NullableDescription);
             WorkingDir = command.Option("--working-dir <PATH>", Resources.WorkingDirDescription);
             Framework = command.Option("--framework <FRAMEWORK>", Resources.FrameworkDescription);
+            Configuration = command.Option("--configuration <CONFIGURATION>", Resources.ConfigurationDescription);
 
             base.Configure(command);
         }

diff --git a/src/ef/Properties/Resources.Designer.cs b/src/ef/Properties/Resources.Designer.cs
diff --git a/src/ef/Properties/Resources.resx b/src/ef/Properties/Resources.resx
@@ -132,6 +132,9 @@
   <data name="BuildBundleSucceeded" xml:space="preserve">
     <value>Done. Migrations Bundle: {path}</value>
   </data>
+  <data name="ConfigurationDescription" xml:space="preserve">
+    <value>The configuration to use.</value>
+  </data>
   <data name="ConnectionDescription" xml:space="preserve">
     <value>The connection string to the database.</value>
   </data>
@@ -243,9 +246,6 @@
   <data name="MigrationsAddDescription" xml:space="preserve">
     <value>Adds a new migration.</value>
   </data>
-  <data name="MigrationsBundleConfigurationDescription" xml:space="preserve">
-    <value>The configuration to use for the bundle.</value>
-  </data>
   <data name="MigrationsBundleDescription" xml:space="preserve">
     <value>Creates an executable to update the database.</value>
   </data>