Skip to content

Commit 9e98d8b

Browse files
authored
Fix deprecation warnings in Cake (#586)
+semver:patch
1 parent 18a18d6 commit 9e98d8b

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

appveyor.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ environment:
1414

1515
branches:
1616
only:
17-
- refs/heads/master
17+
- refs/heads/main
1818
- refs/tags/*
1919
- /r/.*/
20-
- master
21-
- develop
20+
- main
2221
- /feat/.*/
2322
- /fix/.*/
2423

build.cake

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#load "./build/parameters.cake"
66

77
BuildParameters parameters = BuildParameters.GetParameters(Context);
8-
DotNetCoreMSBuildSettings msBuildSettings = null;
8+
DotNetMSBuildSettings msBuildSettings = null;
99
bool publishingError = false;
1010

1111
var SolutionPath = "./src/FluentNHibernate.sln";
@@ -29,7 +29,7 @@ Setup((context) =>
2929
var releaseNotes = string.Join("\n",
3030
parameters.ReleaseNotes.Notes.ToArray()).Replace("\"", "\"\"");
3131

32-
msBuildSettings = new DotNetCoreMSBuildSettings()
32+
msBuildSettings = new DotNetMSBuildSettings()
3333
.WithProperty("Version", parameters.Version.SemVersion)
3434
.WithProperty("AssemblyVersion", parameters.Version.AssemblyVersion)
3535
.WithProperty("FileVersion", parameters.Version.Version)
@@ -45,7 +45,7 @@ Task("Clean")
4545
.Does(() =>
4646
{
4747
CleanDirectories(parameters.Paths.Directories.ToClean);
48-
DotNetCoreClean(SolutionPath);
48+
DotNetClean(SolutionPath);
4949
EnsureDirectoryExists(parameters.Paths.Directories.Artifacts);
5050
EnsureDirectoryExists(parameters.Paths.Directories.ArtifactsBinFullFx);
5151
EnsureDirectoryExists(parameters.Paths.Directories.TestResults);
@@ -56,17 +56,17 @@ Task("Restore")
5656
.IsDependentOn("Clean")
5757
.Does(() =>
5858
{
59-
DotNetCoreRestore(SolutionPath, new DotNetCoreRestoreSettings
59+
DotNetRestore(SolutionPath, new DotNetRestoreSettings
6060
{
61-
Verbosity = DotNetCoreVerbosity.Minimal,
61+
Verbosity = DotNetVerbosity.Minimal,
6262
});
6363
});
6464

6565
Task("Build")
6666
.IsDependentOn("Restore")
6767
.Does(() =>
6868
{
69-
DotNetBuild(SolutionPath, new DotNetCoreBuildSettings
69+
DotNetBuild(SolutionPath, new DotNetBuildSettings
7070
{
7171
Configuration = parameters.Configuration,
7272
MSBuildSettings = msBuildSettings
@@ -83,15 +83,15 @@ Task("Test")
8383

8484
foreach(var project in testProjects)
8585
{
86-
DotNetTest(project.ToString(), new DotNetCoreTestSettings
86+
DotNetTest(project.ToString(), new DotNetTestSettings
8787
{
8888
Framework = "net461",
8989
NoBuild = true,
9090
NoRestore = true,
9191
Configuration = parameters.Configuration
9292
});
9393

94-
DotNetTest(project.ToString(), new DotNetCoreTestSettings
94+
DotNetTest(project.ToString(), new DotNetTestSettings
9595
{
9696
Framework = "net6.0",
9797
NoBuild = true,
@@ -259,11 +259,11 @@ private void PublishProjects(
259259
string artifactsBin,
260260
string versionSuffix,
261261
string configuration,
262-
DotNetCoreMSBuildSettings msBuildSettings)
262+
DotNetMSBuildSettings msBuildSettings)
263263
{
264264
foreach(var project in projectNames)
265265
{
266-
DotNetCorePublish($"./src/{project}", new DotNetCorePublishSettings
266+
DotNetPublish($"./src/{project}", new DotNetPublishSettings
267267
{
268268
Framework = framework,
269269
VersionSuffix = versionSuffix,
@@ -284,7 +284,7 @@ private void PackProjects(
284284
{
285285
foreach(var project in projectNames) {
286286
var projectPath = File($"./src/{project}/{project}.csproj");
287-
DotNetCorePack(projectPath.ToString(), new DotNetCorePackSettings
287+
DotNetPack(projectPath.ToString(), new DotNetPackSettings
288288
{
289289
Configuration = configuration,
290290
MSBuildSettings = msBuildSettings,

0 commit comments

Comments
 (0)