From e2dfe6f4656806953ab18edccc9c2c9c116ce15c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Feb 2019 13:10:46 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20190222.3 (#1084) This change updates the following dependencies - Microsoft.DotNet.ApiCompat - 1.0.0-beta.19122.3 - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19122.3 - Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19122.3 - Microsoft.DotNet.CodeAnalysis - 1.0.0-beta.19122.3 - Microsoft.DotNet.GenAPI - 1.0.0-beta.19122.3 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- eng/common/build.ps1 | 1 - eng/common/build.sh | 3 +-- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 2 +- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e5af9fc6..7c0b4fe8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,25 +2,25 @@ - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 168bad93b..42c781153 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,10 +24,10 @@ netstandard.library - 1.0.0-beta.19121.5 - 1.0.0-beta.19121.5 - 1.0.0-beta.19121.5 - 1.0.0-beta.19121.5 + 1.0.0-beta.19122.3 + 1.0.0-beta.19122.3 + 1.0.0-beta.19122.3 + 1.0.0-beta.19122.3 2.0.3 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 324be4ab4..cf47b477f 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "2.1.401" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19121.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3" } }