From 3551afc867c3e18766ee0a403a36d521c99b48d5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 12 Dec 2023 13:42:04 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20231211.2 (#5378)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 4 ++--
eng/common/build.ps1 | 3 +++
eng/common/build.sh | 8 ++++++++
eng/common/tools.ps1 | 3 ++-
global.json | 2 +-
6 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a3f4d4ed57..97e8f15fe08 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,17 +4,17 @@
-
+
https://github.com/dotnet/arcade
- 3faeb9817f465151aa4bbcdb315f0a6170206760
+ 0a0217fe0cdd3654105d1c46be4e43eeae9c163e
-
+
https://github.com/dotnet/arcade
- 3faeb9817f465151aa4bbcdb315f0a6170206760
+ 0a0217fe0cdd3654105d1c46be4e43eeae9c163e
-
+
https://github.com/dotnet/arcade
- 3faeb9817f465151aa4bbcdb315f0a6170206760
+ 0a0217fe0cdd3654105d1c46be4e43eeae9c163e
diff --git a/eng/Versions.props b/eng/Versions.props
index 5509392c460..4ae5a300f10 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,8 +18,8 @@
- 9.0.0-beta.23607.2
- 9.0.0-beta.23607.2
+ 9.0.0-beta.23611.2
+ 9.0.0-beta.23611.2
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 33a6f2d0e24..066044f62f2 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -19,6 +19,7 @@ Param(
[switch] $pack,
[switch] $publish,
[switch] $clean,
+ [switch] $verticalBuild,
[switch][Alias('bl')]$binaryLog,
[switch][Alias('nobl')]$excludeCIBinarylog,
[switch] $ci,
@@ -58,6 +59,7 @@ function Print-Usage() {
Write-Host " -sign Sign build outputs"
Write-Host " -publish Publish artifacts (e.g. symbols)"
Write-Host " -clean Clean the solution"
+ Write-Host " -verticalBuild Run in 'vertical build' infra mode."
Write-Host ""
Write-Host "Advanced settings:"
@@ -120,6 +122,7 @@ function Build {
/p:Deploy=$deploy `
/p:Test=$test `
/p:Pack=$pack `
+ /p:ArcadeBuildVertical=$verticalBuild `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
/p:Sign=$sign `
diff --git a/eng/common/build.sh b/eng/common/build.sh
index 2c17ba529b9..5ce01dd161a 100755
--- a/eng/common/build.sh
+++ b/eng/common/build.sh
@@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
restore=false
build=false
source_build=false
+vertical_build=false
rebuild=false
test=false
integration_test=false
@@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do
restore=true
pack=true
;;
+ -verticalbuild|-vb)
+ build=true
+ vertical_build=true
+ restore=true
+ pack=true
+ ;;
-test|-t)
test=true
;;
@@ -220,6 +227,7 @@ function Build {
/p:Restore=$restore \
/p:Build=$build \
/p:ArcadeBuildFromSource=$source_build \
+ /p:ArcadeBuildVertical=$vertical_build \
/p:Rebuild=$rebuild \
/p:Test=$test \
/p:Pack=$pack \
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index e8def7e6a85..162dee2b936 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -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
diff --git a/global.json b/global.json
index 0af1ef24b6d..837033a8b1d 100644
--- a/global.json
+++ b/global.json
@@ -14,7 +14,7 @@
"version": "8.0.100"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
}
}