Migrations Bundles: Fix some bugs

dotnet · Aug 17, 2021 · f102f1d · f102f1d
1 parent 91a398b
commit f102f1d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/src/EFCore.Tools/tools/EntityFrameworkCore.psm1 b/src/EFCore.Tools/tools/EntityFrameworkCore.psm1
@@ -165,7 +165,7 @@ function Bundle-Migration
 
     if (!$Framework)
     {
-        $Framework = GetProperty $startupProject.Properties 'FriendlyTargetFramework'
+        $Framework = GetProperty $dteStartupProject.Properties 'FriendlyTargetFramework'
     }
 
     $params = 'migrations', 'bundle', '--framework', $Framework

diff --git a/src/ef/Commands/MigrationsBundleCommand.cs b/src/ef/Commands/MigrationsBundleCommand.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Runtime.InteropServices;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Tools.Generators;
 using Microsoft.EntityFrameworkCore.Tools.Properties;
@@ -85,27 +84,17 @@ protected override int Execute(string[] args)
             {
                 var publishArgs = new List<string> { "publish" };
 
-                string? exe;
-                if (_runtime!.HasValue())
-                {
-                    var runtime = _runtime!.Value()!;
-                    publishArgs.Add("--runtime");
-                    publishArgs.Add(runtime);
-
-                    var baseLength = runtime.IndexOfAny(new[] { '-', '.', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
-                    var baseRID = runtime.Substring(0, baseLength);
-                    exe = string.Equals(baseRID, "win", StringComparison.OrdinalIgnoreCase)
-                        ? ".exe"
-                        : null;
-                }
-                else
-                {
-                    publishArgs.Add("--use-current-runtime");
-
-                    exe = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                        ? ".exe"
-                        : null;
-                }
+                var runtime = _runtime!.HasValue()
+                    ? _runtime!.Value()!
+                    : (string)AppContext.GetData("RUNTIME_IDENTIFIER");
+                publishArgs.Add("--runtime");
+                publishArgs.Add(runtime);
+
+                var baseLength = runtime.IndexOfAny(new[] { '-', '.', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0' });
+                var baseRID = runtime.Substring(0, baseLength);
+                var exe = string.Equals(baseRID, "win", StringComparison.OrdinalIgnoreCase)
+                    ? ".exe"
+                    : null;
 
                 var outputPath = _output!.HasValue()
                     ? _output!.Value()!