From 43bdfe34ed6f0e874c4862c46f4bcf27f1d17a4b Mon Sep 17 00:00:00 2001
From: frank-dong-ms <55860649+frank-dong-ms@users.noreply.github.com>
Date: Wed, 19 Feb 2020 14:14:12 -0800
Subject: [PATCH] fix nightly-build, centos is building with netcore3.0 not
 netcore2.1, add targetFramework parameter

---
 .vsts-dotnet-ci.yml       | 6 ++++++
 build/ci/job-template.yml | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml
index e692d111cf..f25841be87 100644
--- a/.vsts-dotnet-ci.yml
+++ b/.vsts-dotnet-ci.yml
@@ -21,10 +21,12 @@ jobs:
         _configuration: Debug-netcoreapp3_0
         _config_short: DI
         _includeBenchmarkData: false
+        _targetFramework: netcoreapp3.0
       Release_Build:
         _configuration: Release-netcoreapp3_0
         _config_short: RI
         _includeBenchmarkData: true
+        _targetFramework: netcoreapp3.0
     innerLoop: true
     pool:
       name: Hosted Ubuntu 1604
@@ -55,10 +57,12 @@ jobs:
         _configuration: Debug-netcoreapp3_0
         _config_short: DI
         _includeBenchmarkData: false
+        _targetFramework: netcoreapp3.0
       Release_Build:
         _configuration: Release-netcoreapp3_0
         _config_short: RI
         _includeBenchmarkData: true
+        _targetFramework: netcoreapp3.0
     innerLoop: true
     pool:
       name: Hosted VS2017
@@ -80,10 +84,12 @@ jobs:
         _configuration: Debug-netfx
         _config_short: DFX
         _includeBenchmarkData: false
+        _targetFramework: win-x64
       Release_Build:
         _configuration: Release-netfx
         _config_short: RFX
         _includeBenchmarkData: false
+        _targetFramework: win-x64
     innerLoop: true
     pool:
       name: Hosted VS2017
diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml
index dc4f6499ed..6a95bac108 100644
--- a/build/ci/job-template.yml
+++ b/build/ci/job-template.yml
@@ -23,7 +23,7 @@ jobs:
       dotnetPath: $(Build.SourcesDirectory)/Tools/dotnetcli/dotnet
       nugetFeed: https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json
       nightlyBuildProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NightlyBuild.Tests/Microsoft.ML.NightlyBuild.Tests.csproj
-      nightlyBuildRunPath: (Build.SourcesDirectory)/bin/AnyCPU.(_configuration)/Microsoft.ML.NightlyBuild.Tests/netcoreapp2.1
+      nightlyBuildRunPath: (Build.SourcesDirectory)/bin/AnyCPU.(_configuration)/Microsoft.ML.NightlyBuild.Tests/(_targetFramework)
       packageUpdaterProjPath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/Microsoft.ML.NugetPackageVersionUpdater.csproj
       versionFilePath: $(Build.SourcesDirectory)/test/Microsoft.ML.NugetPackageVersionUpdater/latest_versions.txt
     strategy:
@@ -33,10 +33,12 @@ jobs:
             _configuration: Debug
             _config_short: D
             _includeBenchmarkData: false
+            _targetFramework: netcoreapp2.1
           Release_Build:
             _configuration: Release
             _config_short: R
             _includeBenchmarkData: true
+            _targetFramework: netcoreapp2.1
         ${{ if ne(parameters.customMatrixes, '') }}:
           ${{ insert }}: ${{ parameters.customMatrixes }}