From bad6c737887ccd9a57af8ca0497223fe4b08ca8d Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sat, 23 Feb 2019 13:01:26 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20190222.3 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19122.3 --- eng/Version.Details.xml | 4 ++-- eng/common/build.ps1 | 1 - eng/common/build.sh | 3 +-- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ddf07eca0f..f86a1d4ce6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ - + https://github.com/dotnet/arcade - 660f6cd006b276edb3764f4d7d726cedf6c29d8e + 78ccbeb1c8de779a6650257b408f5b3b4de16a0f diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8279dc71339..316061382b7 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 4fe8b41ed70..43b7ccb5c5a 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 fbcc4e3ba07..de7523cae58 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 633a8167b09..ecdece1f855 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 407152d0f61..cc3d3ce5ec8 100644 --- a/global.json +++ b/global.json @@ -9,6 +9,6 @@ "version": "3.0.100-preview-010024" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19121.5" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3" } } From 8a80a51cc8298fcb8f938389a44e65ef9454bfe0 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Sun, 24 Feb 2019 13:01:28 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20190223.1 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19123.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f86a1d4ce6b..70047541b0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ - + https://github.com/dotnet/arcade - 78ccbeb1c8de779a6650257b408f5b3b4de16a0f + 0cdc39a26b67f1aa01c0833861500c9ce25b862e diff --git a/global.json b/global.json index cc3d3ce5ec8..f18cffffd48 100644 --- a/global.json +++ b/global.json @@ -9,6 +9,6 @@ "version": "3.0.100-preview-010024" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19122.3" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19123.1" } } From 98bbbb3485ecfa349aab1d93a283a46c7c81d471 Mon Sep 17 00:00:00 2001 From: dotnet-maestro <@dotnet-maestro> Date: Mon, 25 Feb 2019 13:01:38 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20190224.1 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19124.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70047541b0d..604d3b0477d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -35,9 +35,9 @@ - + https://github.com/dotnet/arcade - 0cdc39a26b67f1aa01c0833861500c9ce25b862e + bae9ce31a13d501429608f4666fd5b479bdc4a87 diff --git a/global.json b/global.json index f18cffffd48..3df60bab12e 100644 --- a/global.json +++ b/global.json @@ -9,6 +9,6 @@ "version": "3.0.100-preview-010024" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19123.1" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19124.1" } }