From c17e7917f20ffea18df389f14f7c9f14b01e99ab Mon Sep 17 00:00:00 2001
From: Frank Dong <frdong@microsoft.com>
Date: Thu, 10 Dec 2020 00:48:53 +0000
Subject: [PATCH 1/3] add back test result upload and add missing test project
 from running

---
 build/ci/job-template.yml                              | 10 ++++++++++
 .../Microsoft.ML.OnnxTransformerTest.csproj            |  4 ++++
 .../Microsoft.ML.TestFramework.csproj                  |  4 ++++
 3 files changed, 18 insertions(+)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index f4e0bcd57a..da1ad72c1d 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -148,6 +148,16 @@ jobs:
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io
       condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
+	  - task: PublishTestResults@2
+      displayName: Publish Test Results
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: 'xUnit'
+        searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
+        testResultsFiles: '**/*.xml'
+        testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
+        configuration: $(_configuration)
+        mergeTestResults: true
     - task: CopyFiles@2
       displayName: Stage build logs
       condition: not(succeeded())
diff --git a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
index d7c904ab67..dd5706eafa 100644
--- a/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
+++ b/test/Microsoft.ML.OnnxTransformerTest/Microsoft.ML.OnnxTransformerTest.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsUnitTestProject>true</IsUnitTestProject>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj" />
diff --git a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
index c96155f76d..d9b057e907 100644
--- a/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
+++ b/test/Microsoft.ML.TestFramework/Microsoft.ML.TestFramework.csproj
@@ -1,4 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <IsUnitTestProject>true</IsUnitTestProject>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.ML.Core\Microsoft.ML.Core.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.ML.Data\Microsoft.ML.Data.csproj" />

From e6ff728069ecb2d896e41851417fa931c4189350 Mon Sep 17 00:00:00 2001
From: Frank Dong <frdong@microsoft.com>
Date: Thu, 10 Dec 2020 00:52:52 +0000
Subject: [PATCH 2/3] fix identification

---
 build/ci/job-template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index da1ad72c1d..120fb747be 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -148,7 +148,7 @@ jobs:
     - script: $(dotnetPath) msbuild -restore build/Codecoverage.proj
       displayName: Upload coverage to codecov.io
       condition: and(succeeded(), eq(${{ parameters.codeCoverage }}, True))
-	  - task: PublishTestResults@2
+    - task: PublishTestResults@2
       displayName: Publish Test Results
       condition: succeededOrFailed()
       inputs:

From 7f655558f00fb61899117621201bac008865e86d Mon Sep 17 00:00:00 2001
From: Frank Dong <frdong@microsoft.com>
Date: Thu, 10 Dec 2020 02:19:48 +0000
Subject: [PATCH 3/3] filter out performance test result files to avoid
 warnings

---
 build/ci/job-template.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index 120fb747be..3dd53bf2ef 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -154,7 +154,12 @@ jobs:
       inputs:
         testRunner: 'xUnit'
         searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults'
-        testResultsFiles: '**/*.xml'
+        # Upload all test results except performance test project. On CI by default performance tests
+        # will not run and test result files will still be generate without details. Avoid uploading 
+        # performance test result to avoid warnings on publish test result stage.
+        testResultsFiles: |
+          **/*.xml
+          !**/*PerformanceTests*.xml
         testRunTitle: Machinelearning_Tests_${{ parameters.name }}_$(_configuration)_$(Build.BuildNumber)
         configuration: $(_configuration)
         mergeTestResults: true