mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#18822)

Browse source
This commit is contained in:
v-wuzhai 2024-02-29 18:15:35 -08:00 committed by GitHub
commit e9996299ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -243,17 +243,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24127.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24128.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24127.4">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24128.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24127.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24128.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24112.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
@ -263,14 +263,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>c041bcdab75f5447be8bd11ddcfbe8e639f13f32</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24127.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24128.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24127.4">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24128.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>9aa3f2e68b30ac51823dd444e8cb962e058c5699</Sha>
<Sha>7582b5deefe451b6453a7693197df02ef1558d4b</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -44,7 +44,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24127.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24128.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->

2
eng/common/tools.ps1
View file

@ -68,6 +68,8 @@ $ErrorActionPreference = 'Stop'
# True if the build is a product build
[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false }
[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() }
function Create-Directory ([string[]] $path) {
New-Item -Path $path -Force -ItemType 'Directory' | Out-Null
}

2
eng/common/tools.sh
View file

@ -507,7 +507,7 @@ function MSBuild-Core {
# When running on Azure Pipelines, override the returned exit code to avoid double logging.
# Skip this when the build is a child of the VMR orchestrator build.
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && $properties != *"DotNetBuildRepo=true"* ]]; then
if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then
Write-PipelineSetResult -result "Failed" -message "msbuild execution failed."
# Exiting with an exit code causes the azure pipelines task to log yet another "noise" error
# The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24127.4",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24127.4"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24128.1",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24128.1"
}
}