From 1a83389bbd9c2f3ae27de30d10209ca9321adb7d Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Wed, 2 Nov 2022 08:53:21 -0700
Subject: [PATCH] Updates to official build pipeline (#6423)

* Fix TSA parameters to be unique to ML.NET

* Add _BuildConfig variable used by arcade templates

* Update feed link for nightly builds
---
 README.md                |  2 +-
 build/vsts-ci.yml        | 26 +++++++++++++++++---------
 eng/common-variables.yml | 17 -----------------
 3 files changed, 18 insertions(+), 27 deletions(-)
 delete mode 100644 eng/common-variables.yml

diff --git a/README.md b/README.md
index e71f0dd231..b2dd1b7a1c 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Alternatively, you can add the Microsoft.ML package from within Visual Studio's
 
 Daily NuGet builds of the project are also available in our Azure DevOps feed:
 
-> [https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json](https://pkgs.dev.azure.com/dnceng/public/_packaging/MachineLearning/nuget/v3/index.json)
+> [https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json](https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json)
 
 ## Building ML.NET (For contributors building ML.NET open source code)
 
diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml
index c6b4f4005b..4b82489e6e 100644
--- a/build/vsts-ci.yml
+++ b/build/vsts-ci.yml
@@ -12,8 +12,16 @@ resources:
 
   - container: UbuntuCrossArm64Container
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm64
+
 variables:
-- template: /eng/common-variables.yml
+  BuildConfig: Release
+  _BuildConfig: $(BuildConfig)
+  OfficialBuildId: $(BUILD.BUILDNUMBER)
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
+  DOTNET_MULTILEVEL_LOOKUP: 0
+  Codeql.Enabled: true
+  Codeql.SkipTaskAutoInjection: True  #default to not inject CodeQL tasks, we'll enable it in a single job.
   
 stages:
 - stage: build
@@ -267,12 +275,12 @@ stages:
       publishGdn: true
       continueOnError: false
       params: ' -SourceToolsList @("policheck","credscan")
-      -TsaInstanceURL $(_TsaInstanceURL)
-      -TsaProjectName $(_TsaProjectName)
-      -TsaNotificationEmail $(_TsaNotificationEmail)
-      -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
-      -TsaBugAreaPath $(_TsaBugAreaPath)
-      -TsaIterationPath $(_TsaIterationPath)
-      -TsaRepositoryName "machinelearning"
-      -TsaCodebaseName "machinelearning"
+      -TsaInstanceURL https://devdiv.visualstudio.com/
+      -TsaProjectName DEVDIV
+      -TsaNotificationEmail mlnetcore@microsoft.com
+      -TsaCodebaseAdmin REDMOND\ericstj
+      -TsaBugAreaPath "DevDiv\Net Libraries"
+      -TsaIterationPath DevDiv
+      -TsaRepositoryName machinelearning
+      -TsaCodebaseName machinelearning
       -TsaPublish $True'
\ No newline at end of file
diff --git a/eng/common-variables.yml b/eng/common-variables.yml
deleted file mode 100644
index 230de17298..0000000000
--- a/eng/common-variables.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-variables:
-- group: SDL_Settings
-- name: BuildConfig
-  value: Release
-- name: OfficialBuildId
-  value: $(BUILD.BUILDNUMBER)
-- name: DOTNET_CLI_TELEMETRY_OPTOUT
-  value: 1
-- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
-  value: 1
-- name: DOTNET_MULTILEVEL_LOOKUP
-  value: 0
-- name: Codeql.Enabled
-  value: true
-- name: Codeql.SkipTaskAutoInjection
-  value: True  #default to not inject CodeQL tasks, we'll enable it in a single job.
-