Merge pull request #402 from panopticoncentral/fixes

Fix design-time build name and viewer
dotnet · Jun 19, 2021 · 4030597 · 4030597
2 parents a375faf + 22dc4fc
commit 4030597
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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<string> dimensions, IEnumerable<string> targets, BuildType buildType, DateTime startTime)
         {
             int nextId = Interlocked.Increment(ref SharedBuildId);
+            ProjectPath = projectPath;
             BuildSummary = new BuildSummary(nextId, projectPath, dimensions, targets, buildType, startTime);
         }