Backflow from https://github.com/dotnet/dotnet / f448387 build 286402

[[ commit created by automation ]]

Author: dotnet-maestro[bot]

eng/Versions.props

@@ -20,10 +20,10 @@
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
     <!-- Calculate prerelease label -->
-    <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rc</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
     <PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'"></PreReleaseVersionIteration>
     <!-- In source-build the version of the compiler must be same or newer than the version of the
          compiler API targeted by analyzer assemblies. This is mostly an issue on source-build as
          in that build mode analyzer assemblies always target the live compiler API. -->

es-metadata.yml

@@ -0,0 +1,8 @@
+schemaVersion: 0.0.1
+isProduction: true
+accountableOwners:
+  service: 30f635d8-2918-48af-8ddf-d9bc854b7584
+routing:
+  defaultAreaPath:
+    org: devdiv
+    path: DevDiv\NET Tools\SDK

src/Cli/dotnet/Commands/MSBuild/MSBuildLogger.cs

@@ -163,7 +163,7 @@ internal void SendAggregatedEventsOnBuildFinished(ITelemetry? telemetry)
 
     internal void AggregateEvent(TelemetryEventArgs args)
     {
-        if (args.EventName is null)
+        if (args.EventName == null || args.Properties == null)
         {
             return;
         }

test/dotnet.Tests/CommandTests/MSBuild/GivenMSBuildLogger.cs

@@ -214,5 +214,101 @@ public void ItIgnoresNonIntegerPropertiesDuringAggregation()
             fakeTelemetry.LogEntry.Properties.Should().NotContainKey("InvalidProperty");
             fakeTelemetry.LogEntry.Properties.Should().NotContainKey("InvalidProperty2");
         }
+
+        [Fact]
+        public void ItAggregatesEvents()
+        {
+            var fakeTelemetry = new FakeTelemetry();
+            fakeTelemetry.Enabled = true;
+            var logger = new MSBuildLogger(fakeTelemetry);
+
+            var event1 = new TelemetryEventArgs
+            {
+                EventName = MSBuildLogger.TaskFactoryTelemetryAggregatedEventName,
+                Properties = new Dictionary<string, string>
+                {
+                    { "AssemblyTaskFactoryTasksExecutedCount", "2" },
+                    { "RoslynCodeTaskFactoryTasksExecutedCount", "1" }
+                }
+            };
+
+            var event2 = new TelemetryEventArgs
+            {
+                EventName = MSBuildLogger.TaskFactoryTelemetryAggregatedEventName,
+                Properties = new Dictionary<string, string>
+                {
+                    { "AssemblyTaskFactoryTasksExecutedCount", "3" },
+                    { "CustomTaskFactoryTasksExecutedCount", "2" }
+                }
+            };
+
+            var event3 = new TelemetryEventArgs
+            {
+                EventName = MSBuildLogger.TasksTelemetryAggregatedEventName,
+                Properties = new Dictionary<string, string>
+                {
+                    { "TasksExecutedCount", "3" },
+                    { "TaskHostTasksExecutedCount", "2" }
+                }
+            };
+
+            var event4 = new TelemetryEventArgs
+            {
+                EventName = MSBuildLogger.TasksTelemetryAggregatedEventName,
+                Properties = new Dictionary<string, string>
+                {
+                    { "TasksExecutedCount", "5" }
+                }
+            };
+
+            logger.AggregateEvent(event1);
+            logger.AggregateEvent(event2);
+            logger.AggregateEvent(event3);
+            logger.AggregateEvent(event4);
+
+            logger.SendAggregatedEventsOnBuildFinished(fakeTelemetry);
+
+            fakeTelemetry.LogEntries.Should().HaveCount(2);
+
+            var taskFactoryEntry = fakeTelemetry.LogEntries.FirstOrDefault(e => e.EventName == $"msbuild/{MSBuildLogger.TaskFactoryTelemetryAggregatedEventName}");
+            taskFactoryEntry.Should().NotBeNull();
+            taskFactoryEntry.Properties["AssemblyTaskFactoryTasksExecutedCount"].Should().Be("5"); // 2 + 3
+            taskFactoryEntry.Properties["RoslynCodeTaskFactoryTasksExecutedCount"].Should().Be("1"); // 1 + 0
+            taskFactoryEntry.Properties["CustomTaskFactoryTasksExecutedCount"].Should().Be("2"); // 0 + 2
+
+            var tasksEntry = fakeTelemetry.LogEntries.FirstOrDefault(e => e.EventName == $"msbuild/{MSBuildLogger.TasksTelemetryAggregatedEventName}");
+            tasksEntry.Should().NotBeNull();
+            tasksEntry.Properties["TasksExecutedCount"].Should().Be("8"); // 3 + 5
+            tasksEntry.Properties["TaskHostTasksExecutedCount"].Should().Be("2"); // 2 + 0
+        }
+
+        [Fact]
+        public void ItIgnoresNonIntegerPropertiesDuringAggregation()
+        {
+            var fakeTelemetry = new FakeTelemetry();
+            fakeTelemetry.Enabled = true;
+            var logger = new MSBuildLogger(fakeTelemetry);
+            
+            var eventArgs = new TelemetryEventArgs
+            {
+                EventName = MSBuildLogger.TaskFactoryTelemetryAggregatedEventName,
+                Properties = new Dictionary<string, string>
+                {
+                    { "AssemblyTaskFactoryTasksExecutedCount", "3" },
+                    { "InvalidProperty", "not-a-number" },
+                    { "InvalidProperty2", "1.234" },
+                }
+            };
+
+            logger.AggregateEvent(eventArgs);
+
+            logger.SendAggregatedEventsOnBuildFinished(fakeTelemetry);
+
+            fakeTelemetry.LogEntry.Should().NotBeNull();
+            fakeTelemetry.LogEntry.EventName.Should().Be($"msbuild/{MSBuildLogger.TaskFactoryTelemetryAggregatedEventName}");
+            fakeTelemetry.LogEntry.Properties["AssemblyTaskFactoryTasksExecutedCount"].Should().Be("3");
+            fakeTelemetry.LogEntry.Properties.Should().NotContainKey("InvalidProperty");
+            fakeTelemetry.LogEntry.Properties.Should().NotContainKey("InvalidProperty2");
+        }
     }
 }