Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8028D200C60 for ; Mon, 24 Apr 2017 14:37:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7EEDA160BA5; Mon, 24 Apr 2017 12:37:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CB16B160B99 for ; Mon, 24 Apr 2017 14:37:49 +0200 (CEST) Received: (qmail 36447 invoked by uid 500); 24 Apr 2017 12:37:49 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 36438 invoked by uid 99); 24 Apr 2017 12:37:49 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Apr 2017 12:37:49 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E6A25E110C; Mon, 24 Apr 2017 12:37:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ptupitsyn@apache.org To: commits@ignite.apache.org Message-Id: <2ce869f5f2c545b6b4e59ad24e61d9f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-5057 .NET: Fix build.ps1 to handle Any CPU config on PowerShell 4.0 and lower Date: Mon, 24 Apr 2017 12:37:48 +0000 (UTC) archived-at: Mon, 24 Apr 2017 12:37:50 -0000 Repository: ignite Updated Branches: refs/heads/ignite-2.0 7c249d7bb -> de421ffc4 IGNITE-5057 .NET: Fix build.ps1 to handle Any CPU config on PowerShell 4.0 and lower Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de421ffc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de421ffc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de421ffc Branch: refs/heads/ignite-2.0 Commit: de421ffc492e3536b885f2d90c21bcfa71e435a5 Parents: 7c249d7 Author: Pavel Tupitsyn Authored: Mon Apr 24 15:37:42 2017 +0300 Committer: Pavel Tupitsyn Committed: Mon Apr 24 15:37:42 2017 +0300 ---------------------------------------------------------------------- modules/platforms/dotnet/build.ps1 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/de421ffc/modules/platforms/dotnet/build.ps1 ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/build.ps1 b/modules/platforms/dotnet/build.ps1 index 4b5d937..b8e6a37 100644 --- a/modules/platforms/dotnet/build.ps1 +++ b/modules/platforms/dotnet/build.ps1 @@ -143,9 +143,12 @@ echo "MSBuild detected at '$msbuildExe'." # Detect NuGet $ng = "nuget" if ((Get-Command $ng -ErrorAction SilentlyContinue) -eq $null) { - echo "Downloading NuGet..." - (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/v3.3.0/nuget.exe", "nuget.exe"); $ng = ".\nuget.exe" + + if (-not (Test-Path $ng)) { + echo "Downloading NuGet..." + (New-Object System.Net.WebClient).DownloadFile("https://dist.nuget.org/win-x86-commandline/v3.3.0/nuget.exe", "nuget.exe"); + } } # Restore NuGet packages @@ -153,10 +156,11 @@ echo "Restoring NuGet..." & $ng restore # Build -echo "Starting MsBuild..." $targets = if ($clean) {"Clean;Rebuild"} else {"Build"} $codeAnalysis = if ($skipCodeAnalysis) {"/p:RunCodeAnalysis=false"} else {""} -& $msbuildExe Apache.Ignite.sln /target:$targets /p:Configuration=$configuration /p:Platform=`"$platform`" $codeAnalysis /p:UseSharedCompilation=false +$msBuildCommand = "`"$msBuildExe`" Apache.Ignite.sln /target:$targets /p:Configuration=$configuration /p:Platform=`"$platform`" $codeAnalysis /p:UseSharedCompilation=false" +echo "Starting MsBuild: '$msBuildCommand'" +cmd /c $msBuildCommand # Check result if ($LastExitCode -ne 0) {