PR Feedback

TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/Program.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace StandaloneApp
-{
-    public static class Program
-    {
-        public static void Main(string[] args)
-        {
-            Console.WriteLine("Hello, World!");
-        }
-    }
-}

TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json

@@ -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": {}
-  }
-}

TestAssets/TestProjects/DependencyChangeTest/StandaloneApp_Portable/project.json.modified

@@ -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": {}
-  }
-}

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);
             }
         }

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)