From 22dc4fc9d506ca215505c0a8fc36ca0edab498ca Mon Sep 17 00:00:00 2001 From: Paul Vick Date: Fri, 18 Jun 2021 23:37:13 -0700 Subject: [PATCH] Fix design-time build name and viewer --- src/LogModel/Builder/ModelBuilder.cs | 9 ++++----- .../BuildLogging/Model/Backend/Build.cs | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/LogModel/Builder/ModelBuilder.cs b/src/LogModel/Builder/ModelBuilder.cs index 1432aaf838..3b90a0ecab 100644 --- a/src/LogModel/Builder/ModelBuilder.cs +++ b/src/LogModel/Builder/ModelBuilder.cs @@ -231,8 +231,7 @@ private void OnBuildFinished(BuildFinishedEventArgs args) private static void CheckProjectEventContext(BuildEventArgs args) { if (args.BuildEventContext.TargetId != -1 || - args.BuildEventContext.TaskId != -1 || - args.BuildEventContext.EvaluationId != -1) + args.BuildEventContext.TaskId != -1) { throw new LoggerException(Resources.BadState); } @@ -252,8 +251,7 @@ private void OnProjectStarted(ProjectStartedEventArgs args) CheckProjectEventContext(args); if (args.ParentProjectBuildEventContext.TargetId != -1 || - args.ParentProjectBuildEventContext.TaskId != -1 || - args.ParentProjectBuildEventContext.EvaluationId != -1) + args.ParentProjectBuildEventContext.TaskId != -1) { throw new LoggerException(Resources.BadState); } @@ -771,7 +769,8 @@ private void ProcessMessage(BuildEventArgs args) if (args.BuildEventContext != null) { - if (args.BuildEventContext.EvaluationId != BuildEventContext.InvalidEvaluationId) + if (args.BuildEventContext.EvaluationId != BuildEventContext.InvalidEvaluationId && + args.BuildEventContext.ProjectContextId == BuildEventContext.InvalidProjectContextId) { ProcessEvaluationMessage(args); return; diff --git a/src/ProjectSystemTools/BuildLogging/Model/Backend/Build.cs b/src/ProjectSystemTools/BuildLogging/Model/Backend/Build.cs index 69fdc053ca..8fad5cd030 100644 --- a/src/ProjectSystemTools/BuildLogging/Model/Backend/Build.cs +++ b/src/ProjectSystemTools/BuildLogging/Model/Backend/Build.cs @@ -20,7 +20,7 @@ namespace Microsoft.VisualStudio.ProjectSystem.Tools.BuildLogging.Model.BackEnd internal sealed class Build : IDisposable { public BuildSummary BuildSummary { get; private set; } - public string ProjectPath { get; } + public string ProjectPath { get; private set; } public string LogPath { get; private set; } public int BuildId => BuildSummary.BuildId; public BuildType BuildType => BuildSummary.BuildType; @@ -34,6 +34,7 @@ internal sealed class Build : IDisposable public Build(string projectPath, IEnumerable dimensions, IEnumerable targets, BuildType buildType, DateTime startTime) { int nextId = Interlocked.Increment(ref SharedBuildId); + ProjectPath = projectPath; BuildSummary = new BuildSummary(nextId, projectPath, dimensions, targets, buildType, startTime); }