React to dotnet/cli#1970

dotnet · Apr 5, 2016 · 595f262 · 595f262
1 parent 10f74f9
commit 595f262
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/dotnet-ef/OperationExecutor.cs b/src/dotnet-ef/OperationExecutor.cs
@@ -174,6 +174,7 @@ private ProjectContext GetCompatibleProjectContext(string projectPath)
             var frameworks = projectFile.GetTargetFrameworks().Select(f => f.FrameworkName);
             var framework = NuGetFrameworkUtility.GetNearest(
                 frameworks,
+                // TODO: Use netcoreapp
                 FrameworkConstants.CommonFrameworks.NetStandardApp15,
                 f => new NuGetFramework(f))
                 // TODO: Remove with dnxcore50
@@ -184,9 +185,9 @@ private ProjectContext GetCompatibleProjectContext(string projectPath)
             if (framework == null)
             {
                 throw new OperationException(
-                    "The project '" + projectFile.Name + "' doesn't target a framework compatible with DNX Core 5.0. You must " +
-                    "target a compatible framework like 'dotnet5.4' before using the Entity Framework Core .NET Core CLI " +
-                    "Commands.");
+                    "The project '" + projectFile.Name + "' doesn't target a framework compatible with .NET Standard "+
+                    "App 1.5. You must target a compatible framework such as 'netstandard1.3' in order to use the " +
+                    "Entity Framework .NET Core CLI Commands.");
             }
 
             Reporter.Verbose.WriteLine(

diff --git a/src/dotnet-ef/Program.cs b/src/dotnet-ef/Program.cs
@@ -21,7 +21,7 @@ public static int Main([NotNull] string[] args)
             var app = new CommandLineApplication
             {
                 Name = "dotnet ef",
-                FullName = "Entity Framework Core Commands"
+                FullName = "Entity Framework .NET Core CLI Commands"
             };
 
             app.HelpOption();

diff --git a/src/dotnet-ef/project.json b/src/dotnet-ef/project.json
@@ -18,14 +18,16 @@
     "Microsoft.Extensions.CommandLineUtils": "1.0.0-*"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandard1.5": {
       "imports": [
-        "netstandardapp1.5",
+        "dnxcore50",
         "portable-net452+win81"
       ],
       "dependencies": {
-        "Microsoft.NETCore.Platforms": "1.0.1-*",
-        "System.Security.Cryptography.Algorithms": "4.1.0-*"
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        }
       }
     }
   }