Skip to content

Commit 59e17fc

Browse files
Bump Cake: 2.0.0->3.0.0 (#2267)
1 parent ff5dbe6 commit 59e17fc

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

build/Build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Cake.Frosting" Version="2.0.0" />
9-
<PackageReference Include="Cake.FileHelpers" Version="5.0.0" />
8+
<PackageReference Include="Cake.Frosting" Version="3.0.0" />
9+
<PackageReference Include="Cake.FileHelpers" Version="6.0.0" />
1010
</ItemGroup>
1111
</Project>

build/Program.cs

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using System.IO;
32
using System.Linq;
43
using System.Text;
@@ -9,13 +8,12 @@
98
using Cake.Common.IO;
109
using Cake.Common.Net;
1110
using Cake.Common.Tools.DotNet;
11+
using Cake.Common.Tools.DotNet.Build;
1212
using Cake.Common.Tools.DotNet.MSBuild;
13+
using Cake.Common.Tools.DotNet.Pack;
1314
using Cake.Common.Tools.DotNet.Restore;
1415
using Cake.Common.Tools.DotNet.Run;
15-
using Cake.Common.Tools.DotNetCore.Build;
16-
using Cake.Common.Tools.DotNetCore.MSBuild;
17-
using Cake.Common.Tools.DotNetCore.Pack;
18-
using Cake.Common.Tools.DotNetCore.Test;
16+
using Cake.Common.Tools.DotNet.Test;
1917
using Cake.Core;
2018
using Cake.Core.IO;
2119
using Cake.FileHelpers;
@@ -59,8 +57,8 @@ public class BuildContext : FrostingContext
5957
public FilePath IntegrationTestsProjectFile { get; }
6058
public FilePath TemplatesTestsProjectFile { get; }
6159
public FilePathCollection AllPackableSrcProjects { get; }
62-
63-
public DotNetCoreMSBuildSettings MsBuildSettings { get; }
60+
61+
public DotNetMSBuildSettings MsBuildSettings { get; }
6462

6563
private IAppVeyorProvider AppVeyor => this.BuildSystem().AppVeyor;
6664
public bool IsRunningOnAppVeyor => AppVeyor.IsRunningOnAppVeyor;
@@ -103,7 +101,7 @@ public BuildContext(ICakeContext context)
103101
AllPackableSrcProjects = new FilePathCollection(context.GetFiles(RootDirectory.FullPath + "/src/**/*.csproj")
104102
.Where(p => !p.FullPath.Contains("Disassembler")));
105103

106-
MsBuildSettings = new DotNetCoreMSBuildSettings
104+
MsBuildSettings = new DotNetMSBuildSettings
107105
{
108106
MaxCpuCount = 1
109107
};
@@ -118,9 +116,9 @@ public BuildContext(ICakeContext context)
118116
}
119117
}
120118

121-
private DotNetCoreTestSettings GetTestSettingsParameters(FilePath logFile, string tfm)
119+
private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tfm)
122120
{
123-
var settings = new DotNetCoreTestSettings
121+
var settings = new DotNetTestSettings
124122
{
125123
Configuration = BuildConfiguration,
126124
Framework = tfm,
@@ -318,7 +316,7 @@ public class BuildTask : FrostingTask<BuildContext>
318316
{
319317
public override void Run(BuildContext context)
320318
{
321-
context.DotNetBuild(context.SolutionFile.FullPath, new DotNetCoreBuildSettings
319+
context.DotNetBuild(context.SolutionFile.FullPath, new DotNetBuildSettings
322320
{
323321
Configuration = context.BuildConfiguration,
324322
NoRestore = true,
@@ -398,14 +396,14 @@ public override bool ShouldRun(BuildContext context)
398396

399397
public override void Run(BuildContext context)
400398
{
401-
var settingsSrc = new DotNetCorePackSettings
399+
var settingsSrc = new DotNetPackSettings
402400
{
403401
Configuration = context.BuildConfiguration,
404402
OutputDirectory = context.ArtifactsDirectory.FullPath,
405403
ArgumentCustomization = args => args.Append("--include-symbols").Append("-p:SymbolPackageFormat=snupkg"),
406404
MSBuildSettings = context.MsBuildSettings
407405
};
408-
var settingsTemplate = new DotNetCorePackSettings
406+
var settingsTemplate = new DotNetPackSettings
409407
{
410408
Configuration = context.BuildConfiguration,
411409
OutputDirectory = context.ArtifactsDirectory.FullPath,

0 commit comments

Comments
 (0)