Rename sources to projectSearchPaths in global.json

- Allow sources to stay for now while projects transition #925
aspnet · Jan 19, 2015 · 4645885 · 4645885
1 parent c48e8d1
commit 4645885
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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<string> SourcePaths { get; private set; }
+        public IList<string> ProjectSearchPaths { get; private set; }
         public IDictionary<Library, string> 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<string[]>();
+            globalSettings.ProjectSearchPaths = projectSearchPaths == null ? new string[] { } : projectSearchPaths.ToObject<string[]>();
             globalSettings.PackagesPath = settings.Value<string>("packages");
             globalSettings.PackageHashes = new Dictionary<Library, string>();
             globalSettings.FilePath = globalJsonPath;

diff --git a/src/Microsoft.Framework.Runtime/ProjectResolver.cs b/src/Microsoft.Framework.Runtime/ProjectResolver.cs
@@ -54,7 +54,7 @@ private IEnumerable<string> 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));
                 }