[main] Update dependencies from dotnet/arcade (#17190)
[main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.23408.1 to 1.0.0-beta.23412.1 (parent: Microsoft.DotNet.Arcade.Sdk)
This commit is contained in:
dotnet-maestro[bot]
GitHub
parent
18fe2525ea
commit
6c4bb80a8e
6 changed files with 93 additions and 16 deletions
|
|
@ -206,18 +206,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23414.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.23414.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23414.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>d3b8861e20aaf0179034c6076d156e2442b26f9b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23374.1">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
|
@ -236,9 +236,9 @@
|
|||
<Sha>45f5554ac6813e1e155c47fd80ec146c684f65e8</Sha>
|
||||
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23408.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23412.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
|
||||
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
|
||||
<Sha>493329204079519072f0241ed26f692bdee0d60c</Sha>
|
||||
<Sha>676974258e23c108cd6cb6fff97f5c3b5796693b</Sha>
|
||||
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.23414.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
|
|||
|
|
@ -79,7 +79,6 @@ getNonPortableDistroRid()
|
|||
# Input:
|
||||
# os: (str)
|
||||
# arch: (str)
|
||||
# isPortable: (int)
|
||||
# rootfsDir?: (nullable:string)
|
||||
#
|
||||
# Return:
|
||||
|
|
@ -97,10 +96,9 @@ initDistroRidGlobal()
|
|||
{
|
||||
local targetOs="$1"
|
||||
local targetArch="$2"
|
||||
local isPortable="$3"
|
||||
local rootfsDir=""
|
||||
if [ "$#" -ge 4 ]; then
|
||||
rootfsDir="$4"
|
||||
if [ "$#" -ge 3 ]; then
|
||||
rootfsDir="$3"
|
||||
fi
|
||||
|
||||
if [ -n "${rootfsDir}" ]; then
|
||||
|
|
|
|||
75
eng/common/sdl/trim-assets-version.ps1
Normal file
75
eng/common/sdl/trim-assets-version.ps1
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
<#
|
||||
.SYNOPSIS
|
||||
Install and run the 'Microsoft.DotNet.VersionTools.Cli' tool with the 'trim-artifacts-version' command to trim the version from the NuGet assets file name.
|
||||
|
||||
.PARAMETER InputPath
|
||||
Full path to directory where artifact packages are stored
|
||||
|
||||
.PARAMETER Recursive
|
||||
Search for NuGet packages recursively
|
||||
|
||||
#>
|
||||
|
||||
Param(
|
||||
[string] $InputPath,
|
||||
[bool] $Recursive = $true
|
||||
)
|
||||
|
||||
$CliToolName = "Microsoft.DotNet.VersionTools.Cli"
|
||||
|
||||
function Install-VersionTools-Cli {
|
||||
param(
|
||||
[Parameter(Mandatory=$true)][string]$Version
|
||||
)
|
||||
|
||||
Write-Host "Installing the package '$CliToolName' with a version of '$version' ..."
|
||||
$feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
|
||||
|
||||
$argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version")
|
||||
Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait
|
||||
}
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
if (!(Test-Path $InputPath)) {
|
||||
Write-Host "Input Path '$InputPath' does not exist"
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Set-StrictMode -Version 2.0
|
||||
|
||||
$disableConfigureToolsetImport = $true
|
||||
$global:LASTEXITCODE = 0
|
||||
|
||||
# `tools.ps1` checks $ci to perform some actions. Since the SDL
|
||||
# scripts don't necessarily execute in the same agent that run the
|
||||
# build.ps1/sh script this variable isn't automatically set.
|
||||
$ci = $true
|
||||
. $PSScriptRoot\..\tools.ps1
|
||||
|
||||
try {
|
||||
$dotnetRoot = InitializeDotNetCli -install:$true
|
||||
$dotnet = "$dotnetRoot\dotnet.exe"
|
||||
|
||||
$toolsetVersion = Read-ArcadeSdkVersion
|
||||
Install-VersionTools-Cli -Version $toolsetVersion
|
||||
|
||||
$cliToolFound = (& "$dotnet" tool list --local | Where-Object {$_.Split(' ')[0] -eq $CliToolName})
|
||||
if ($null -eq $cliToolFound) {
|
||||
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message "The '$CliToolName' tool is not installed."
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
|
||||
Exec-BlockVerbosely {
|
||||
& "$dotnet" $CliToolName trim-assets-version `
|
||||
--assets-path $InputPath `
|
||||
--recursive $Recursive
|
||||
Exit-IfNZEC "Sdl"
|
||||
}
|
||||
}
|
||||
catch {
|
||||
Write-Host $_
|
||||
Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_
|
||||
ExitWithExitCode 1
|
||||
}
|
||||
|
|
@ -671,6 +671,10 @@ function InitializeNativeTools() {
|
|||
}
|
||||
}
|
||||
|
||||
function Read-ArcadeSdkVersion() {
|
||||
return $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
|
||||
}
|
||||
|
||||
function InitializeToolset() {
|
||||
if (Test-Path variable:global:_ToolsetBuildProj) {
|
||||
return $global:_ToolsetBuildProj
|
||||
|
|
@ -678,7 +682,7 @@ function InitializeToolset() {
|
|||
|
||||
$nugetCache = GetNuGetPackageCachePath
|
||||
|
||||
$toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk'
|
||||
$toolsetVersion = Read-ArcadeSdkVersion
|
||||
$toolsetLocationFile = Join-Path $ToolsetDir "$toolsetVersion.txt"
|
||||
|
||||
if (Test-Path $toolsetLocationFile) {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23411.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23414.5",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23414.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue