diff --git a/src/Microsoft.Framework.Runtime/GlobalSettings.cs b/src/Microsoft.Framework.Runtime/GlobalSettings.cs index abfa3ab30..4f87a7b9e 100644 --- a/src/Microsoft.Framework.Runtime/GlobalSettings.cs +++ b/src/Microsoft.Framework.Runtime/GlobalSettings.cs @@ -14,7 +14,7 @@ public class GlobalSettings { public const string GlobalFileName = "global.json"; - public IList SourcePaths { get; private set; } + public IList ProjectSearchPaths { get; private set; } public IDictionary PackageHashes { get; private set; } public string PackagesPath { get; private set; } public string FilePath { get; private set; } @@ -53,10 +53,11 @@ public static bool TryGetGlobalSettings(string path, out GlobalSettings globalSe throw FileFormatException.Create(ex, globalJsonPath); } - var sources = settings["sources"]; + // TODO: Remove sources + var projectSearchPaths = settings["projects"] ?? settings["sources"]; var dependencies = settings["dependencies"] as JObject; - globalSettings.SourcePaths = sources == null ? new string[] { } : sources.ToObject(); + globalSettings.ProjectSearchPaths = projectSearchPaths == null ? new string[] { } : projectSearchPaths.ToObject(); globalSettings.PackagesPath = settings.Value("packages"); globalSettings.PackageHashes = new Dictionary(); globalSettings.FilePath = globalJsonPath; diff --git a/src/Microsoft.Framework.Runtime/ProjectResolver.cs b/src/Microsoft.Framework.Runtime/ProjectResolver.cs index adb7617aa..856b9894c 100644 --- a/src/Microsoft.Framework.Runtime/ProjectResolver.cs +++ b/src/Microsoft.Framework.Runtime/ProjectResolver.cs @@ -54,7 +54,7 @@ private IEnumerable ResolveSearchPaths(string projectPath, string rootPa if (GlobalSettings.TryGetGlobalSettings(rootPath, out global)) { - foreach (var sourcePath in global.SourcePaths) + foreach (var sourcePath in global.ProjectSearchPaths) { paths.Add(Path.Combine(rootPath, sourcePath)); }