From 59e17fc30b85439072dd070007a308be9fe67c18 Mon Sep 17 00:00:00 2001
From: Andrey Akinshin <andrey.akinshin@gmail.com>
Date: Mon, 13 Feb 2023 17:10:51 +0100
Subject: [PATCH] Bump Cake: 2.0.0->3.0.0 (#2267)

---
 build/Build.csproj |  4 ++--
 build/Program.cs   | 24 +++++++++++-------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/build/Build.csproj b/build/Build.csproj
index 2e8cb69919..468904e208 100644
--- a/build/Build.csproj
+++ b/build/Build.csproj
@@ -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>
\ No newline at end of file
diff --git a/build/Program.cs b/build/Program.cs
index 8c46eb8def..e19a54b66f 100644
--- a/build/Program.cs
+++ b/build/Program.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -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;
@@ -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;
@@ -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
         };
@@ -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,
@@ -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,
@@ -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,