Skip to content

Commit c531c9e

Browse files
committed
Merge branch 'release/0.29.0' into main
* release/0.29.0: (build) Updated version and release notes. (GH-2094) Allow no dependecy exec of single task * fixes #2094 Change the legacy pattern validation. Do not rely on Uri.TryCreate, use a regex instead. This will fix the absolute path handling issues. Add tests for testing legacy and new patterns with relative and absolute pathes on all platform. (GH-2193) Added new maintainers (GH-2203) Added Octopus Deploy release promotion * fixes #2203 (GH-2095) NUnit Skip non test assemblies * Add --skipnontestassemblies funcionality to CAKE's NUnit3Settings as it exists in original nunit3 test runner * Fixes #2095 Initial implementation of PushTestResults and PublishCodeCoverage Add repository metadata element to nuget pack * Fixes #2167 Made SelfContained a nullable boolean since no setting means it takes the .Net default of true when runtime is included. Added the logic to include false for self contain and test Fixes #2140 try resolve vstest.console.exe before guessing it Try to find vswhere.exe on the system if the tool is not registered. changed the recommended tool for the WiX package in the documentation (build) Updated Cake tool to version 0.28.1 (GH-2188) Corrected link to CLA (build) Updated Cake tool to version 0.28.0
2 parents 1da1ea2 + 6d52984 commit c531c9e

File tree

66 files changed

+1980
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+1980
-162
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ chmod +x build.sh
116116

117117
So you’re thinking about contributing to Cake? Great! It’s **really** appreciated.
118118

