Skip to content

Commit 518cb52

Browse files
agc93agc93
committed
Merge branch 'hotfix/0.30.1'
2 parents 497996a + 417f465 commit 518cb52

8 files changed

Lines changed: 32 additions & 47 deletions

File tree

‎ReleaseNotes.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,10 @@
3535
- Supports Cake 0.28.1
3636
- Updated with fixed TC engine, including new build statistics
3737
- Other small fixes
38-
- Thanks @flcdrg and @micsco for contributions!
38+
- Thanks @flcdrg and @micsco for contributions!
39+
40+
# 0.3.1
41+
42+
- Supports Cake 0.30.0
43+
- Retargeted to .NET Standard 2.0 (raise issues if you see new issues from this)
44+
- Thanks again to @flcdrg and @RaringCoder for contributions and testing!

‎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", "netstandard2.0"};
20+
var frameworks = new List<string> { "netstandard2.0"};
2121

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

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.Module.Shared</AssemblyName>
77
<PackageId>Cake.Module.Shared</PackageId>
@@ -14,13 +14,7 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Cake.Core" Version="0.28.1" />
18-
<PackageReference Include="Cake.Common" Version="0.28.1" />
17+
<PackageReference Include="Cake.Core" Version="0.30.0" />
18+
<PackageReference Include="Cake.Common" Version="0.30.0" />
1919
</ItemGroup>
20-
21-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
22-
<Reference Include="System" />
23-
<Reference Include="Microsoft.CSharp" />
24-
</ItemGroup>
25-
2620
</Project>

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ namespace Cake.Module.Shared
88
public abstract class CakeEngineBase : ICakeEngine
99
{
1010
protected readonly ICakeEngine _engine;
11+
12+
/// <summary>
13+
/// Creates a new instance of the base Shared Engine used by CI modules.
14+
/// </summary>
15+
/// <param name="implementation"></param>
1116
protected CakeEngineBase(ICakeEngine implementation)
1217
{
1318
_engine = implementation;
@@ -63,13 +68,13 @@ public void RegisterTeardownAction<TData>(Action<ITeardownContext, TData> action
6368
/// </summary>
6469
/// <param name="context">The context.</param>
6570
/// <param name="strategy">The execution strategy.</param>
66-
/// <param name="target">The target to run.</param>
71+
/// <param name="settings">The execution settings.</param>
6772
/// <returns>
6873
/// The resulting report.
6974
/// </returns>
70-
public Task<CakeReport> RunTargetAsync(ICakeContext context, IExecutionStrategy strategy, string target)
75+
public Task<CakeReport> RunTargetAsync(ICakeContext context, IExecutionStrategy strategy, ExecutionSettings settings)
7176
{
72-
return _engine.RunTargetAsync(context, strategy, target);
77+
return _engine.RunTargetAsync(context, strategy, settings);
7378
}
7479

7580
/// <summary>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.MyGet.Module</AssemblyName>
77
<PackageId>Cake.MyGet.Module</PackageId>
@@ -12,13 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="0.28.1" />
16-
<PackageReference Include="Cake.Common" Version="0.28.1" />
15+
<PackageReference Include="Cake.Core" Version="0.30.0" />
16+
<PackageReference Include="Cake.Common" Version="0.30.0" />
1717
</ItemGroup>
1818

19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
20-
<Reference Include="System" />
21-
<Reference Include="Microsoft.CSharp" />
22-
</ItemGroup>
23-
24-
</Project>
19+
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TFBuild.Module</AssemblyName>
77
<PackageId>Cake.TFBuild.Module</PackageId>
@@ -12,13 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="0.28.1" />
16-
<PackageReference Include="Cake.Common" Version="0.28.1" />
17-
</ItemGroup>
18-
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
20-
<Reference Include="System" />
21-
<Reference Include="Microsoft.CSharp" />
15+
<PackageReference Include="Cake.Core" Version="0.30.0" />
16+
<PackageReference Include="Cake.Common" Version="0.30.0" />
2217
</ItemGroup>
2318

2419
</Project>

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TeamCity.Module</AssemblyName>
77
<PackageId>Cake.TeamCity.Module</PackageId>
@@ -12,13 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="0.28.1" />
16-
<PackageReference Include="Cake.Common" Version="0.28.1" />
17-
</ItemGroup>
18-
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
20-
<Reference Include="System" />
21-
<Reference Include="Microsoft.CSharp" />
15+
<PackageReference Include="Cake.Core" Version="0.30.0" />
16+
<PackageReference Include="Cake.Common" Version="0.30.0" />
2217
</ItemGroup>
2318

2419
</Project>

‎src/Cake.TravisCI.Module/Cake.TravisCI.Module.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyName>Cake.TravisCI.Module</AssemblyName>
77
<PackageId>Cake.TravisCI.Module</PackageId>
@@ -12,13 +12,8 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Cake.Core" Version="0.28.1" />
16-
<PackageReference Include="Cake.Common" Version="0.28.1" />
17-
</ItemGroup>
18-
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
20-
<Reference Include="System" />
21-
<Reference Include="Microsoft.CSharp" />
15+
<PackageReference Include="Cake.Core" Version="0.30.0" />
16+
<PackageReference Include="Cake.Common" Version="0.30.0" />
2217
</ItemGroup>
2318

2419
</Project>

0 commit comments

Comments
 (0)