From 6350dbc81fa059a560873f3d0dc9803ee92c5ad8 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 1 Nov 2022 14:25:39 -0700 Subject: [PATCH 1/3] Fix TSA parameters to be unique to ML.NET --- build/vsts-ci.yml | 25 ++++++++++++++++--------- eng/common-variables.yml | 17 ----------------- 2 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 eng/common-variables.yml diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index f768a11bf7..9fcafeff04 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -12,8 +12,15 @@ resources: - container: UbuntuCrossArm64Container image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-mlnet-cross-arm64 + variables: -- template: /eng/common-variables.yml + BuildConfig: Release + 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 +274,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. - From 007d1293f27031c44f3539f579815551c3ae0981 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 1 Nov 2022 16:27:31 -0700 Subject: [PATCH 2/3] Add _BuildConfig variable used by arcade templates --- build/vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/build/vsts-ci.yml b/build/vsts-ci.yml index 9fcafeff04..1b8c50c324 100644 --- a/build/vsts-ci.yml +++ b/build/vsts-ci.yml @@ -15,6 +15,7 @@ resources: variables: BuildConfig: Release + _BuildConfig: $(BuildConfig) OfficialBuildId: $(BUILD.BUILDNUMBER) DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 From 588bce0a75d86f89e964f01ddd6e23ea68f3afce Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Tue, 1 Nov 2022 16:27:56 -0700 Subject: [PATCH 3/3] Update feed link for nightly builds --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)