119-
Make sure you've read the [contribution guidelines](https://cakebuild.net/docs/contributing/contribution-guidelines) before sending that epic pull request. You'll also need to sign the [contribution license agreement](https://cla2.dotnetfoundation.org/) (CLA) for anything other than a trivial change. **NOTE:** The .NET Foundation CLA Bot will provide a link to this CLA within the PR that you submit if it is deemed as required.
119+
Make sure you've read the [contribution guidelines](https://cakebuild.net/docs/contributing/contribution-guidelines) before sending that epic pull request. You'll also need to sign the [contribution license agreement](https://cla.dotnetfoundation.org/cake-build/cake) (CLA) for anything other than a trivial change. **NOTE:** The .NET Foundation CLA Bot will provide a link to this CLA within the PR that you submit if it is deemed as required.
120120

121121
* Fork the repository.
122122
* Create a branch to work in.
@@ -132,7 +132,7 @@ Make sure you've read the [contribution guidelines](https://cakebuild.net/docs/c
132132

133133
## License
134134

135-
Copyright © .NET Foundation, Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors.
135+
Copyright © .NET Foundation, Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors.
136136

137137
Cake is provided as-is under the MIT license. For more information see [LICENSE](https://github.com/cake-build/cake/blob/develop/LICENSE).
138138

@@ -154,7 +154,7 @@ For more information see the [.NET Foundation Code of Conduct](http://www.dotnet
154154

155155
## Contribution License Agreement
156156

157-
By signing the [CLA](https://cla2.dotnetfoundation.org/), the community is free to use your contribution to .NET Foundation projects.
157+
By signing the [CLA](https://cla.dotnetfoundation.org/cake-build/cake), the community is free to use your contribution to .NET Foundation projects.
158158

159159
## .NET Foundation
160160

ReleaseNotes.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
### New in 0.29.0 (Released 2018/07/06)
2+
3+
* 2140 DotNetCorePublish does not respect SelfContained DotNetCorePublishSettings property.
4+
* 2203 Add Octopus Deploy Promote release support.
5+
* 2095 Add "--skipnontestassemblies" funcionality to CAKE's NUnit3Settings as it exists in original nunit3 test runner.
6+
* 2094 Add support for executing a single task without dependencies.
7+
* 2196 NuGet Repository information not settable in NuGet Pack.
8+
* 2185 Try to find vswhere.exe on the system if the tool is not registered.
9+
* 2154 Problem with loading abolute path scripts with #load preprocessor.
10+
* 2152 try resolve vstest.console.exe before guessing it.
11+
* 1609 Add additional VSTS actions.
12+
* 2195 Updated the WiX tool documentation.
13+
* 2193 Add Pascal and Dave to all required places.
14+
* 2188 The CLA link in readme seems invalid or broken.
15+
116
### New in 0.28.1 (Released 2018/06/18)
217

318
* 2176 Skipped tasks show up multiple times in report

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Param(
3131
[string[]]$ScriptArgs
3232
)
3333

34-
$CakeVersion = "0.27.2"
34+
$CakeVersion = "0.28.1"
3535
$DotNetChannel = "Current";
3636
$DotNetVersion = "2.1.101";
3737
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
1010
TOOLS_DIR=$SCRIPT_DIR/tools
1111
NUGET_EXE=$TOOLS_DIR/nuget.exe
1212
NUGET_URL=https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
13-
CAKE_VERSION=0.27.2
13+
CAKE_VERSION=0.28.1
1414
CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
1515

1616
# Temporarily skip verification of addins.

nuspec/Cake.CoreCLR.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Cake.CoreCLR</id>
55
<version>0.0.0</version>
6-
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
6+
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors</authors>
77
<description>The Cake script runner.</description>
88
<summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
99
<licenseUrl>https://github.com/cake-build/cake/blob/develop/LICENSE</licenseUrl>
@@ -15,4 +15,4 @@
1515
</metadata>
1616
<files>
1717
</files>
18-
</package>
18+
</package>

nuspec/Cake.CoreCLR.symbols.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3-
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Cake.CoreCLR</id>
55
<version>0.0.0</version>
6-
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
6+
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors</authors>
77
<description>The Cake script runner.</description>
88
<summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
99
<licenseUrl>https://github.com/cake-build/cake/blob/develop/LICENSE</licenseUrl>
@@ -18,4 +18,4 @@
1818
<file src="Cake.pdb" target="lib/netcoreapp2.0" />
1919
<file src="Cake.xml" target="lib/netcoreapp2.0" />
2020
</files>
21-
</package>
21+
</package>

nuspec/Cake.Portable.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<id>cake.portable</id>
66
<title>Cake.Portable</title>
77
<version>0.0.0</version>
8-
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
8+
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors</authors>
99
<summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
1010
<description>The Cake script runner.</description>
1111
<projectUrl>https://cakebuild.net/</projectUrl>

nuspec/Cake.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Cake</id>
55
<version>0.0.0</version>
6-
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
6+
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors</authors>
77
<description>The Cake script runner.</description>
88
<summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
99
<licenseUrl>https://github.com/cake-build/cake/blob/develop/LICENSE</licenseUrl>
@@ -15,4 +15,4 @@
1515
</metadata>
1616
<files>
1717
</files>
18-
</package>
18+
</package>

nuspec/Cake.symbols.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Cake</id>
55
<version>0.0.0</version>
6-
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström and contributors</authors>
6+
<authors>Patrik Svensson, Mattias Karlsson, Gary Ewan Park, Alistair Chapman, Martin Björkström, Dave Glick, Pascal Berger and contributors</authors>
77
<description>The Cake script runner.</description>
88
<summary>Cake (C# Make) is a build automation system with a C# DSL to do things like compiling code, copy files/folders, running unit tests, compress files and build NuGet packages.</summary>
99
<licenseUrl>https://github.com/cake-build/cake/blob/develop/LICENSE</licenseUrl>
@@ -18,4 +18,4 @@
1818
<file src="Cake.pdb" target="lib/net46" />
1919
<file src="Cake.xml" target="lib/net46" />
2020
</files>
21-
</package>
21+
</package>
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
using Cake.Common.Tools.OctopusDeploy;
6+
using Cake.Testing.Fixtures;
7+
8+
namespace Cake.Common.Tests.Fixtures.Tools
9+
{
10+
public sealed class OctopusDeployReleasePromoterFixture : ToolFixture<OctopusDeployPromoteReleaseSettings>
11+
{
12+
internal string Server { get; set; }
13+
14+
internal string ApiKey { get; set; }
15+
16+
internal string Project { get; set; }
17+
18+
internal string DeployFrom { get; set; }
19+
20+
internal string DeployTo { get; set; }
21+
22+
public OctopusDeployReleasePromoterFixture() : base("Octo.exe")
23+
{
24+
Server = "http://octopus";
25+
ApiKey = "API-12345";
26+
Project = "MyProject";
27+
DeployFrom = "Testing";
28+
DeployTo = "Staging";
29+
}
30+
31+
protected override void RunTool()
32+
{
33+
var tool = new OctopusDeployReleasePromoter(FileSystem, Environment, ProcessRunner, Tools);
34+
tool.PromoteRelease(Server, ApiKey, Project, DeployFrom, DeployTo, Settings);
35+
}
36+
}
37+
}

0 commit comments

Comments
 (0)