Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Cake to 3.0.0 #2267

Merged
merged 1 commit into from
Feb 13, 2023
Merged

Bump Cake to 3.0.0 #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Frosting" Version="2.0.0" />
<PackageReference Include="Cake.FileHelpers" Version="5.0.0" />
<PackageReference Include="Cake.Frosting" Version="3.0.0" />
<PackageReference Include="Cake.FileHelpers" Version="6.0.0" />
</ItemGroup>
</Project>
24 changes: 11 additions & 13 deletions build/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using System;
using System.IO;
using System.Linq;
using System.Text;
Expand All @@ -9,13 +8,12 @@
using Cake.Common.IO;
using Cake.Common.Net;
using Cake.Common.Tools.DotNet;
using Cake.Common.Tools.DotNet.Build;
using Cake.Common.Tools.DotNet.MSBuild;
using Cake.Common.Tools.DotNet.Pack;
using Cake.Common.Tools.DotNet.Restore;
using Cake.Common.Tools.DotNet.Run;
using Cake.Common.Tools.DotNetCore.Build;
using Cake.Common.Tools.DotNetCore.MSBuild;
using Cake.Common.Tools.DotNetCore.Pack;
using Cake.Common.Tools.DotNetCore.Test;
using Cake.Common.Tools.DotNet.Test;
using Cake.Core;
using Cake.Core.IO;
using Cake.FileHelpers;
Expand Down Expand Up @@ -59,8 +57,8 @@ public class BuildContext : FrostingContext
public FilePath IntegrationTestsProjectFile { get; }
public FilePath TemplatesTestsProjectFile { get; }
public FilePathCollection AllPackableSrcProjects { get; }

public DotNetCoreMSBuildSettings MsBuildSettings { get; }
public DotNetMSBuildSettings MsBuildSettings { get; }

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

MsBuildSettings = new DotNetCoreMSBuildSettings
MsBuildSettings = new DotNetMSBuildSettings
{
MaxCpuCount = 1
};
Expand All @@ -118,9 +116,9 @@ public BuildContext(ICakeContext context)
}
}

private DotNetCoreTestSettings GetTestSettingsParameters(FilePath logFile, string tfm)
private DotNetTestSettings GetTestSettingsParameters(FilePath logFile, string tfm)
{
var settings = new DotNetCoreTestSettings
var settings = new DotNetTestSettings
{
Configuration = BuildConfiguration,
Framework = tfm,
Expand Down Expand Up @@ -318,7 +316,7 @@ public class BuildTask : FrostingTask<BuildContext>
{
public override void Run(BuildContext context)
{
context.DotNetBuild(context.SolutionFile.FullPath, new DotNetCoreBuildSettings
context.DotNetBuild(context.SolutionFile.FullPath, new DotNetBuildSettings
{
Configuration = context.BuildConfiguration,
NoRestore = true,
Expand Down Expand Up @@ -398,14 +396,14 @@ public override bool ShouldRun(BuildContext context)

public override void Run(BuildContext context)
{
var settingsSrc = new DotNetCorePackSettings
var settingsSrc = new DotNetPackSettings
{
Configuration = context.BuildConfiguration,
OutputDirectory = context.ArtifactsDirectory.FullPath,
ArgumentCustomization = args => args.Append("--include-symbols").Append("-p:SymbolPackageFormat=snupkg"),
MSBuildSettings = context.MsBuildSettings
};
var settingsTemplate = new DotNetCorePackSettings
var settingsTemplate = new DotNetPackSettings
{
Configuration = context.BuildConfiguration,
OutputDirectory = context.ArtifactsDirectory.FullPath,
Expand Down