Skip to content

Commit 497996a

Browse files
agc93agc93
committed
Merge branch 'release/0.3.0'
2 parents cef7d57 + e04527f commit 497996a

File tree

15 files changed

+81
-97
lines changed

15 files changed

+81
-97
lines changed

‎ReleaseNotes.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,11 @@
2828
# 0.2.0
2929

3030
- Supports Cake 0.24.0
31-
- Updated to use new logging implementation
31+
- Updated to use new logging implementation
32+
33+
# 0.3.0
34+
35+
- Supports Cake 0.28.1
36+
- Updated with fixed TC engine, including new build statistics
37+
- Other small fixes
38+
- Thanks @flcdrg and @micsco for contributions!

‎build.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var projects = GetProjects(solutionPath);
1717
var artifacts = "./dist/";
1818
var testResultsPath = MakeAbsolute(Directory(artifacts + "./test-results"));
1919
GitVersion versionInfo = null;
20-
var frameworks = new List<string> { "net46", "netstandard1.6"};
20+
var frameworks = new List<string> { "net46", "netstandard2.0"};
2121

2222
///////////////////////////////////////////////////////////////////////////////
2323
// SETUP / TEARDOWN

‎src/Cake.Module.Shared/Cake.Module.Shared.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.Module.Shared</AssemblyName>
77
<PackageId>Cake.Module.Shared</PackageId>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
98
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
109
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
1110
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -15,8 +14,8 @@
1514
</PropertyGroup>
1615

1716
<ItemGroup>
18-
<PackageReference Include="Cake.Core" Version="0.24.0" />
19-
<PackageReference Include="Cake.Common" Version="0.24.0" />
17+
<PackageReference Include="Cake.Core" Version="0.28.1" />
18+
<PackageReference Include="Cake.Common" Version="0.28.1" />
2019
</ItemGroup>
2120

2221
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Cake.Module.Shared/CakeEngineBase.cs‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,23 @@ protected CakeEngineBase(ICakeEngine implementation)
1515
/// <summary>Registers a new task.</summary>
1616
/// <param name="name">The name of the task.</param>
1717
/// <returns>A <see cref="T:Cake.Core.CakeTaskBuilder`1" />.</returns>
18-
public CakeTaskBuilder<ActionTask> RegisterTask(string name)
18+
public CakeTaskBuilder RegisterTask(string name)
1919
{
2020
return _engine.RegisterTask(name);
2121
}
2222

23+
/// <inheritdoc />
24+
public void RegisterSetupAction(Action<ISetupContext> action)
25+
{
26+
_engine.RegisterSetupAction(action);
27+
}
28+
29+
/// <inheritdoc />
30+
public void RegisterSetupAction<TData>(Func<ISetupContext, TData> action) where TData : class
31+
{
32+
_engine.RegisterSetupAction(action);
33+
}
34+
2335
/// <summary>
2436
/// Allows registration of an action that's executed before any tasks are run.
2537
/// If setup fails, no tasks will be executed but teardown will be performed.
@@ -40,6 +52,12 @@ public void RegisterTeardownAction(Action<ITeardownContext> action)
4052
_engine.RegisterTeardownAction(action);
4153
}
4254

55+
/// <inheritdoc />
56+
public void RegisterTeardownAction<TData>(Action<ITeardownContext, TData> action) where TData : class
57+
{
58+
_engine.RegisterTeardownAction(action);
59+
}
60+
4361
/// <summary>
4462
/// Runs the specified target using the specified <see cref="T:Cake.Core.IExecutionStrategy" />.
4563
/// </summary>
@@ -64,6 +82,12 @@ public void RegisterTaskSetupAction(Action<ITaskSetupContext> action)
6482
_engine.RegisterTaskSetupAction(action);
6583
}
6684

85+
/// <inheritdoc />
86+
public void RegisterTaskSetupAction<TData>(Action<ITaskSetupContext, TData> action) where TData : class
87+
{
88+
_engine.RegisterTaskSetupAction(action);
89+
}
90+
6791
/// <summary>
6892
/// Allows registration of an action that's executed after each task has been run.
6993
/// If a task setup action or a task fails with or without recovery, the specified task teardown action will still be
@@ -75,9 +99,18 @@ public void RegisterTaskTeardownAction(Action<ITaskTeardownContext> action)
7599
_engine.RegisterTaskTeardownAction(action);
76100
}
77101

