Upgrade Cake to 1.0.0-RC2

dnnsoftware · Jan 25, 2021 · 38c0091 · 38c0091
1 parent 4d012fe
commit 38c0091
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/Build/Build.csproj b/Build/Build.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Cake.FileHelpers" Version="3.3.0" />
-    <PackageReference Include="Cake.Frosting" Version="1.0.0-rc0001" />
+    <PackageReference Include="Cake.Frosting" Version="1.0.0-rc0002" />
     <PackageReference Include="Cake.Git" Version="0.22.0" />
-    <PackageReference Include="Cake.NuGet" Version="1.0.0-rc0001" />
+    <PackageReference Include="Cake.NuGet" Version="1.0.0-rc0002" />
     <PackageReference Include="Cake.XdtTransform" Version="0.18.1" />
-    <PackageReference Include="Dnn.CakeUtils" Version="1.1.10" />
+    <PackageReference Include="Dnn.CakeUtils" Version="1.1.11" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
   </ItemGroup>

diff --git a/Build/Program.cs b/Build/Program.cs
@@ -1,38 +1,18 @@
 using System;
-using System.Collections.Generic;
-using System.IO;
-using Cake.Core;
-using Cake.Core.Configuration;
+
 using Cake.Frosting;
-using Cake.NuGet;
 
-public class Program : IFrostingStartup
+public class Program
 {
     public static int Main(string[] args)
     {
-        // Create the host.
-        var host = new CakeHostBuilder()
-            .WithArguments(args)
-            .UseStartup<Program>()
-            .Build();
-
-        // Run the host.
-        return host.Run();
-    }
-
-    public void Configure(ICakeServices services)
-    {
-        services.UseContext<Context>();
-        services.UseLifetime<Lifetime>();
-        services.UseWorkingDirectory("..");
-
-        // from https://github.com/cake-build/cake/discussions/2931
-        var module = new NuGetModule(new CakeConfiguration(new Dictionary<string, string>()));
-        module.Register(services);
-
-        services.UseTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"));
-        services.UseTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"));
-        services.UseTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"));
-        services.UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"));
+        return new CakeHost()
+            .UseContext<Context>()
+            .UseLifetime<Lifetime>()
+            .UseTool(new Uri("nuget:?package=GitVersion.CommandLine&version=5.0.1"))
+            .UseTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=16.8.0"))
+            .UseTool(new Uri("nuget:?package=NUnitTestAdapter&version=2.3.0"))
+            .UseTool(new Uri("nuget:?package=NuGet.CommandLine&version=5.8.0"))
+            .Run(args);
     }
 }