From 1a4648b2e44fedcd768affdd693b3993452b87b0 Mon Sep 17 00:00:00 2001 From: osoykan Date: Wed, 20 Sep 2017 16:50:44 +0300 Subject: [PATCH] cake nuget updated --- build.cake | 4 +++- build.ps1 | 11 ++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build.cake b/build.cake index 379b961..d36052c 100644 --- a/build.cake +++ b/build.cake @@ -1,8 +1,10 @@ #tool "nuget:?package=xunit.runner.console" +#addin "nuget:?package=Cake.Nuget" #addin "nuget:?package=NuGet.Core" #addin "nuget:?package=Cake.ExtendedNuGet" + ////////////////////////////////////////////////////////////////////// // ARGUMENTS ////////////////////////////////////////////////////////////////////// @@ -25,7 +27,7 @@ var testProjectNames = new List() var nupkgPath = "nupkg"; var nupkgRegex = $"**/{projectName}*.nupkg"; -var nugetPath = toolpath + "/NuGet.CommandLine/tools/nuget.exe"; +var nugetPath = toolpath + "/nuget.exe"; var nugetQueryUrl = "https://www.nuget.org/api/v2/"; var nugetPushUrl = "https://www.nuget.org/api/v2/package"; var NUGET_PUSH_SETTINGS = new NuGetPushSettings diff --git a/build.ps1 b/build.ps1 index 7f816c3..51ecee6 100644 --- a/build.ps1 +++ b/build.ps1 @@ -16,7 +16,7 @@ No tasks will be executed. .PARAMETER ScriptArgs Remaining arguments are added here. .LINK -http://cakebuild.net +https://cakebuild.net #> [CmdletBinding()] @@ -37,6 +37,10 @@ $DotNetVersion = "2.0.0"; $DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1"; $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" +# Temporarily skip verification and opt-in to new in-proc NuGet +$ENV:CAKE_SETTINGS_SKIPVERIFICATION='true' +$ENV:CAKE_NUGET_USEINPROCESSCLIENT='true' + # Make sure tools folder exists $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent $ToolPath = Join-Path $PSScriptRoot "tools" @@ -82,10 +86,11 @@ if($FoundDotNetCliVersion -ne $DotNetVersion) { Remove-PathVariable "$InstallPath" $env:PATH = "$InstallPath;$env:PATH" - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 +$env:DOTNET_CLI_TELEMETRY_OPTOUT=1 + ########################################################################### # INSTALL NUGET ###########################################################################