diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcb902684..2d94b7069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -36,9 +36,9 @@ - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8279dc713..316061382 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -99,7 +99,6 @@ function Build { /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` /p:Publish=$publish ` - /p:ContinuousIntegrationBuild=$ci ` @properties } diff --git a/eng/common/build.sh b/eng/common/build.sh index 4fe8b41ed..43b7ccb5c 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -10,7 +10,7 @@ set -e usage() { echo "Common settings:" - echo " --configuration Build configuration: 'Debug' or 'Release' (short: --c)" + echo " --configuration Build configuration: 'Debug' or 'Release' (short: -c)" echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic] (short: -v)" echo " --binaryLog Create MSBuild binary log (short: -bl)" echo "" @@ -191,7 +191,6 @@ function Build { /p:PerformanceTest=$performance_test \ /p:Sign=$sign \ /p:Publish=$publish \ - /p:ContinuousIntegrationBuild=$ci \ $properties ExitWithExitCode 0 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fbcc4e3ba..de7523cae 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -461,7 +461,7 @@ function MSBuild() { $buildTool = InitializeBuildTool - $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse" + $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" if ($warnAsError) { $cmdArgs += " /warnaserror /p:TreatWarningsAsErrors=true" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 633a8167b..ecdece1f8 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -293,7 +293,7 @@ function MSBuild { warnaserror_switch="/warnaserror" fi - "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error "$@" || { + "$_InitializeBuildTool" "$_InitializeBuildToolCommand" /m /nologo /clp:Summary /v:$verbosity /nr:$node_reuse $warnaserror_switch /p:TreatWarningsAsErrors=$warn_as_error /p:ContinuousIntegrationBuild=$ci "$@" || { local exit_code=$? echo "Build failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/global.json b/global.json index 5178d887a..e8fe39ae0 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "3.0.100-preview-009812" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19121.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3" } }