Skip to content

Commit 3551afc

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20231211.2 (#5378)
[main] Update dependencies from dotnet/arcade
1 parent dec4850 commit 3551afc

File tree

6 files changed

+22
-10
lines changed

6 files changed

+22
-10
lines changed

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23607.2">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23611.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
9+
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23607.2">
11+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23611.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
13+
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23607.2">
15+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23611.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>3faeb9817f465151aa4bbcdb315f0a6170206760</Sha>
17+
<Sha>0a0217fe0cdd3654105d1c46be4e43eeae9c163e</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</PropertyGroup>
1919
<!-- Arcade dependencies -->
2020
<PropertyGroup>
21-
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23607.2</MicrosoftDotNetGenFacadesPackageVersion>
22-
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23607.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
21+
<MicrosoftDotNetGenFacadesPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetGenFacadesPackageVersion>
22+
<MicrosoftDotNetXUnitExtensionsPackageVersion>9.0.0-beta.23611.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
2323
</PropertyGroup>
2424
<!-- CoreFx dependencies -->
2525
<PropertyGroup>

eng/common/build.ps1

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Param(
1919
[switch] $pack,
2020
[switch] $publish,
2121
[switch] $clean,
22+
[switch] $verticalBuild,
2223
[switch][Alias('bl')]$binaryLog,
2324
[switch][Alias('nobl')]$excludeCIBinarylog,
2425
[switch] $ci,
@@ -58,6 +59,7 @@ function Print-Usage() {
5859
Write-Host " -sign Sign build outputs"
5960
Write-Host " -publish Publish artifacts (e.g. symbols)"
6061
Write-Host " -clean Clean the solution"
62+
Write-Host " -verticalBuild Run in 'vertical build' infra mode."
6163
Write-Host ""
6264

6365
Write-Host "Advanced settings:"
@@ -120,6 +122,7 @@ function Build {
120122
/p:Deploy=$deploy `
121123
/p:Test=$test `
122124
/p:Pack=$pack `
125+
/p:ArcadeBuildVertical=$verticalBuild `
123126
/p:IntegrationTest=$integrationTest `
124127
/p:PerformanceTest=$performanceTest `
125128
/p:Sign=$sign `

eng/common/build.sh

+8
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
5959
restore=false
6060
build=false
6161
source_build=false
62+
vertical_build=false
6263
rebuild=false
6364
test=false
6465
integration_test=false
@@ -129,6 +130,12 @@ while [[ $# > 0 ]]; do
129130
restore=true
130131
pack=true
131132
;;
133+
-verticalbuild|-vb)
134+
build=true
135+
vertical_build=true
136+
restore=true
137+
pack=true
138+
;;
132139
-test|-t)
133140
test=true
134141
;;
@@ -220,6 +227,7 @@ function Build {
220227
/p:Restore=$restore \
221228
/p:Build=$build \
222229
/p:ArcadeBuildFromSource=$source_build \
230+
/p:ArcadeBuildVertical=$vertical_build \
223231
/p:Rebuild=$rebuild \
224232
/p:Test=$test \
225233
/p:Pack=$pack \

eng/common/tools.ps1

+2-1
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,8 @@ function MSBuild-Core() {
827827
}
828828
}
829829

830-
$env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs"
830+
# Be sure quote the path in case there are spaces in the dotnet installation location.
831+
$env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs"
831832

832833
$exitCode = Exec-Process $buildTool.Path $cmdArgs
833834

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "8.0.100"
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23607.2",
17+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23611.2",
1818
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
1919
}
2020
}

0 commit comments

Comments
 (0)