From d22cf698bb78814de42bea787b7776492c484c04 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Tue, 16 Sep 2025 07:40:29 -0500
Subject: [PATCH 1/2] Add RunAOTCompilation to the telemetry items

---
 .../targets/Microsoft.NET.TargetFrameworkInference.targets     | 1 +
 .../GivenThatWeWantToBuildANetCoreAppForTelemetry.cs           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
index e1b1efd50367..6a191ee32862 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
@@ -136,6 +136,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <TFTelemetry Include="ArtifactsPathLocationType" Value="$(_ArtifactsPathLocationType)" />
       <TFTelemetry Include="TargetPlatformIdentifier" Value="$(TargetPlatformIdentifier)" />
       <TFTelemetry Include="UseMonoRuntime" Value="$(UseMonoRuntime)" />
+      <TFTelemetry Incluse="RunAOTCompilation" Value="$(RunAOTCompilation)" />
       <TFTelemetry Include="PublishAot" Value="$(PublishAot)" />
       <TFTelemetry Include="PublishTrimmed" Value="$(PublishTrimmed)" />
       <TFTelemetry Include="PublishSelfContained" Value="$(PublishSelfContained)" />
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreAppForTelemetry.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreAppForTelemetry.cs
index 54bc27a974d3..386aefebfd67 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreAppForTelemetry.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreAppForTelemetry.cs
@@ -22,6 +22,7 @@ private string CreateTargetFrameworkEvalTelemetryJson(
             string artifactsPathLocationType = "null",
             string useMonoRuntime = "null",
             string publishAot = "null",
+            string runAotCompilation = "null",
             string publishTrimmed = "null",
             string publishSelfContained = "null",
             string publishReadyToRun = "null",
@@ -29,7 +30,7 @@ private string CreateTargetFrameworkEvalTelemetryJson(
             string publishProtocol = "null",
             string configuration = "Debug")
         {
-            return $"{{\"EventName\":\"targetframeworkeval\",\"Properties\":{{\"TargetFrameworkVersion\":\"{targetFrameworkVersion}\",\"RuntimeIdentifier\":\"{runtimeIdentifier}\",\"SelfContained\":\"{selfContained}\",\"UseApphost\":\"{useApphost}\",\"OutputType\":\"{outputType}\",\"UseArtifactsOutput\":\"{useArtifactsOutput}\",\"ArtifactsPathLocationType\":\"{artifactsPathLocationType}\",\"TargetPlatformIdentifier\":\"{targetPlatformIdentifier}\",\"UseMonoRuntime\":\"{useMonoRuntime}\",\"PublishAot\":\"{publishAot}\",\"PublishTrimmed\":\"{publishTrimmed}\",\"PublishSelfContained\":\"{publishSelfContained}\",\"PublishReadyToRun\":\"{publishReadyToRun}\",\"PublishReadyToRunComposite\":\"{publishReadyToRunComposite}\",\"PublishProtocol\":\"{publishProtocol}\",\"Configuration\":\"{configuration}\"}}";
+            return $"{{\"EventName\":\"targetframeworkeval\",\"Properties\":{{\"TargetFrameworkVersion\":\"{targetFrameworkVersion}\",\"RuntimeIdentifier\":\"{runtimeIdentifier}\",\"SelfContained\":\"{selfContained}\",\"UseApphost\":\"{useApphost}\",\"OutputType\":\"{outputType}\",\"UseArtifactsOutput\":\"{useArtifactsOutput}\",\"ArtifactsPathLocationType\":\"{artifactsPathLocationType}\",\"TargetPlatformIdentifier\":\"{targetPlatformIdentifier}\",\"UseMonoRuntime\":\"{useMonoRuntime}\",\"RunAOTCompilation\":\"{runAotCompilation}\",\"PublishAot\":\"{publishAot}\",\"PublishTrimmed\":\"{publishTrimmed}\",\"PublishSelfContained\":\"{publishSelfContained}\",\"PublishReadyToRun\":\"{publishReadyToRun}\",\"PublishReadyToRunComposite\":\"{publishReadyToRunComposite}\",\"PublishProtocol\":\"{publishProtocol}\",\"Configuration\":\"{configuration}\"}}";
         }
 
         [CoreMSBuildOnlyFact]

From 2dc4e4cf131b304f42dfce5ff6e01b262ab1f49e Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Mon, 29 Sep 2025 16:54:55 -0500
Subject: [PATCH 2/2] Fix typo in TFTelemetry inclusion for RunAOTCompilation

---
 .../targets/Microsoft.NET.TargetFrameworkInference.targets      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
index 4fa1689bcc2e..8b4af1805aa4 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.TargetFrameworkInference.targets
@@ -149,7 +149,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <TFTelemetry Include="ArtifactsPathLocationType" Value="$(_ArtifactsPathLocationType)" />
       <TFTelemetry Include="TargetPlatformIdentifier" Value="$(TargetPlatformIdentifier)" />
       <TFTelemetry Include="UseMonoRuntime" Value="$(UseMonoRuntime)" />
-      <TFTelemetry Incluse="RunAOTCompilation" Value="$(RunAOTCompilation)" />
+      <TFTelemetry Include="RunAOTCompilation" Value="$(RunAOTCompilation)" />
       <TFTelemetry Include="PublishAot" Value="$(PublishAot)" />
       <TFTelemetry Include="PublishTrimmed" Value="$(PublishTrimmed)" />
       <TFTelemetry Include="PublishSelfContained" Value="$(PublishSelfContained)" />