Merge pull request #2857 from dotnet/brthor/2737

fixes #2737
dotnet · May 4, 2016 · 11a0017 · 11a0017
2 parents 6b9918b + 7cf3603
commit 11a0017
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs b/src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.ProjectModel
 {
     public class BuildWorkspace : Workspace
     {
-        public BuildWorkspace(ProjectReaderSettings settings) : base(settings) { }
+        public BuildWorkspace(ProjectReaderSettings settings) : base(settings, false) { }
 
         /// <summary>
         /// Create an empty <see cref="WorkspaceContext" /> using the default <see cref="ProjectReaderSettings" />
@@ -58,7 +58,6 @@ public ProjectContext GetRuntimeContext(ProjectContext context, IEnumerable<stri
                     return CreateBaseProjectBuilder(context.ProjectFile)
                         .WithTargetFramework(context.TargetFramework)
                         .WithRuntimeIdentifiers(runtimeIdentifiers)
-                        .AsDesignTime()
                         .Build();
                 }
 

diff --git a/src/Microsoft.DotNet.ProjectModel/DesignTimeWorkspace.cs b/src/Microsoft.DotNet.ProjectModel/DesignTimeWorkspace.cs
@@ -15,7 +15,7 @@ public class DesignTimeWorkspace : Workspace
 
         private bool _needRefresh;
 
-        public DesignTimeWorkspace(ProjectReaderSettings settings) : base(settings) { }
+        public DesignTimeWorkspace(ProjectReaderSettings settings) : base(settings, true) { }
 
         public void AddProject(string path)
         {

diff --git a/src/Microsoft.DotNet.ProjectModel/Workspace.cs b/src/Microsoft.DotNet.ProjectModel/Workspace.cs
@@ -31,11 +31,13 @@ public abstract class Workspace
 
         private readonly ProjectReaderSettings _settings;
         private readonly LockFileReader _lockFileReader;
+        private readonly bool _designTime;
 
-        protected Workspace(ProjectReaderSettings settings)
+        protected Workspace(ProjectReaderSettings settings, bool designTime)
         {
             _settings = settings;
             _lockFileReader = new LockFileReader();
+            _designTime = designTime;
         }
 
         public ProjectContext GetProjectContext(string projectPath, NuGetFramework framework)
@@ -168,7 +170,7 @@ private FileModelEntry<LockFile> AddLockFileEntry(string projectDirectory, FileM
                     {
                         try
                         {
-                            currentEntry.Model = _lockFileReader.ReadLockFile(currentEntry.FilePath, fs, designTime: true);
+                            currentEntry.Model = _lockFileReader.ReadLockFile(currentEntry.FilePath, fs, designTime: _designTime);
                             currentEntry.UpdateLastWriteTimeUtc();
                         }
                         catch (FileFormatException ex)