Skip to content

Commit b3c3cb3

Browse files
committed
Added Windows powershell compatibility, fixed the default script name, cleanup run.cake
1 parent e4a557c commit b3c3cb3

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

build/parameters.cake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public class BuildParameters
6363
EnabledPublishNuget = IsEnabled(context, "ENABLED_PUBLISH_NUGET"),
6464
EnabledPublishChocolatey = IsEnabled(context, "ENABLED_PUBLISH_CHOCOLATEY"),
6565
EnabledPublishDocker = IsEnabled(context, "ENABLED_PUBLISH_DOCKER"),
66-
EnabledPullRequestPublish = IsEnabled(context, "ENABLED_PULL_REQUEST_PUBLISH", false),
6766

6867
IsRunningOnUnix = context.IsRunningOnUnix(),
6968
IsRunningOnWindows = context.IsRunningOnWindows(),

run.cake

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Task("Test")
168168
settings.Filter = "TestCategory!=NoMono";
169169
}
170170

171-
DotNetCoreTest(project.ToString(), settings);
171+
DotNetCoreTest(project.FullPath, settings);
172172
}
173173

174174
// run using NUnit
@@ -369,7 +369,7 @@ Task("Zip-Files")
369369

370370
Task("Docker-Build")
371371
.WithCriteria(() => !parameters.IsRunningOnMacOS, "Docker can be built only on Windows or Linux agents.")
372-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Docker-Build works only for releases.")
372+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Docker-Build works only for releases.")
373373
.IsDependentOn("Copy-Files")
374374
.Does(() =>
375375
{
@@ -468,7 +468,7 @@ Task("Publish-Tfs")
468468
.WithCriteria(() => parameters.EnabledPublishTfs, "Publish-Tfs was disabled.")
469469
.WithCriteria(() => parameters.IsRunningOnWindows, "Publish-Tfs works only on Windows agents.")
470470
.WithCriteria(() => parameters.IsRunningOnAppVeyor, "Publish-Tfs works only on AppVeyor.")
471-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Publish-Tfs works only for releases.")
471+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Tfs works only for releases.")
472472
.IsDependentOn("Pack-Tfs")
473473
.Does(() =>
474474
{
@@ -496,7 +496,7 @@ Task("Publish-Gem")
496496
.WithCriteria(() => parameters.EnabledPublishGem, "Publish-Gem was disabled.")
497497
.WithCriteria(() => parameters.IsRunningOnWindows, "Publish-Gem works only on Windows agents.")
498498
.WithCriteria(() => parameters.IsRunningOnAppVeyor, "Publish-Gem works only on AppVeyor.")
499-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Publish-Gem works only for releases.")
499+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Gem works only for releases.")
500500
.IsDependentOn("Pack-Gem")
501501
.Does(() =>
502502
{
@@ -524,7 +524,7 @@ Task("Publish-DockerHub")
524524
.WithCriteria(() => parameters.EnabledPublishDocker, "Publish-DockerHub was disabled.")
525525
.WithCriteria(() => !parameters.IsRunningOnMacOS, "Publish-DockerHub works only on Windows and Linux agents.")
526526
.WithCriteria(() => parameters.IsRunningOnAppVeyor || (parameters.IsRunningOnTravis && !parameters.IsRunningOnMacOS), "Publish-DockerHub works only on AppVeyor or Travis.")
527-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Publish-DockerHub works only for releases.")
527+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-DockerHub works only for releases.")
528528
.IsDependentOn("Docker-Build")
529529
.Does(() =>
530530
{
@@ -565,7 +565,7 @@ Task("Publish-NuGet")
565565
.WithCriteria(() => parameters.EnabledPublishNuget, "Publish-NuGet was disabled.")
566566
.WithCriteria(() => parameters.IsRunningOnWindows, "Publish-NuGet works only on Windows agents.")
567567
.WithCriteria(() => parameters.IsRunningOnAppVeyor, "Publish-NuGet works only on AppVeyor.")
568-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Publish-NuGet works only for releases.")
568+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-NuGet works only for releases.")
569569
.IsDependentOn("Pack-NuGet")
570570
.Does(() =>
571571
{
@@ -603,7 +603,7 @@ Task("Publish-Chocolatey")
603603
.WithCriteria(() => parameters.EnabledPublishChocolatey, "Publish-Chocolatey was disabled.")
604604
.WithCriteria(() => parameters.IsRunningOnWindows, "Publish-Chocolatey works only on Windows agents.")
605605
.WithCriteria(() => parameters.IsRunningOnAppVeyor, "Publish-Chocolatey works only on AppVeyor.")
606-
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease() || parameters.EnabledPullRequestPublish, "Publish-Chocolatey works only for releases.")
606+
.WithCriteria(() => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Chocolatey works only for releases.")
607607
.IsDependentOn("Pack-Chocolatey")
608608
.Does(() =>
609609
{

run.ps1

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ https://cakebuild.net
3333

3434
[CmdletBinding()]
3535
Param(
36-
[string]$Script = "build.cake",
36+
[string]$Script = "run.cake",
3737
[string]$Target = "Default",
3838
[string]$Configuration = "Release",
3939
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
@@ -46,6 +46,8 @@ Param(
4646

4747
Write-Host "Preparing to run build script..."
4848

49+
if ($PSEdition -eq "Desktop") { $IsWindows = $true }
50+
4951
$CakeVersion = "0.30.0"
5052

5153
$DotNetChannel = "Current";
@@ -150,6 +152,7 @@ $Arguments = @{
150152
configuration=$Configuration;
151153
verbosity=$Verbosity;
152154
dryrun=$WhatIf;
155+
nuget_useinprocessclient=$true;
153156
}.GetEnumerator() | ForEach-Object { "--{0}=`"{1}`"" -f $_.key, $_.value };
154157

155158
# Start Cake

0 commit comments

Comments
 (0)