From 25335d20fea6fac9d59236e8d216289d3f23391a Mon Sep 17 00:00:00 2001
From: Bryan Thornbury <brthor@microsoft.com>
Date: Tue, 3 May 2016 11:33:13 -0700
Subject: [PATCH] PR Feedback

---
 .../StandaloneApp_Portable/.noautobuild       |  0
 .../StandaloneApp_Portable/Program.cs         | 12 ---------
 .../StandaloneApp_Portable/project.json       | 22 ----------------
 .../project.json.modified                     | 25 -------------------
 .../Executable.cs                             | 10 ++++----
 test/dotnet-build.Tests/BuildOutputTests.cs   |  4 +--
 6 files changed, 7 insertions(+), 66 deletions(-)
 delete mode 100644 TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/.noautobuild
 delete mode 100644 TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/Program.cs
 delete mode 100644 TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json
 delete mode 100644 TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json.modified

diff --git a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/.noautobuild b/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/.noautobuild
deleted file mode 100644
index e69de29bb..000000000
diff --git a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/Program.cs b/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/Program.cs
deleted file mode 100644
index 529893b0e..000000000
--- a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace StandaloneApp
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("Hello, World!");
-        }
-    }
-}
diff --git a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json b/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json
deleted file mode 100644
index 95649a930..000000000
--- a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-        "Microsoft.NETCore.App": "1.0.0-rc2-*"
-      }
-    }
-  },
-  "runtimes": {
-    "win7-x64": {},
-    "win7-x86": {},
-    "osx.10.10-x64": {},
-    "osx.10.11-x64": {},
-    "ubuntu.14.04-x64": {},
-    "centos.7-x64": {},
-    "rhel.7.2-x64": {},
-    "debian.8-x64": {}
-  }
-}
diff --git a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json.modified b/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json.modified
deleted file mode 100644
index 3f57fac5f..000000000
--- a/TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json.modified
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "compilationOptions": {
-    "emitEntryPoint": true
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "dependencies": {
-       "Microsoft.NETCore.App": {
-          "type": "platform",
-          "version": "1.0.0-rc2-*"
-        }
-      }
-    }
-  },
-  "runtimes": {
-    "win7-x64": {},
-    "win7-x86": {},
-    "osx.10.10-x64": {},
-    "osx.10.11-x64": {},
-    "ubuntu.14.04-x64": {},
-    "centos.7-x64": {},
-    "rhel.7.2-x64": {},
-    "debian.8-x64": {}
-  }
-}
diff --git a/src/Microsoft.DotNet.Compiler.Common/Executable.cs b/src/Microsoft.DotNet.Compiler.Common/Executable.cs
index 0ad3a7f97..69414a293 100644
--- a/src/Microsoft.DotNet.Compiler.Common/Executable.cs
+++ b/src/Microsoft.DotNet.Compiler.Common/Executable.cs
@@ -56,9 +56,9 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
             ExportRuntimeAssets();
         }
 
-        private void VerifyCoreclrPresenceInPackageGraph()
+        private void VerifyCoreClrPresenceInPackageGraph()
         {
-            var isCoreclrPresent = _exporter
+            var isCoreClrPresent = _exporter
                 .GetAllExports()
                 .SelectMany(e => e.NativeLibraryGroups)
                 .SelectMany(g => g.Assets)
@@ -67,9 +67,9 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
                 .Any();
 
             // coreclr should be present for standalone apps
-            if (! isCoreclrPresent)
+            if (! isCoreClrPresent)
             {
-                throw new InvalidOperationException("Expected coreclr library not found in package graph. Please try running restore again.");
+                throw new InvalidOperationException("Expected coreclr library not found in package graph. Please try running dotnet restore again.");
             }
         }
 
@@ -102,7 +102,7 @@ namespace Microsoft.DotNet.Cli.Compiler.Common
             if (emitEntryPoint && !_context.IsPortable)
             {
                 // TODO: Pick a host based on the RID
-                VerifyCoreclrPresenceInPackageGraph();
+                VerifyCoreClrPresenceInPackageGraph();
                 CoreHost.CopyTo(_runtimeOutputPath, _compilerOptions.OutputName + Constants.ExeSuffix);
             }
         }
diff --git a/test/dotnet-build.Tests/BuildOutputTests.cs b/test/dotnet-build.Tests/BuildOutputTests.cs
index a34d47208..bfdddd4de 100644
--- a/test/dotnet-build.Tests/BuildOutputTests.cs
+++ b/test/dotnet-build.Tests/BuildOutputTests.cs
@@ -309,7 +309,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
         }
 
         [Fact]
-        private void StandaloneApp_WithoutCoreclrDll_Fails()
+        private void StandaloneApp_WithoutCoreClrDll_Fails()
         {
             // Convert a Portable App to Standalone to simulate the customer scenario
             var testInstance = TestAssetsManager.CreateTestInstance("DependencyChangeTest")
@@ -328,7 +328,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
 
             buildResult.Should().Fail();
 
-            buildResult.StdErr.Should().Contain("Expected coreclr library not found in package graph. Please try running restore again.");
+            buildResult.StdErr.Should().Contain("Expected coreclr library not found in package graph. Please try running dotnet restore again.");
         }
 
         private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)