зеркало из https://github.com/dotnet/winforms.git
[release/8.0-rc1] Update dependencies from dotnet/arcade (#9736)
[release/8.0-rc1] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
1ef1737b9a
Коммит
52b2ba7dfd
|
|
@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
|
|||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<!-- Arcade -->
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</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.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23411.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23415.4">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>9b2af35a6702526dc8a7c5fcadcc44efd0dca170</Sha>
|
||||
<Sha>46ff142f43e887d5f9a4d87ef39d72166f61db8d</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@
|
|||
</PropertyGroup>
|
||||
<!-- Arcade -->
|
||||
<PropertyGroup>
|
||||
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetGenFacadesPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23411.1</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23411.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
|
||||
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetGenFacadesPackageVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.23415.4</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.23415.4</MicrosoftDotNetXUnitExtensionsPackageVersion>
|
||||
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
|
||||
</PropertyGroup>
|
||||
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ if ($dotnet31Source -ne $null) {
|
|||
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
|
||||
}
|
||||
|
||||
$dotnetVersions = @('5','6','7')
|
||||
$dotnetVersions = @('5','6','7','8')
|
||||
|
||||
foreach ($dotnetVersion in $dotnetVersions) {
|
||||
$feedPrefix = "dotnet" + $dotnetVersion;
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ if [ "$?" == "0" ]; then
|
|||
PackageSources+=('dotnet3.1-internal-transport')
|
||||
fi
|
||||
|
||||
DotNetVersions=('5' '6' '7')
|
||||
DotNetVersions=('5' '6' '7' '8')
|
||||
|
||||
for DotNetVersion in ${DotNetVersions[@]} ; do
|
||||
FeedPrefix="dotnet${DotNetVersion}";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -14,9 +14,9 @@
|
|||
"version": "8.0.100-preview.7.23376.3"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23411.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23411.1",
|
||||
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23411.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23415.4",
|
||||
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23415.4",
|
||||
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23415.4",
|
||||
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
|
||||
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23414.1"
|
||||
},
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче