Skip to content
Open
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
7 changes: 6 additions & 1 deletion eng/Build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ param (
[switch]$useGlobalNuGetCache = $true,
[switch]$dontUseGlobalNuGetCache = $false,
[switch]$warnAsError = $true,
[string]$warnNotAsError = "",
[switch][Alias('test')]$testDesktop,
[string]$testDesktopBatch = "",
[switch]$testCoreClr,
Expand Down Expand Up @@ -149,6 +150,7 @@ function Print-Usage() {
Write-Host " -compressAllMetadata Build product with compressed metadata"
Write-Host " -buildnorealsig Build product with realsig- (default use realsig+, where necessary)"
Write-Host " -verifypackageshipstatus Verify whether the packages we are building have already shipped to nuget"
Write-Host " -warnNotAsError <codes> Suppress specific warnings from being treated as errors (semi-colon delimited)"
Write-Host ""
Write-Host "Command line arguments starting with '/p:' are passed through to MSBuild."
}
Expand Down Expand Up @@ -305,6 +307,8 @@ function BuildSolution([string] $solutionName, $packSolution) {

$pack = if ($packSolution -eq $False) {""} else {$pack}

$msbuildWarnNotAsError = if ($warnAsError -and $warnNotAsError -ne "") { "/warnNotAsError:$warnNotAsError" } else { "" }

MSBuild $toolsetBuildProj `
$bl `
/p:Configuration=$configuration `
Expand All @@ -327,7 +331,8 @@ function BuildSolution([string] $solutionName, $packSolution) {
/p:BuildNoRealsig=$buildnorealsig `
/v:$verbosity `
$suppressExtensionDeployment `
@properties
@properties `
$msbuildWarnNotAsError

$env:BUILDING_USING_DOTNET=$BUILDING_USING_DOTNET_ORIG
}
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="1a405c76db678301b6f6f5b22d2a63a152c26b97" BarId="309188" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="0cf6b19ed68d2d52e097e6af6d6046b4eeefefe2" BarId="309569" />
<ProductDependencies>
<Dependency Name="Microsoft.Build" Version="18.6.0-preview-26180-08">
<Uri>https://github.com/dotnet/msbuild</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<!-- F# Version components -->
<FSMajorVersion>11</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion>
<FSBuildVersion>100</FSBuildVersion>
<FSBuildVersion>101</FSBuildVersion>
<FSRevisionVersion>0</FSRevisionVersion>
<!-- -->
<!-- F# Language version -->
Expand Down
14 changes: 13 additions & 1 deletion eng/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ usage()
echo " --fromVMR Set when building from within the VMR"
echo " --buildnorealsig Build product with realsig- (default use realsig+ where necessary)"
echo " --tfm Override the default target framework"
echo " --warnNotAsError <codes> Suppress specific warnings from being treated as errors (semi-colon delimited)"
echo ""
echo "Command line arguments starting with '/p:' are passed through to MSBuild."
}
Expand Down Expand Up @@ -80,6 +81,7 @@ product_build=false
from_vmr=false
buildnorealsig=true
properties=""
warn_not_as_error=""
docker=false
args=""

Expand Down Expand Up @@ -189,6 +191,10 @@ while [[ $# > 0 ]]; do
tfm=$2
shift
;;
--warnnotaserror)
warn_not_as_error=$2
shift
;;
/p:*)
properties+=("$1")
;;
Expand Down Expand Up @@ -328,6 +334,11 @@ function BuildSolution {
# do real build
BuildMessage="Error building solution"

local msbuild_warn_not_as_error=""
if [[ "$warn_not_as_error" != "" && "$warn_as_error" == true ]]; then
msbuild_warn_not_as_error="/warnNotAsError:$warn_not_as_error"
fi

MSBuild $toolset_build_proj \
$bl \
/p:Configuration=$configuration \
Expand All @@ -347,7 +358,8 @@ function BuildSolution {
/p:DotNetBuild=$product_build \
/p:DotNetBuildSourceOnly=$source_build \
/p:DotNetBuildFromVMR=$from_vmr \
${properties[@]+"${properties[@]}"}
${properties[@]+"${properties[@]}"} \
$msbuild_warn_not_as_error
fi
}

Expand Down
Loading