Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions eng/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ param (
[switch]$procdump,
[switch]$deployExtensions,
[switch]$prepareMachine,
[bool][Alias('mt')]$msbuildMultiThreaded = $false,
[bool]$nodeReuse = $false,
[switch]$useGlobalNuGetCache = $true,
[switch]$dontUseGlobalNuGetCache = $false,
[switch]$warnAsError = $true,
Expand Down Expand Up @@ -78,6 +80,7 @@ param (

Set-StrictMode -version 2.0
$ErrorActionPreference = "Stop"

$BuildCategory = ""
$BuildMessage = ""

Expand Down Expand Up @@ -140,6 +143,8 @@ function Print-Usage() {
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
Write-Host " -procdump Monitor test runs with procdump"
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -msbuildMultiThreaded <value> Sets MSBuild's multi-threaded mode, i.e. the -mt switch ('1' or '0') (short: -mt)"
Write-Host " -nodeReuse <value> Sets nodereuse msbuild parameter ('1' or '0')"
Write-Host " -dontUseGlobalNuGetCache Do not use the global NuGet cache"
Write-Host " -noVisualStudio Only build fsc and fsi as .NET Core applications. No Visual Studio required. '-configuration', '-verbosity', '-norestore', '-rebuild' are supported."
Write-Host " -productBuild Build the repository in product-build mode."
Expand Down
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7fb8cef14d9ae6bd729b04638f88d00f1ba7eb99" BarId="326361" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="7cdb217445905f3342bbb0266a4497b9a014389a" BarId="326717" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.10.0-preview-26357-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
12 changes: 12 additions & 0 deletions eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ usage()
echo " --skipAnalyzers Do not run analyzers during build operations"
echo " --skipBuild Do not run the build"
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
echo " --msbuildMultiThreaded <value> Sets MSBuild's multi-threaded mode, i.e. the -mt switch ('true' or 'false') (short: --mt)"
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
echo " --sourceBuild Build the repository in source-only mode."
echo " --productBuild Build the repository in product-build mode."
echo " --fromVMR Set when building from within the VMR"
Expand Down Expand Up @@ -75,6 +77,8 @@ ci=false
skip_analyzers=false
skip_build=false
prepare_machine=false
# Empty means "not specified"; tools.sh leaves it off unless it's explicitly requested.
msbuild_multi_threaded=''
source_build=false
product_build=false
from_vmr=false
Expand Down Expand Up @@ -167,6 +171,14 @@ while [[ $# > 0 ]]; do
--preparemachine)
prepare_machine=true
;;
--msbuildmultithreaded|--mt)
msbuild_multi_threaded=$2
shift
;;
--nodereuse)
node_reuse=$2
shift
;;
--docker)
docker=true
;;
Expand Down
Loading