diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs b/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs index 34820e1a8..daea320eb 100644 --- a/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs +++ b/src/Microsoft.DotNet.ProjectModel/ProjectContext.cs @@ -82,7 +82,7 @@ namespace Microsoft.DotNet.ProjectModel /// /// Creates a project context for each framework located in the project at /// - public static IEnumerable CreateContextForEachFramework(string projectPath, ProjectReader.Settings settings = null) + public static IEnumerable 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(); } } diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs b/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs index 0b78a9286..c6f8ad991 100644 --- a/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs +++ b/src/Microsoft.DotNet.ProjectModel/ProjectContextBuilder.cs @@ -37,7 +37,7 @@ namespace Microsoft.DotNet.ProjectModel private Func 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; diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs b/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs index 503a6d520..4e76c4215 100644 --- a/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs +++ b/src/Microsoft.DotNet.ProjectModel/ProjectReader.cs @@ -16,12 +16,7 @@ namespace Microsoft.DotNet.ProjectModel { public class ProjectReader { - public class Settings - { - public string VersionSuffix = null; - } - - public static bool TryGetProject(string path, out Project project, ICollection diagnostics = null, Settings settings = null) + public static bool TryGetProject(string path, out Project project, ICollection diagnostics = null, ProjectReaderSettings 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(), settings); } - public static Project GetProject(string projectFile, ICollection diagnostics, Settings settings = null) + public static Project GetProject(string projectFile, ICollection 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 diagnostics, Settings settings = null) + public Project ReadProject(Stream stream, string projectName, string projectPath, ICollection diagnostics, ProjectReaderSettings settings = null) { - settings = settings ?? new Settings(); + settings = settings ?? new ProjectReaderSettings(); var project = new Project(); var reader = new StreamReader(stream); diff --git a/src/Microsoft.DotNet.ProjectModel/ProjectReaderSettings.cs b/src/Microsoft.DotNet.ProjectModel/ProjectReaderSettings.cs new file mode 100644 index 000000000..376f861d0 --- /dev/null +++ b/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; + } +} diff --git a/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs b/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs index a0fe1939c..e5ef9685f 100644 --- a/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs +++ b/src/Microsoft.DotNet.ProjectModel/Resolution/ProjectDependencyProvider.cs @@ -15,15 +15,15 @@ namespace Microsoft.DotNet.ProjectModel.Resolution public class ProjectDependencyProvider { private Func _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 projectCacheResolver, ProjectReader.Settings settings = null) + public ProjectDependencyProvider(Func projectCacheResolver, ProjectReaderSettings settings = null) { _resolveProject = projectCacheResolver; _settings = settings; diff --git a/src/Microsoft.DotNet.Tools.Pack/Program.cs b/src/Microsoft.DotNet.Tools.Pack/Program.cs index 7a8140e75..d85235700 100644 --- a/src/Microsoft.DotNet.Tools.Pack/Program.cs +++ b/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; diff --git a/src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json b/src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json index abe7262bc..7a29b189e 100644 --- a/src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json +++ b/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" } }