[release/10.0.1xx] Source code updates from dotnet/dotnet

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. -->

eng/common/core-templates/job/publish-build-assets.yml

@@ -40,6 +40,8 @@ parameters:
 
   repositoryAlias: self
 
+  officialBuildId: ''
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -62,6 +64,11 @@ jobs:
       value: false
     # unconditional - needed for logs publishing (redactor tool version)
     - template: /eng/common/core-templates/post-build/common-variables.yml
+  - name: OfficialBuildId
+    ${{ if ne(parameters.officialBuildId, '') }}:
+      value: ${{ parameters.officialBuildId }}
+    ${{ else }}:
+      value: $(Build.BuildNumber)
 
   pool:
     # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
           /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
           /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
           /p:MaestroApiEndpoint=https://maestro.dot.net
-          /p:OfficialBuildId=$(Build.BuildNumber)
+          /p:OfficialBuildId=$(OfficialBuildId)
       condition: ${{ parameters.condition }}
       continueOnError: ${{ parameters.continueOnError }}
 

eng/common/core-templates/jobs/jobs.yml

@@ -44,6 +44,7 @@ parameters:
   artifacts: {}
   is1ESPipeline: ''
   repositoryAlias: self
+  officialBuildId: ''
 
 # Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
 # and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
         artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
         signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
         repositoryAlias: ${{ parameters.repositoryAlias }}
+        officialBuildId: ${{ parameters.officialBuildId }}

eng/common/post-build/nuget-verification.ps1

@@ -30,7 +30,7 @@
 [CmdletBinding(PositionalBinding = $false)]
 param(
    [string]$NuGetExePath,
-   [string]$PackageSource = "https://api.nuget.org/v3/index.json",
+   [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
    [string]$DownloadPath,
    [Parameter(ValueFromRemainingArguments = $true)]
    [string[]]$args

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

global.json

@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25467.107",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

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

@@ -119,6 +119,8 @@ public void Initialize(IEventSource eventSource)
 
                 eventSource.BuildFinished += OnBuildFinished;
             }
+
+            eventSource.BuildFinished += OnBuildFinished;
         }
         catch (Exception)
         {
@@ -133,17 +135,18 @@ private void OnBuildFinished(object sender, BuildFinishedEventArgs e)
 
     internal void SendAggregatedEventsOnBuildFinished(ITelemetry? telemetry)
     {
+        if (telemetry is null) return;
         if (_aggregatedEvents.TryGetValue(TaskFactoryTelemetryAggregatedEventName, out var taskFactoryData))
         {
-            var taskFactoryProperties = ConvertToStringDictionary(taskFactoryData);
+            Dictionary<string, string?> taskFactoryProperties = ConvertToStringDictionary(taskFactoryData);
 
             TrackEvent(telemetry, $"msbuild/{TaskFactoryTelemetryAggregatedEventName}", taskFactoryProperties, toBeHashed: [], toBeMeasured: []);
             _aggregatedEvents.Remove(TaskFactoryTelemetryAggregatedEventName);
         }
 
         if (_aggregatedEvents.TryGetValue(TasksTelemetryAggregatedEventName, out var tasksData))
         {
-            var tasksProperties = ConvertToStringDictionary(tasksData);
+            Dictionary<string, string?> tasksProperties = ConvertToStringDictionary(tasksData);
 
             TrackEvent(telemetry, $"msbuild/{TasksTelemetryAggregatedEventName}", tasksProperties, toBeHashed: [], toBeMeasured: []);
             _aggregatedEvents.Remove(TasksTelemetryAggregatedEventName);
@@ -163,14 +166,10 @@ internal void SendAggregatedEventsOnBuildFinished(ITelemetry? telemetry)
 
     internal void AggregateEvent(TelemetryEventArgs args)
     {
-        if (args.EventName is null)
-        {
-            return;
-        }
-
-        if (!_aggregatedEvents.TryGetValue(args.EventName, out var eventData))
+        if (args.EventName is null) return;
+        if (!_aggregatedEvents.TryGetValue(args.EventName, out Dictionary<string, int>? eventData) || eventData is null)
         {
-            eventData = [];
+            eventData = new Dictionary<string, int>();
             _aggregatedEvents[args.EventName] = eventData;
         }
 

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

@@ -10,8 +10,10 @@
     public class FakeTelemetry : ITelemetry
     {
         public bool Enabled { get; set; } = true;
+
+        private readonly List<LogEntry> _logEntries = new List<LogEntry>();
 
         private readonly List<LogEntry> _logEntries = new List<LogEntry>();
 
         public void TrackEvent(string eventName, IDictionary<string, string> properties, IDictionary<string, double> measurements)
         {