diff --git a/VSTS.DNX.Tasks.BuildNugetPackage/BuildNugetPackage.ps1 b/VSTS.DNX.Tasks.BuildNugetPackage/BuildNugetPackage.ps1 index 537aca4..020b456 100644 --- a/VSTS.DNX.Tasks.BuildNugetPackage/BuildNugetPackage.ps1 +++ b/VSTS.DNX.Tasks.BuildNugetPackage/BuildNugetPackage.ps1 @@ -50,7 +50,7 @@ Function Main $versionSuffix = "--version-suffix $prefix$($VersionData[0])" } - if($isSkipDotNetInstall) + if(-Not $isSkipDotNetInstall) { Import-Module "$(Split-Path -parent $PSCommandPath)\InstallDotnet.psm1" @@ -80,10 +80,12 @@ Function Main $projectList = $projects | % {"""$SourceFolder$($_.Trim('"'))""" } | & {"$input"} Invoke-Expression "& dotnet restore $projectList" + Write-Output " Restore done." Write-Output "dotnet build for:" Write-Output $($projectList -split(" ") | % { " $_" }) Invoke-Expression "& dotnet build $projectList -c $BuildConfiguration" + Write-Output " Build done." foreach($project in $projects) { @@ -91,6 +93,7 @@ Function Main Write-Output "dotnet pack for:" Write-Output " $p" Invoke-Expression "& dotnet pack $p -c $BuildConfiguration -o ""$OutputFolder"" $versionSuffix" + Write-Output " Pack done for: $p" } } diff --git a/VSTS.DNX.Tasks.BuildWebPackage/BuildWebPackage.ps1 b/VSTS.DNX.Tasks.BuildWebPackage/BuildWebPackage.ps1 index dcbf0c8..cdfbd06 100644 --- a/VSTS.DNX.Tasks.BuildWebPackage/BuildWebPackage.ps1 +++ b/VSTS.DNX.Tasks.BuildWebPackage/BuildWebPackage.ps1 @@ -39,7 +39,7 @@ Function Main $OutputFolder = $OutputFolder.Trim('"') - if($isSkipDotNetInstall) + if(-Not $isSkipDotNetInstall) { Import-Module "$(Split-Path -parent $PSCommandPath)\InstallDotnet.psm1" @@ -69,10 +69,12 @@ Function Main $projectList = $projects | % {"""$SourceFolder$($_.Trim('"'))""" } | & {"$input"} Invoke-Expression "& dotnet restore $projectList" + Write-Output " Restore done." Write-Output "dotnet build for:" Write-Output $($projectList -split(" ") | % { " $_" }) Invoke-Expression "& dotnet build $projectList -c $BuildConfiguration" + Write-Output " Build done." foreach($project in $projects) { @@ -81,6 +83,7 @@ Function Main Write-Output "dotnet publish for:" Write-Output " $p" Invoke-Expression "& dotnet publish $p -c $BuildConfiguration -o ""$OutputFolder\$outDir"" --no-build" + Write-Output " Publish done for: $p" } } diff --git a/VSTS.DNX.Tasks.Shared/InstallDotnet.psm1 b/VSTS.DNX.Tasks.Shared/InstallDotnet.psm1 index c98afc5..250c6e2 100644 --- a/VSTS.DNX.Tasks.Shared/InstallDotnet.psm1 +++ b/VSTS.DNX.Tasks.Shared/InstallDotnet.psm1 @@ -13,6 +13,7 @@ Write-Output "Dotnet found:" Write-Output " $($dotnet.Path)" $dotnetPath = $dotnet.Path + Write-Output " Skipping installation." } else { @@ -29,13 +30,14 @@ $webClient = New-Object System.Net.WebClient $webClient.Proxy = [System.Net.WebRequest]::DefaultWebProxy $webClient.Proxy.Credentials = [System.Net.CredentialCache]::DefaultNetworkCredentials - Write-Output "Downloading dotnet-install.ps1 to $dotnetPs1Path" + Write-Output " Downloading dotnet-install.ps1 to $dotnetPs1Path" $webClient.DownloadFile("https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1", $dotnetPs1Path) $dotnetPath = $dotnetPs1Path - Write-Output "Calling: $dotnetPath" + Write-Output " Calling: $dotnetPath" & "$dotnetPath" + Write-Output " Done." } Write-Verbose "Leaving Method Install-Dotnet"