Skip to content

Commit

Permalink
Upgraded Cake to latest version and switched it to install .NET Core …
Browse files Browse the repository at this point in the history
…1.1.4
  • Loading branch information
Rob Prouse committed Oct 3, 2017
1 parent 6ac3c2d commit 3259f44
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
3 changes: 2 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
//////////////////////////////////////////////////////////////////////

var target = Argument("target", "Default");
var configuration = Argument("configuration", "Debug");
var configuration = Argument("configuration", "Release");

//////////////////////////////////////////////////////////////////////
// SET PACKAGE VERSION
Expand Down Expand Up @@ -157,6 +157,7 @@ Task("Build")
MSBuild(PROJECT_DIR + "src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj", settings);
MSBuild(PROJECT_DIR + "src/NUnit3TestAdapterInstall/NUnit3TestAdapterInstall.csproj", settings);
//MSBuild(ADAPTER_SOLUTION, settings);
MSBuild(DEMO_SOLUTION, settings);
});

Expand Down
17 changes: 11 additions & 6 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ No tasks will be executed.
.PARAMETER ScriptArgs
Remaining arguments are added here.
.LINK
http://cakebuild.net
https://cakebuild.net
#>

[CmdletBinding()]
Expand All @@ -31,12 +31,16 @@ Param(
[string[]]$ScriptArgs
)

$CakeVersion = "0.19.3"
$CakeVersion = "0.22.1"
$DotNetChannel = "preview";
$DotNetVersion = "1.0.1";
$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v1.0.1/scripts/obtain/dotnet-install.ps1";
$DotNetVersion = "1.1.4";
$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"
Expand Down Expand Up @@ -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
###########################################################################
Expand Down
4 changes: 2 additions & 2 deletions tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.19.3" />
<package id="NUnit.ConsoleRunner" version="3.5.0" />
<package id="Cake" version="0.22.2" />
<package id="NUnit.ConsoleRunner" version="3.7.0" />
</packages>

0 comments on commit 3259f44

Please sign in to comment.