Skip to content

Commit c65b1a7

Browse files
Update Ookii.Dialogs.Wpf build process to use Cake v2.0.0 (#81)
1 parent ab7f0b1 commit c65b1a7

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "1.3.0",
6+
"version": "2.0.0",
77
"commands": [
88
"dotnet-cake"
99
]

build.cake

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#addin "nuget:?package=Cake.MinVer&version=1.0.1"
2-
#addin "nuget:?package=Cake.Args&version=1.0.1"
1+
#addin "nuget:?package=Cake.MinVer&version=2.0.0"
2+
#addin "nuget:?package=Cake.Args&version=2.0.0"
33

44
var target = ArgumentOrDefault<string>("target") ?? "pack";
55
var buildVersion = MinVer(s => s.WithTagPrefix("v").WithDefaultPreReleasePhase("preview"));
@@ -15,7 +15,7 @@ Task("restore")
1515
.IsDependentOn("clean")
1616
.Does(() =>
1717
{
18-
DotNetCoreRestore("./Ookii.Dialogs.Wpf.sln", new DotNetCoreRestoreSettings
18+
DotNetRestore("./Ookii.Dialogs.Wpf.sln", new DotNetRestoreSettings
1919
{
2020
LockedMode = true,
2121
});
@@ -25,12 +25,12 @@ Task("build")
2525
.IsDependentOn("restore")
2626
.DoesForEach(new[] { "Debug", "Release" }, (configuration) =>
2727
{
28-
DotNetCoreBuild("./Ookii.Dialogs.Wpf.sln", new DotNetCoreBuildSettings
28+
DotNetBuild("./Ookii.Dialogs.Wpf.sln", new DotNetBuildSettings
2929
{
3030
Configuration = configuration,
3131
NoRestore = true,
3232
NoIncremental = false,
33-
MSBuildSettings = new DotNetCoreMSBuildSettings
33+
MSBuildSettings = new DotNetMSBuildSettings
3434
{
3535
Version = buildVersion.Version,
3636
AssemblyVersion = buildVersion.AssemblyVersion,
@@ -44,7 +44,7 @@ Task("test")
4444
.IsDependentOn("build")
4545
.Does(() =>
4646
{
47-
var settings = new DotNetCoreTestSettings
47+
var settings = new DotNetTestSettings
4848
{
4949
Configuration = "Release",
5050
NoRestore = true,
@@ -54,7 +54,7 @@ Task("test")
5454
var projectFiles = GetFiles("./test/**/*.csproj");
5555
foreach (var file in projectFiles)
5656
{
57-
DotNetCoreTest(file.FullPath, settings);
57+
DotNetTest(file.FullPath, settings);
5858
}
5959
});
6060

@@ -64,30 +64,30 @@ Task("pack")
6464
{
6565
var releaseNotes = $"https://github.com/ookii-dialogs/ookii-dialogs-wpf/releases/tag/v{buildVersion.Version}";
6666

67-
DotNetCorePack("./src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.csproj", new DotNetCorePackSettings
67+
DotNetPack("./src/Ookii.Dialogs.Wpf/Ookii.Dialogs.Wpf.csproj", new DotNetPackSettings
6868
{
6969
Configuration = "Release",
7070
NoRestore = true,
7171
NoBuild = true,
7272
IncludeSymbols = true,
7373
IncludeSource = true,
7474
OutputDirectory = "./artifact/nuget",
75-
MSBuildSettings = new DotNetCoreMSBuildSettings
75+
MSBuildSettings = new DotNetMSBuildSettings
7676
{
7777
Version = buildVersion.Version,
7878
PackageReleaseNotes = releaseNotes,
7979
},
8080
});
8181

82-
DotNetCorePack("./src/Ookii.Dialogs/Ookii.Dialogs.csproj", new DotNetCorePackSettings
82+
DotNetPack("./src/Ookii.Dialogs/Ookii.Dialogs.csproj", new DotNetPackSettings
8383
{
8484
Configuration = "Release",
8585
NoRestore = true,
8686
NoBuild = true,
8787
IncludeSymbols = false,
8888
IncludeSource = false,
8989
OutputDirectory = "./artifact/nuget",
90-
MSBuildSettings = new DotNetCoreMSBuildSettings
90+
MSBuildSettings = new DotNetMSBuildSettings
9191
{
9292
Version = buildVersion.Version,
9393
PackageReleaseNotes = releaseNotes,
@@ -113,15 +113,15 @@ Task("push")
113113
return;
114114
}
115115

116-
var nugetPushSettings = new DotNetCoreNuGetPushSettings
116+
var nugetPushSettings = new DotNetNuGetPushSettings
117117
{
118118
Source = url,
119119
ApiKey = apiKey,
120120
};
121121

122122
foreach (var nugetPackageFile in GetFiles("./artifact/nuget/*.nupkg"))
123123
{
124-
DotNetCoreNuGetPush(nugetPackageFile.FullPath, nugetPushSettings);
124+
DotNetNuGetPush(nugetPackageFile.FullPath, nugetPushSettings);
125125
}
126126
});
127127

0 commit comments

Comments
 (0)