Skip to content

Commit 90767c7

Browse files
[main] Source code updates from dotnet/dotnet (#20252)
* Backflow from https://github.com/dotnet/dotnet / 7cdb217 build 326717 Diff: https://github.com/dotnet/dotnet/compare/7fb8cef14d9ae6bd729b04638f88d00f1ba7eb99..7cdb217445905f3342bbb0266a4497b9a014389a From: dotnet/dotnet@7fb8cef To: dotnet/dotnet@7cdb217 [[ commit created by automation ]] * Update dependencies from build 326717 No dependency updates to commit [[ commit created by automation ]] --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 6999595 commit 90767c7

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

eng/Build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ param (
4545
[switch]$procdump,
4646
[switch]$deployExtensions,
4747
[switch]$prepareMachine,
48+
[bool][Alias('mt')]$msbuildMultiThreaded = $false,
49+
[bool]$nodeReuse = $false,
4850
[switch]$useGlobalNuGetCache = $true,
4951
[switch]$dontUseGlobalNuGetCache = $false,
5052
[switch]$warnAsError = $true,
@@ -78,6 +80,7 @@ param (
7880

7981
Set-StrictMode -version 2.0
8082
$ErrorActionPreference = "Stop"
83+
8184
$BuildCategory = ""
8285
$BuildMessage = ""
8386

@@ -140,6 +143,8 @@ function Print-Usage() {
140143
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
141144
Write-Host " -procdump Monitor test runs with procdump"
142145
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
146+
Write-Host " -msbuildMultiThreaded <value> Sets MSBuild's multi-threaded mode, i.e. the -mt switch ('1' or '0') (short: -mt)"
147+
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('1' or '0')"
143148
Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache"
144149
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
145150
Write-Host " -productBuild Build the repository in product-build mode."

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7fb8cef14d9ae6bd729b04638f88d00f1ba7eb99" BarId="326361" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7cdb217445905f3342bbb0266a4497b9a014389a" BarId="326717" />
44
<ProductDependencies>
55
<!-- Pinned at 18.10.0-1.26370.18: the 18.10.0-1.26371.x MSBuild builds dropped their net10.0
66
assets (they ship net11.0 + net472 only), which is incompatible with this repo's net10.0

eng/build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ usage()
3434
echo " --skipAnalyzers Do not run analyzers during build operations"
3535
echo " --skipBuild Do not run the build"
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
37+
echo " --msbuildMultiThreaded <value> Sets MSBuild's multi-threaded mode, i.e. the -mt switch ('true' or 'false') (short: --mt)"
38+
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3739
echo " --sourceBuild Build the repository in source-only mode."
3840
echo " --productBuild Build the repository in product-build mode."
3941
echo " --fromVMR Set when building from within the VMR"
@@ -75,6 +77,8 @@ ci=false
7577
skip_analyzers=false
7678
skip_build=false
7779
prepare_machine=false
80+
# Empty means "not specified"; tools.sh leaves it off unless it's explicitly requested.
81+
msbuild_multi_threaded=''
7882
source_build=false
7983
product_build=false
8084
from_vmr=false
@@ -167,6 +171,14 @@ while [[ $# > 0 ]]; do
167171
--preparemachine)
168172
prepare_machine=true
169173
;;
174+
--msbuildmultithreaded|--mt)
175+
msbuild_multi_threaded=$2
176+
shift
177+
;;
178+
--nodereuse)
179+
node_reuse=$2
180+
shift
181+
;;
170182
--docker)
171183
docker=true
172184
;;

0 commit comments

Comments
 (0)