mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2857 from dotnet/brthor/2737

Browse source 
fixes #2737
This commit is contained in:
Piotr Puszkiewicz 2016-05-03 17:42:29 -07:00
commit 11a001706f
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Microsoft.DotNet.ProjectModel/BuildWorkspace.cs
View file

@ -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 @@ namespace Microsoft.DotNet.ProjectModel
return CreateBaseProjectBuilder(context.ProjectFile)
.WithTargetFramework(context.TargetFramework)
.WithRuntimeIdentifiers(runtimeIdentifiers)
.AsDesignTime()
.Build();
}

2
src/Microsoft.DotNet.ProjectModel/DesignTimeWorkspace.cs
View file

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.ProjectModel
private bool _needRefresh;
public DesignTimeWorkspace(ProjectReaderSettings settings) : base(settings) { }
public DesignTimeWorkspace(ProjectReaderSettings settings) : base(settings, true) { }
public void AddProject(string path)
{

6
src/Microsoft.DotNet.ProjectModel/Workspace.cs
View file

@ -31,11 +31,13 @@ namespace Microsoft.DotNet.ProjectModel
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 @@ namespace Microsoft.DotNet.ProjectModel
{
try
{
currentEntry.Model = _lockFileReader.ReadLockFile(currentEntry.FilePath, fs, designTime: true);
currentEntry.Model = _lockFileReader.ReadLockFile(currentEntry.FilePath, fs, designTime: _designTime);
currentEntry.UpdateLastWriteTimeUtc();
}
catch (FileFormatException ex)