Merge pull request #3089 from arturcic/feature/cake-update

Update cake 2.2.0

build/Directory.Packages.props

@@ -1,11 +1,12 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="2.1.0" />
+        <PackageReference Include="Cake.Common" Version="2.2.0" />
         <PackageReference Include="Cake.Compression" Version="0.2.6" />
-        <PackageReference Include="Cake.Frosting" Version="2.1.0" />
+        <PackageReference Include="Cake.Frosting" Version="2.2.0" />
         <PackageReference Include="Cake.Incubator" Version="7.0.0" />
+        <PackageReference Include="Cake.DotNetLocalTools.Module" Version="1.0.2" />
 
-        <PackageReference Include="Cake.Docker" Version="1.1.1" />
+        <PackageReference Include="Cake.Docker" Version="1.1.2" />
 
     </ItemGroup>
 </Project>

build/artifacts/Program.cs

@@ -1,6 +1,11 @@
 using Artifacts;
+using Common.Lifetime;
+using Common.Utilities;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/build/Program.cs

@@ -1,6 +1,12 @@
 using Build;
+using Common.Lifetime;
+using Common.Utilities;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
+    .InstallNugetTool(Tools.NugetCmd, Tools.Versions[Tools.NugetCmd])
     .Run(args);

build/common/Utilities/CakeHostExtensions.cs

@@ -0,0 +1,24 @@
+using Cake.DotNetLocalTools.Module;
+
+namespace Common.Utilities;
+
+public static class ServicesExtensions
+{
+    public static CakeHost UseRootDirectory(this CakeHost host)
+    {
+        host = host.ConfigureServices(services => services.UseWorkingDirectory(Extensions.GetRootDirectory()));
+        return host;
+    }
+
+    public static CakeHost InstallToolsFromRootManifest(this CakeHost host)
+    {
+        host = host.UseModule<LocalToolsModule>().InstallToolsFromManifest(Extensions.GetRootDirectory().CombineWithFilePath("dotnet-tools.json").FullPath);
+        return host;
+    }
+
+    public static CakeHost InstallNugetTool(this CakeHost host, string toolName, string toolVersion)
+    {
+        var toolUrl = new Uri($"nuget:?package={toolName}&version={toolVersion}");
+        return host.ConfigureServices(services => services.UseTool(toolUrl));
+    }
+}

build/common/Utilities/Extensions.cs

@@ -53,7 +53,7 @@ public static DirectoryPath GetRootDirectory()
         var currentPath = DirectoryPath.FromString(Directory.GetCurrentDirectory());
         while (!Directory.Exists(currentPath.Combine(".git").FullPath))
         {
-            currentPath = DirectoryPath.FromString(Directory.GetParent(currentPath.FullPath)?.FullName);
+            currentPath = currentPath.GetParent();
         }
 
         return currentPath;

build/common/Utilities/Tools.cs

@@ -4,18 +4,8 @@ public class Tools
 {
     public const string NugetCmd = "NuGet.CommandLine";
 
-    public const string GitVersion = "GitVersion.Tool";
-    public const string GitReleaseManager = "GitReleaseManager.Tool";
-    public const string Codecov = "Codecov.Tool";
-    public const string Wyam2 = "Wyam2.Tool";
-
     public static readonly Dictionary<string, string> Versions = new()
     {
-        { NugetCmd, "6.0.0" },
-
-        { GitVersion, "5.8.3" },
-        { GitReleaseManager, "0.13.0" },
-        { Codecov, "1.13.0" },
-        { Wyam2, "3.0.0-rc3&prerelease" },
+        { NugetCmd, "6.1.0" },
     };
 }

build/docker/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Docker;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/docs/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Docs;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/publish/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Publish;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

build/release/Program.cs

@@ -1,6 +1,11 @@
+using Common.Lifetime;
+using Common.Utilities;
 using Release;
 
 return new CakeHost()
     .UseContext<BuildContext>()
-    .UseStartup<Startup>()
+    .UseLifetime<BuildLifetime>()
+    .UseTaskLifetime<BuildTaskLifetime>()
+    .UseRootDirectory()
+    .InstallToolsFromRootManifest()
     .Run(args);

dotnet-tools.json

@@ -9,7 +9,7 @@
             ]
         },
         "gitversion.tool": {
-            "version": "5.8.2",
+            "version": "5.10.1",
             "commands": [
                 "dotnet-gitversion"
             ]
@@ -20,10 +20,10 @@
                 "dotnet-gitreleasemanager"
             ]
         },
-        "wyam.tool": {
-            "version": "2.2.9",
+        "Wyam2.Tool": {
+            "version": "3.0.0-rc3",
             "commands": [
-                "wyam"
+                "wyam2"
             ]
         }
     }