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

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2023-12-12 15:20:34 +00:00 committed by GitHub
parent f5c0cfe173
commit db0e87e4f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 12 deletions

View file

@ -211,18 +211,18 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23611.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha> <Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23607.2"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23611.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha> <Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23607.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23611.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha> <Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -232,9 +232,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha> <Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23607.2"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23611.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha> <Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>

View file

@ -40,7 +40,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23607.2</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

View file

@ -19,6 +19,7 @@ Param(
[switch] $pack, [switch] $pack,
[switch] $publish, [switch] $publish,
[switch] $clean, [switch] $clean,
[switch] $verticalBuild,
[switch][Alias('bl')]$binaryLog, [switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog, [switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci, [switch] $ci,
@ -58,6 +59,7 @@ function Print-Usage() {
Write-Host " -sign Sign build outputs" Write-Host " -sign Sign build outputs"
Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host " -publish Publish artifacts (e.g. symbols)"
Write-Host " -clean Clean the solution" Write-Host " -clean Clean the solution"
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
Write-Host "" Write-Host ""
Write-Host "Advanced settings:" Write-Host "Advanced settings:"
@ -120,6 +122,7 @@ function Build {
/p:Deploy=$deploy ` /p:Deploy=$deploy `
/p:Test=$test ` /p:Test=$test `
/p:Pack=$pack ` /p:Pack=$pack `
/p:ArcadeBuildVertical=$verticalBuild `
/p:IntegrationTest=$integrationTest ` /p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest ` /p:PerformanceTest=$performanceTest `
/p:Sign=$sign ` /p:Sign=$sign `

View file

@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
restore=false restore=false
build=false build=false
source_build=false source_build=false
vertical_build=false
rebuild=false rebuild=false
test=false test=false
integration_test=false integration_test=false
@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do
restore=true restore=true
pack=true pack=true
;; ;;
-verticalbuild|-vb)
build=true
vertical_build=true
restore=true
pack=true
;;
-test|-t) -test|-t)
test=true test=true
;; ;;
@ -220,6 +227,7 @@ function Build {
/p:Restore=$restore \ /p:Restore=$restore \
/p:Build=$build \ /p:Build=$build \
/p:ArcadeBuildFromSource=$source_build \ /p:ArcadeBuildFromSource=$source_build \
/p:ArcadeBuildVertical=$vertical_build \
/p:Rebuild=$rebuild \ /p:Rebuild=$rebuild \
/p:Test=$test \ /p:Test=$test \
/p:Pack=$pack \ /p:Pack=$pack \

View file

@ -827,7 +827,8 @@ function MSBuild-Core() {
} }
} }
$env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs" # Be sure quote the path in case there are spaces in the dotnet installation location.
$env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs"
$exitCode = Exec-Process $buildTool.Path $cmdArgs $exitCode = Exec-Process $buildTool.Path $cmdArgs

View file

@ -11,7 +11,7 @@
"cmake": "3.21.0" "cmake": "3.21.0"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23607.2" "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23611.2"
} }
} }