From 41036a2fa159b49aacef036f79b30b36a1eb8013 Mon Sep 17 00:00:00 2001
From: Frank Dong <frdong@microsoft.com>
Date: Fri, 4 Dec 2020 22:39:15 +0000
Subject: [PATCH] fix benchmark test timeout issue

---
 .../Harness/Configs.cs                           | 15 ++++++++++-----
 .../Microsoft.ML.PerformanceTests.csproj         | 16 ----------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/test/Microsoft.ML.PerformanceTests/Harness/Configs.cs b/test/Microsoft.ML.PerformanceTests/Harness/Configs.cs
index 07aaee258a..2893956bef 100644
--- a/test/Microsoft.ML.PerformanceTests/Harness/Configs.cs
+++ b/test/Microsoft.ML.PerformanceTests/Harness/Configs.cs
@@ -39,14 +39,19 @@ protected virtual Job GetJobDefinition()
         /// </summary>
         private IToolchain CreateToolchain()
         {
+            TimeSpan timeout = TimeSpan.FromMinutes(5);
+
 #if NETFRAMEWORK
             var tfm = "net461";
-            var csProj = CsProjClassicNetToolchain.Net461;
+            var csProj = CsProjClassicNetToolchain.From(tfm, timeout: timeout);
 #else
-            var tfm = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null ?
-                NetCoreAppSettings.NetCoreApp21.TargetFrameworkMoniker : NetCoreAppSettings.NetCoreApp31.TargetFrameworkMoniker;
-            var csProj = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null ?
-                CsProjCoreToolchain.NetCoreApp21 : CsProjCoreToolchain.NetCoreApp31;
+            var settings = AppDomain.CurrentDomain.GetData("FX_PRODUCT_VERSION") == null
+                ? NetCoreAppSettings.NetCoreApp21 : NetCoreAppSettings.NetCoreApp31;
+
+            settings = settings.WithTimeout(timeout);
+
+            var tfm = settings.TargetFrameworkMoniker;
+            var csProj = CsProjCoreToolchain.From(settings);
 #endif
             return new Toolchain(
                 tfm,
diff --git a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
index 217d61ed05..c295cb68c9 100644
--- a/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
+++ b/test/Microsoft.ML.PerformanceTests/Microsoft.ML.PerformanceTests.csproj
@@ -32,20 +32,4 @@
     <NativeAssemblyReference Include="MklImports" />
     <NativeAssemblyReference Condition="'$(OS)' == 'Windows_NT'" Include="libiomp5md" />
   </ItemGroup>
-  <ItemGroup>
-    <MetaFile Update="@(MetaFile)">
-      <Url>https://aka.ms/mlnet-resources/meta/%(Identity)</Url>
-      <DestinationFile>$([System.IO.Path]::GetTempPath())/MLNET/</DestinationFile>
-    </MetaFile>
-    <TensorflowMetaFile Include="@(MetaFile->'$([System.IO.Path]::GetTempPath())/MLNET/%(Identity)')" />
-  </ItemGroup>
-  <Target Name="DownloadTensorflowMetaFiles" Inputs="@(TensorflowMetaFile)" Outputs="%(TensorflowMetaFile.DestinationFile)">
-    <Message Importance="High" Text="Downloading tensorflow meta files... %(TensorflowMetaFile.DestinationFile)" />
-    <DownloadFile
-            SourceUrl="%(MetaFile.Url)"
-            DestinationFolder="$([System.IO.Path]::GetTempPath())/MLNET/"
-            Retries="5"
-            SkipUnchangedFiles="true">
-    </DownloadFile>
-  </Target>
 </Project>