Merge pull request #3694 from augustoproiete-forks/update-build-to-us…

…e-new-dotnet-aliases GH3685: Update build to use new dotnet aliases
cake-build · Nov 27, 2021 · 0de2adc · 0de2adc
2 parents 8855ff7 + e11cbad
commit 0de2adc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/build.cake b/build.cake
@@ -95,9 +95,9 @@ Task("Restore-NuGet-Packages")
     .IsDependentOn("Clean")
     .Does<BuildParameters>((context, parameters) =>
 {
-    DotNetCoreRestore("./src/Cake.sln", new DotNetCoreRestoreSettings
+    DotNetRestore("./src/Cake.sln", new DotNetRestoreSettings
     {
-        Verbosity = DotNetCoreVerbosity.Minimal,
+        Verbosity = DotNetVerbosity.Minimal,
         Sources = new [] { "https://api.nuget.org/v3/index.json" },
         MSBuildSettings = parameters.MSBuildSettings
     });
@@ -109,7 +109,7 @@ Task("Build")
 {
     // Build the solution.
     var path = MakeAbsolute(new DirectoryPath("./src/Cake.sln"));
-    DotNetCoreBuild(path.FullPath, new DotNetCoreBuildSettings()
+    DotNetBuild(path.FullPath, new DotNetBuildSettings
     {
         Configuration = parameters.Configuration,
         NoRestore = true,
@@ -128,7 +128,7 @@ Task("Run-Unit-Tests")
         FilePath testResultsPath = MakeAbsolute(parameters.Paths.Directories.TestResults
                                     .CombineWithFilePath($"{project.GetFilenameWithoutExtension()}_{framework}_TestResults.xml"));
 
-        DotNetCoreTest(project.FullPath, new DotNetCoreTestSettings
+        DotNetTest(project.FullPath, new DotNetTestSettings
         {
             Framework = framework,
             NoBuild = true,
@@ -153,7 +153,7 @@ Task("Create-NuGet-Packages")
             continue;
         }
 
-        DotNetCorePack(project.FullPath, new DotNetCorePackSettings {
+        DotNetPack(project.FullPath, new DotNetPackSettings {
             Configuration = parameters.Configuration,
             OutputDirectory = parameters.Paths.Directories.NuGetRoot,
             NoBuild = true,
@@ -245,12 +245,12 @@ Task("Publish-MyGet")
     foreach(var package in parameters.Packages.NuGet)
     {
         // Push the package.
-        var settings = new DotNetCoreNuGetPushSettings {
+        var settings = new DotNetNuGetPushSettings {
             ApiKey = apiKey,
             Source = apiUrl
         };
 
-        DotNetCoreNuGetPush(package.PackagePath.FullPath, settings);
+        DotNetNuGetPush(package.PackagePath.FullPath, settings);
     }
 })
 .OnError<BuildParameters>((exception, parameters) =>
@@ -280,12 +280,12 @@ Task("Publish-NuGet")
     foreach(var package in parameters.Packages.NuGet)
     {
         // Push the package.
-        var settings = new DotNetCoreNuGetPushSettings {
+        var settings = new DotNetNuGetPushSettings {
             ApiKey = apiKey,
             Source = apiUrl
         };
 
-        DotNetCoreNuGetPush(package.PackagePath.FullPath, settings);
+        DotNetNuGetPush(package.PackagePath.FullPath, settings);
     }
 })
 .OnError<BuildParameters>((exception, parameters) =>
@@ -338,10 +338,10 @@ Task("Frosting-Integration-Tests")
                 new FilePath("tests/integration/Cake.Frosting/build/Build.csproj")
             );
 
-            DotNetCoreBuild(project.FullPath,
-                new DotNetCoreBuildSettings
+            DotNetBuild(project.FullPath,
+                new DotNetBuildSettings
                 {
-                    Verbosity = DotNetCoreVerbosity.Quiet,
+                    Verbosity = DotNetVerbosity.Quiet,
                     Configuration = parameters.Configuration,
                     MSBuildSettings = parameters.MSBuildSettings
                 });
@@ -363,10 +363,10 @@ Task("Frosting-Integration-Tests")
     {
         Information("Testing: {0}", test.Framework);
 
-        DotNetCoreRun(test.Project.FullPath,
+        DotNetRun(test.Project.FullPath,
             new ProcessArgumentBuilder()
                 .AppendSwitchQuoted("--verbosity", "=", "quiet"),
-            new DotNetCoreRunSettings
+            new DotNetRunSettings
             {
                 Configuration = parameters.Configuration,
                 Framework = test.Framework,

diff --git a/build/parameters.cake b/build/parameters.cake
@@ -28,7 +28,7 @@ public class BuildParameters
     public BuildPaths Paths { get; }
     public BuildPackages Packages { get; }
     public bool PublishingError { get; set; }
-    public DotNetCoreMSBuildSettings MSBuildSettings { get; }
+    public DotNetMSBuildSettings MSBuildSettings { get; }
 
     public bool ShouldPublish
     {
@@ -118,7 +118,7 @@ public class BuildParameters
                                 ReleaseNotes.Notes.ToArray()
                             );
 
-        MSBuildSettings = new DotNetCoreMSBuildSettings {
+        MSBuildSettings = new DotNetMSBuildSettings {
                                 Version = Version.SemVersion,
                                 AssemblyVersion = Version.Version,
                                 FileVersion = Version.Version,