From b23e8cacdca4a7658161ee20f4c3a12cddaa9b73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Jan 2019 13:08:33 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 1185 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19054.13 --- eng/Version.Details.xml | 4 ++-- eng/common/build.sh | 3 +++ global.json | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11f5c68c3..edc4c3e8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ - + https://github.com/dotnet/arcade - 7acae668c8dd3efc4b0e18946982d7ddee3e5591 + c6268efc7cfcb98197eb374bb01e1fadb5a7f6ed diff --git a/eng/common/build.sh b/eng/common/build.sh index 47af926d4..99009da7a 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -130,6 +130,9 @@ while [[ $# > 0 ]]; do /p:*) properties="$properties $1" ;; + /m:*) + properties="$properties $1" + ;; *) echo "Invalid argument: $1" usage diff --git a/global.json b/global.json index 6fd64fa12..412eaac93 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.19053.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19054.13" } } From 2d19465b84a452ce788d93b3559bac417295b9d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 6 Jan 2019 13:08:39 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 1194 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19055.1 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.sh | 5 +++-- global.json | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edc4c3e8f..eba05de18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -24,9 +24,9 @@ - + https://github.com/dotnet/arcade - c6268efc7cfcb98197eb374bb01e1fadb5a7f6ed + b43f8c50d78c00d33f0b31a666b46ce5e9bcbe3d diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 65f689775..186dcba26 100644 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -189,8 +189,9 @@ function InitializeBuildTool { InitializeDotNetCli $restore - # return value + # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" + _InitializeBuildToolCommand="msbuild" } function GetNuGetPackageCachePath { @@ -283,7 +284,7 @@ function MSBuild { warnaserror_switch="/warnaserror" fi - "$_InitializeBuildTool" msbuild /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 "$@" lastexitcode=$? if [[ $lastexitcode != 0 ]]; then diff --git a/global.json b/global.json index 412eaac93..fc60e73d8 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.19054.13" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19055.1" } } From 0c8f0ec42c0c211de56cc5305328a1257fc2cb5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Jan 2019 13:06:31 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 1194 This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19055.1