From 6c9eb2e2e2a5f424ca33f15dcdc1efddbb91b848 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 19 Feb 2022 13:25:02 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20220217.2 Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 7.0.0-beta.22114.7 -> To Version 7.0.0-beta.22117.2 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.22112.1 -> To Version 1.0.0-beta.22115.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 47 +++++++++++++++++++++ eng/common/templates/jobs/jobs.yml | 9 ---- eng/common/templates/steps/retain-build.yml | 28 ++++++++++++ global.json | 4 +- 6 files changed, 86 insertions(+), 20 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f680019f..e9ca5db45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,19 +177,19 @@ - + https://github.com/dotnet/arcade - 6d977266bcc193caedb60a27ae44d14d9a11a040 + 49750c02e63d0ad3a77d035bba7498a0b1acd218 - + https://github.com/dotnet/arcade - 6d977266bcc193caedb60a27ae44d14d9a11a040 + 49750c02e63d0ad3a77d035bba7498a0b1acd218 - + https://github.com/dotnet/arcade - 6d977266bcc193caedb60a27ae44d14d9a11a040 + 49750c02e63d0ad3a77d035bba7498a0b1acd218 https://github.com/dotnet/source-build-reference-packages @@ -201,9 +201,9 @@ 74708673dfab709fb06668d0d2ed45468cac407e - + https://github.com/dotnet/xliff-tasks - 8c4adafa2213c117e4486165f26a733444eb3cb2 + 6189370739dc6806708c290c48baa324c90598a2 diff --git a/eng/Versions.props b/eng/Versions.props index 162a8cc17..dee921eba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ - 7.0.0-beta.22114.7 + 7.0.0-beta.22117.2 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e08fc227b --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,47 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 +. $PSScriptRoot\tools.ps1 + + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-PipelineTelemetryError -Category "Build" -Message "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + ExitWithExitCode 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +ExitWithExitCode 0 diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 697633086..554e71cfc 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,10 +8,6 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false - # Optional: Disable component governance detection. In general, component governance - # should be on for all jobs. Use only in the event of issues. - disableComponentGovernance: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false @@ -41,11 +37,6 @@ parameters: # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. -# Sbom related params - enableSbom: true - PackageVersion: 7.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' - jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 1d8aa430d..87240b7d3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22114.7", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22114.7" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22117.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22117.2" } }