102+
/// <inheritdoc />
103+
public void RegisterTaskTeardownAction<TData>(Action<ITaskTeardownContext, TData> action) where TData : class
104+
{
105+
_engine.RegisterTaskTeardownAction(action);
106+
}
107+
108+
/// <inheritdoc />
109+
IReadOnlyList<ICakeTaskInfo> ICakeEngine.Tasks => _engine.Tasks;
110+
78111
/// <summary>Gets all registered tasks.</summary>
79112
/// <value>The registered tasks.</value>
80-
public IReadOnlyList<CakeTask> Tasks => _engine.Tasks;
113+
public IReadOnlyList<ICakeTaskInfo> Tasks => _engine.Tasks;
81114

82115
/// <summary>Raised during setup before any tasks are run.</summary>
83116
public event EventHandler<SetupEventArgs> Setup

‎src/Cake.MyGet.Module/Cake.MyGet.Module.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.MyGet.Module</AssemblyName>
77
<PackageId>Cake.MyGet.Module</PackageId>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
98
</PropertyGroup>
109

1110
<ItemGroup>
1211
<ProjectReference Include="..\Cake.Module.Shared\Cake.Module.Shared.csproj" />
1312
</ItemGroup>
1413

1514
<ItemGroup>
16-
<PackageReference Include="Cake.Core" Version="0.24.0" />
17-
<PackageReference Include="Cake.Common" Version="0.24.0" />
15+
<PackageReference Include="Cake.Core" Version="0.28.1" />
16+
<PackageReference Include="Cake.Common" Version="0.28.1" />
1817
</ItemGroup>
1918

2019
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Cake.MyGet.Module/MyGetEngine.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class MyGetEngine : CakeEngineBase
1111
private ICakeLog _log;
1212
private System.Diagnostics.Stopwatch _stopwatch;
1313

14-
public MyGetEngine(ICakeLog log) : base(new CakeEngine(log))
14+
public MyGetEngine(ICakeDataService dataService, ICakeLog log) : base(new CakeEngine(dataService, log))
1515
{
1616
_log = log;
1717
//_engine.Setup += BuildSetup;

‎src/Cake.TFBuild.Module/Cake.TFBuild.Module.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TFBuild.Module</AssemblyName>
77
<PackageId>Cake.TFBuild.Module</PackageId>
8-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
98
</PropertyGroup>
109

1110
<ItemGroup>
1211
<ProjectReference Include="..\Cake.Module.Shared\Cake.Module.Shared.csproj" />
1312
</ItemGroup>
1413

1514
<ItemGroup>
16-
<PackageReference Include="Cake.Core" Version="0.24.0" />
17-
<PackageReference Include="Cake.Common" Version="0.24.0" />
15+
<PackageReference Include="Cake.Core" Version="0.28.1" />
16+
<PackageReference Include="Cake.Common" Version="0.28.1" />
1817
</ItemGroup>
1918

2019
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Cake.TFBuild.Module/TFBuildEngine.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ public sealed class TFBuildEngine : CakeEngineBase
1717
/// <summary>
1818
/// Initializes a new instance of the <see cref="TFBuildEngine"/> type.
1919
/// </summary>
20+
/// <param name="dataService"></param>
2021
/// <param name="log">The log.</param>
21-
public TFBuildEngine(ICakeLog log) : base(new CakeEngine(log))
22+
public TFBuildEngine(ICakeDataService dataService, ICakeLog log) : base(new CakeEngine(dataService, log))
2223
{
2324
_engine.Setup += BuildSetup;
2425
_engine.TaskSetup += OnTaskSetup;

‎src/Cake.TeamCity.Module/Cake.TeamCity.Module.csproj‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TeamCity.Module</AssemblyName>
77
<PackageId>Cake.TeamCity.Module</PackageId>
8-
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
9-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
10-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
168
</PropertyGroup>
179

1810
<ItemGroup>
1911
<ProjectReference Include="..\Cake.Module.Shared\Cake.Module.Shared.csproj" />
2012
</ItemGroup>
2113

2214
<ItemGroup>
23-
<PackageReference Include="Cake.Core" Version="0.24.0" />
24-
<PackageReference Include="Cake.Common" Version="0.24.0" />
15+
<PackageReference Include="Cake.Core" Version="0.28.1" />
16+
<PackageReference Include="Cake.Common" Version="0.28.1" />
2517
</ItemGroup>
2618

2719
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">

‎src/Cake.TeamCity.Module/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)