From e838ebbb4c75cc5bc65b240068e01b625224313c Mon Sep 17 00:00:00 2001
From: Peter Waldschmidt <pewaldsc@microsoft.com>
Date: Fri, 14 Feb 2025 17:09:39 -0500
Subject: [PATCH 1/3] Pre-Build TypeScript packages before build.

---
 eng/pipelines/templates/BuildAndTest.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index 81a9ee5d2a4..c8ce485eab0 100644
--- a/eng/pipelines/templates/BuildAndTest.yml
+++ b/eng/pipelines/templates/BuildAndTest.yml
@@ -43,6 +43,13 @@ steps:
             /bl:${{ parameters.repoLogPath }}/restore2.binlog
     displayName: Restore solution
 
+  - pwsh: |
+        cd $(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript
+        npm install
+        node html-report/reset-devdata.js
+        npm run build
+    displayName: Pre-Build TypeScript Bundle
+
   - script: ${{ parameters.buildScript }}
             -build
             -configuration ${{ parameters.buildConfig }}
@@ -108,6 +115,7 @@ steps:
               -publish $(_PublishArgs)
               -configuration ${{ parameters.buildConfig }}
               /bl:${{ parameters.repoLogPath }}/transport.binlog
+              /p:EnableEvaluationReportBuild=true
               $(_OfficialBuildIdArgs)
       displayName: Build and publish docs transport package
 
@@ -119,5 +127,6 @@ steps:
               -warnAsError 1
               /bl:${{ parameters.repoLogPath }}/pack.binlog
               /p:Restore=false /p:Build=false
+              /p:EnableEvaluationReportBuild=true
               $(_OfficialBuildIdArgs)
       displayName: Pack, sign, and publish

From 565fcdc32fb3a4a2305762145fdb0d1be30cfccd Mon Sep 17 00:00:00 2001
From: Peter Waldschmidt <pewaldsc@microsoft.com>
Date: Fri, 14 Feb 2025 17:30:51 -0500
Subject: [PATCH 2/3] Feedback updates.

---
 eng/pipelines/templates/BuildAndTest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index c8ce485eab0..d7da06061b1 100644
--- a/eng/pipelines/templates/BuildAndTest.yml
+++ b/eng/pipelines/templates/BuildAndTest.yml
@@ -43,6 +43,7 @@ steps:
             /bl:${{ parameters.repoLogPath }}/restore2.binlog
     displayName: Restore solution
 
+  # Temporarily pre-build the TypeScript byndle as a workaround for build failures in the MSBuild targets
   - pwsh: |
         cd $(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript
         npm install
@@ -115,7 +116,6 @@ steps:
               -publish $(_PublishArgs)
               -configuration ${{ parameters.buildConfig }}
               /bl:${{ parameters.repoLogPath }}/transport.binlog
-              /p:EnableEvaluationReportBuild=true
               $(_OfficialBuildIdArgs)
       displayName: Build and publish docs transport package
 

From 31dc56aa786dbe61eb9e829dd270981b218c92d0 Mon Sep 17 00:00:00 2001
From: Peter Waldschmidt <pewaldsc@microsoft.com>
Date: Fri, 14 Feb 2025 17:32:02 -0500
Subject: [PATCH 3/3] Spelling

---
 eng/pipelines/templates/BuildAndTest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
index d7da06061b1..3f91c2d24f5 100644
--- a/eng/pipelines/templates/BuildAndTest.yml
+++ b/eng/pipelines/templates/BuildAndTest.yml
@@ -43,7 +43,7 @@ steps:
             /bl:${{ parameters.repoLogPath }}/restore2.binlog
     displayName: Restore solution
 
-  # Temporarily pre-build the TypeScript byndle as a workaround for build failures in the MSBuild targets
+  # Temporarily pre-build the TypeScript bundle as a workaround to make the build more reliable.
   - pwsh: |
         cd $(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript
         npm install