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
This commit is contained in:
parent
332b35cafb
commit
6c9eb2e2e2
6 changed files with 86 additions and 20 deletions
|
@ -177,19 +177,19 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22114.7">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22117.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
|
<Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22114.7">
|
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.22117.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
|
<Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
|
||||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22114.7">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22117.2">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>6d977266bcc193caedb60a27ae44d14d9a11a040</Sha>
|
<Sha>49750c02e63d0ad3a77d035bba7498a0b1acd218</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22117.4">
|
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="7.0.0-alpha.1.22117.4">
|
||||||
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
|
||||||
|
@ -201,9 +201,9 @@
|
||||||
<Sha>74708673dfab709fb06668d0d2ed45468cac407e</Sha>
|
<Sha>74708673dfab709fb06668d0d2ed45468cac407e</Sha>
|
||||||
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
<SourceBuild RepoName="sourcelink" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22112.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.22115.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||||
<Sha>8c4adafa2213c117e4486165f26a733444eb3cb2</Sha>
|
<Sha>6189370739dc6806708c290c48baa324c90598a2</Sha>
|
||||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22114.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.22117.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
47
eng/common/retain-build.ps1
Normal file
47
eng/common/retain-build.ps1
Normal file
|
@ -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
|
|
@ -8,10 +8,6 @@ parameters:
|
||||||
# Optional: Enable publishing using release pipelines
|
# Optional: Enable publishing using release pipelines
|
||||||
enablePublishUsingPipelines: false
|
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
|
# Optional: Enable running the source-build jobs to build repo from source
|
||||||
enableSourceBuild: false
|
enableSourceBuild: false
|
||||||
|
|
||||||
|
@ -41,11 +37,6 @@ parameters:
|
||||||
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
|
# 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.
|
# 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:
|
jobs:
|
||||||
- ${{ each job in parameters.jobs }}:
|
- ${{ each job in parameters.jobs }}:
|
||||||
- template: ../job/job.yml
|
- template: ../job/job.yml
|
||||||
|
|
28
eng/common/templates/steps/retain-build.yml
Normal file
28
eng/common/templates/steps/retain-build.yml
Normal file
|
@ -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/<organization> 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)
|
|
@ -11,7 +11,7 @@
|
||||||
"cmake": "3.16.4"
|
"cmake": "3.16.4"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.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.22114.7"
|
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.22117.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue