Skip to content

Commit b6d803b

Browse files
committed
(build) update to cake.frosting 2.0.0-rc2
1 parent 877a14c commit b6d803b

File tree

6 files changed

+27
-197
lines changed

6 files changed

+27
-197
lines changed

build/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Cake.Common" Version="2.0.0-rc0001" />
3+
<PackageReference Include="Cake.Common" Version="2.0.0-rc0002" />
44
<PackageReference Include="Cake.Compression" Version="0.2.6" />
5-
<PackageReference Include="Cake.Frosting" Version="2.0.0-rc0001" />
5+
<PackageReference Include="Cake.Frosting" Version="2.0.0-rc0002" />
66
<PackageReference Include="Cake.Incubator" Version="6.0.0" />
77

88
<PackageReference Include="Cake.Docker" Version="1.0.0" />

build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Cake.Common.Tools.DotNetCore.MSBuild;
21
using Common.Utilities;
32

43
namespace Artifacts.Tasks;
@@ -27,8 +26,7 @@ public override void Run(BuildContext context)
2726
var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
2827
foreach (var framework in frameworks)
2928
{
30-
// TODO update to DotNetMSBuildSettings when available
31-
var dotnetMsBuildSettings = new DotNetCoreMSBuildSettings();
29+
var dotnetMsBuildSettings = new DotNetMSBuildSettings();
3230
dotnetMsBuildSettings.WithProperty("TargetFrameworks", framework);
3331
dotnetMsBuildSettings.WithProperty("TargetFramework", framework);
3432
dotnetMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);

build/build/BuildContext.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Build.Utilities;
2-
using Cake.Common.Tools.DotNetCore.MSBuild;
32
using Common.Utilities;
43

54
namespace Build;
@@ -19,8 +18,7 @@ public class BuildContext : BuildContextBase
1918

2019
public Credentials? Credentials { get; set; }
2120

22-
// TODO update to DotNetMSBuildSettings when available
23-
public DotNetCoreMSBuildSettings MsBuildSettings { get; } = new();
21+
public DotNetMSBuildSettings MsBuildSettings { get; } = new();
2422

2523
public BuildContext(ICakeContext context) : base(context)
2624
{

build/build/Tasks/Test/UnitTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Cake.Common.Tools.DotNet.Test;
33
using Cake.Coverlet;
44
using Cake.Incubator.LoggingExtensions;
5-
using Common.Addins.Cake.Coverlet;
65
using Common.Utilities;
76

87
namespace Build.Tasks;

build/common/Addins/Cake.Coverlet/CoverletAliases.cs

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

build/common/Utilities/ContextExtensions.cs

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,32 @@
1+
using Cake.Common.Tools.DotNet.Test;
2+
using Cake.Coverlet;
3+
using Common.Addins.Cake.Coverlet;
14
using Xunit;
25

36
namespace Common.Utilities;
47

58
public static class ContextExtensions
69
{
10+
public static void DotNetTest(
11+
this ICakeContext context,
12+
FilePath project,
13+
DotNetTestSettings settings,
14+
CoverletSettings coverletSettings)
15+
{
16+
if (context == null)
17+
{
18+
throw new ArgumentNullException(nameof(context));
19+
}
20+
var currentCustomization = settings.ArgumentCustomization;
21+
settings.ArgumentCustomization = (args) => ArgumentsProcessor.ProcessMSBuildArguments(
22+
coverletSettings,
23+
context.Environment,
24+
currentCustomization?.Invoke(args) ?? args,
25+
project);
26+
27+
context.DotNetTest(project.FullPath, settings);
28+
}
29+
730
public static IEnumerable<string> ExecuteCommand(this ICakeContext context, FilePath exe, string? args, DirectoryPath? workDir = null)
831
{
932
var processSettings = new ProcessSettings { Arguments = args, RedirectStandardOutput = true };

0 commit comments

Comments
 (0)