apply review feedback

src/Microsoft.DotNet.ProjectModel/ProjectContext.cs

@@ -82,7 +82,7 @@ namespace Microsoft.DotNet.ProjectModel
         /// <summary>
         /// Creates a project context for each framework located in the project at <paramref name="projectPath"/>
         /// </summary>
-        public static IEnumerable<ProjectContext> CreateContextForEachFramework(string projectPath, ProjectReader.Settings settings = null)
+        public static IEnumerable<ProjectContext> CreateContextForEachFramework(string projectPath, ProjectReaderSettings settings = null)
         {
             if (!projectPath.EndsWith(Project.FileName))
             {
@@ -95,7 +95,7 @@ namespace Microsoft.DotNet.ProjectModel
                 yield return new ProjectContextBuilder()
                                 .WithProject(project)
                                 .WithTargetFramework(framework.FrameworkName)
-                                .WithSettings(settings)
+                                .WithReaderSettings(settings)
                                 .Build();
             }
         }

src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs

@@ -37,7 +37,7 @@ namespace Microsoft.DotNet.ProjectModel
 
         private Func<string, LockFile> LockFileResolver { get; set; }
 
-        private ProjectReader.Settings Settings { get; set; }
+        private ProjectReaderSettings Settings { get; set; }
 
         public ProjectContextBuilder()
         {
@@ -111,7 +111,7 @@ namespace Microsoft.DotNet.ProjectModel
             return this;
         }
 
-        public ProjectContextBuilder WithSettings(ProjectReader.Settings settings)
+        public ProjectContextBuilder WithReaderSettings(ProjectReaderSettings settings)
         {
             Settings = settings;
             return this;

src/Microsoft.DotNet.ProjectModel/ProjectReader.cs

@@ -16,12 +16,7 @@ namespace Microsoft.DotNet.ProjectModel
 {
     public class ProjectReader
     {
-        public class Settings
+        public static bool TryGetProject(string path, out Project project, ICollection<DiagnosticMessage> diagnostics = null, ProjectReaderSettings settings = null)
-        {
-            public string VersionSuffix = null;
-        }
-
-        public static bool TryGetProject(string path, out Project project, ICollection<DiagnosticMessage> diagnostics = null, Settings settings = null)
         {
             project = null;
 
@@ -66,12 +61,12 @@ namespace Microsoft.DotNet.ProjectModel
             return true;
         }
 
-        public static Project GetProject(string projectFile, Settings settings = null)
+        public static Project GetProject(string projectFile, ProjectReaderSettings settings = null)
         {
             return GetProject(projectFile, new List<DiagnosticMessage>(), settings);
         }
 
-        public static Project GetProject(string projectFile, ICollection<DiagnosticMessage> diagnostics, Settings settings = null)
+        public static Project GetProject(string projectFile, ICollection<DiagnosticMessage> diagnostics, ProjectReaderSettings settings = null)
         {
             var name = Path.GetFileName(Path.GetDirectoryName(projectFile));
             using (var stream = new FileStream(projectFile, FileMode.Open, FileAccess.Read, FileShare.Read))
@@ -80,9 +75,9 @@ namespace Microsoft.DotNet.ProjectModel
             }
         }
 
-        public Project ReadProject(Stream stream, string projectName, string projectPath, ICollection<DiagnosticMessage> diagnostics, Settings settings = null)
+        public Project ReadProject(Stream stream, string projectName, string projectPath, ICollection<DiagnosticMessage> diagnostics, ProjectReaderSettings settings = null)
         {
-            settings = settings ?? new Settings();
+            settings = settings ?? new ProjectReaderSettings();
             var project = new Project();
 
             var reader = new StreamReader(stream);

src/Microsoft.DotNet.ProjectModel/ProjectReaderSettings.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.DotNet.ProjectModel
+{
+    public class ProjectReaderSettings
+    {
+        public string VersionSuffix = null;
+    }
+}

src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs

@@ -15,15 +15,15 @@ namespace Microsoft.DotNet.ProjectModel.Resolution
     public class ProjectDependencyProvider
     {
         private Func<string, Project> _resolveProject;
-        private ProjectReader.Settings _settings;
+        private ProjectReaderSettings _settings;
 
-        public ProjectDependencyProvider(ProjectReader.Settings settings = null)
+        public ProjectDependencyProvider(ProjectReaderSettings settings = null)
         {
             _resolveProject = ResolveProject;
             _settings = settings;
         }
 
-        public ProjectDependencyProvider(Func<string, Project> projectCacheResolver, ProjectReader.Settings settings = null)
+        public ProjectDependencyProvider(Func<string, Project> projectCacheResolver, ProjectReaderSettings settings = null)
         {
             _resolveProject = projectCacheResolver;
             _settings = settings;

src/Microsoft.DotNet.Tools.Pack/Program.cs

@@ -60,10 +60,10 @@ namespace Microsoft.DotNet.Tools.Compiler
                     return 1;
                 }
 
-                ProjectReader.Settings settings = null;
+                ProjectReaderSettings settings = null;
                 if (versionSuffix.HasValue())
                 {
-                    settings = new ProjectReader.Settings();
+                    settings = new ProjectReaderSettings();
                     settings.VersionSuffix = versionSuffix.Value();
                 }
 
@@ -88,7 +88,7 @@ namespace Microsoft.DotNet.Tools.Compiler
             }
         }
 
-        private static bool TryBuildPackage(string path, string configuration, string outputValue, string intermediateOutputValue, ProjectReader.Settings settings = null)
+        private static bool TryBuildPackage(string path, string configuration, string outputValue, string intermediateOutputValue, ProjectReaderSettings settings = null)
         {
             var contexts = ProjectContext.CreateContextForEachFramework(path, settings);
             var project = contexts.First().ProjectFile;

src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json

@@ -1,6 +1,6 @@
 {
   "profiles": {
-    "dotnet-pack": {
+    "dotnet pack": {
       "executablePath": "..\\..\\artifacts\\win7-x64\\stage2\\bin\\dotnet-pack.exe"
     }
   }