GH2886/2904: Bring Frosting up to speed #2946

patriksvensson · 2020-11-15T04:54:32Z

Contains some unavoidable breaking changes.

devlead

Frosting Integration test needs to be updated to cater for the breaking changes.

devlead · 2020-12-01T15:19:23Z

Todo:

* [ ]  Version number in template

Think this is already fixed by param TemplateVersion?
If running in CI that is passed

cake/build/parameters.cake

Lines 120 to 123 in 11dc243

    
           if (!IsLocalBuild) 
        
           { 
        
               MSBuildSettings.WithProperty("TemplateVersion", Version.SemVersion); 
        
           }

and build.csproj is poked

cake/src/Cake.Frosting.Template/Cake.Frosting.Template.csproj

Lines 26 to 28 in 11dc243

    
           <Target Name="VersionBuild" BeforeTargets="PrepareForBuild" Condition="'$(TemplateVersion)'!=''"> 
        
            <XmlPoke XmlInputPath="templates\cakefrosting\build\Build.csproj" Query="Project/ItemGroup/PackageReference/@Version" Value="$(TemplateVersion)" /> 
        
           </Target>

devlead

After adjusted the following in integration tests

using Cake.Core;
using Cake.Frosting;
+using Microsoft.Extensions.DependencyInjection;
 
 public class Program : IFrostingStartup
 {
     public static int Main(string[] args)
-    {
-        // Create the host.
-        var host = new CakeHostBuilder()
-            .WithArguments(args)
+        => new CakeHost()
             .UseStartup<Program>()
-            .Build();
-
-        // Run the host.
-        return host.Run();
-    }
+            .Run(args);
 
-    public void Configure(ICakeServices services)
+    public void Configure(IServiceCollection services)
     {
         services.UseContext<Context>();
         services.UseLifetime<Lifetime>();
         services.UseWorkingDirectory("..");
    }
}

CI seems to be happier.

@patriksvensson as I commented earlier by the looks of it template versioning seems to work already?
Was there anything else you wanted to add before taking out of WIP?

Other than that this LGTM 👍

pascalberger

One comment for a smaller issue. Beside that we should create issues for the breaking changes introduced with this PR so that they end up in release notes.

pascalberger · 2020-12-01T18:47:41Z

src/Cake.Frosting.Template/Cake.Frosting.Template.csproj

    <Compile Remove="**\*" />
  </ItemGroup>

+  <ItemGroup>
+    <None Remove="build.ps1" />
+    <None Remove="build.sh" />


Why are these two lines required?

🤷‍♂️

pascalberger · 2020-12-02T13:28:55Z

src/Cake.Frosting.Template/templates/cakefrosting/build.ps1

@@ -0,0 +1,2 @@
+dotnet run --project build/Build.csproj -- $args


We no longer want to download .NET as part of the bootstrapper? What's the reason for this?
Otherwise #2960 would be a solution using global.json.

Should the standard bootstrappers install .NET?
Maybe a good thing to keep these as simple as possible.
The template itself already requires .NET Core / .NET 5 to be installed.
I kinda like the simplicity of what's suggested here.
Maybe better to document dotnet new globaljson and have more advanced bootstrappers in our resources repo?

I was never team "Install .NET in bootstrapper" 😉 It's just what most people seem to prefer nowadays, and I wanted to bring it up to discussion, since it's quite a hidden change. Template requiring .NET to be installed probably isn't an argument since people / machine running build in most cases is not the same which did run the template.

@gep13 Did you already though about how bootstrappers in resources repo should look like for .NET tool and .NET Core regarding installation of .NET?

@pascalberger I haven't come to a final decision about how these should look yet. I am still thinking that installing .Net locally into the repository folder, based on what is in the global.json is a good idea though. I liked what was done with the jsonfile parameter, and I thought about putting an if statement round that to either pass it in or not, based on the global.json file being present.

I don't think that the frosting bootstrapper should install .NET. It should just be a easy way to run a build which exists in another directory.

Then it maybe should push / change / pop directory so it's executed in script directory?

That's not needed since the working directory already is the script directory. Working directory should imo not be set by a script but be explicitly stated by the person calling the script

Contains some unavoidable breaking changes.

pascalberger · 2020-12-08T13:07:42Z

src/Cake.Cli/Cake.Cli.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyName>Cake.Cli</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>


Since this is also used in Cake.Core it should also target net46

It's not used in Cake.Core, it references Cake.Core though.

For net46 won't work because of dependencies, it could and probably should target net461 too as Cake.exe does.

I can add that.

pascalberger

The newly introduced Cake.Cli library needs to be added to

cake/build/parameters.cake

Line 107 in a2f339b

new [] {

to be published.

devlead · 2020-12-08T19:18:56Z

The newly introduced Cake.Cli library needs to be added to

cake/build/parameters.cake

Line 107 in a2f339b

new [] {

to be published.

Good catch I'll add that.

devlead · 2020-12-08T19:46:18Z

@pascalberger Added Cake.Cli NuGet & net461

pascalberger

I didn't go through every single change, but overall it LGTM.

I still want to have proper documentation out for breaking changes in release notes and on website before we push the release out.

devlead · 2020-12-09T07:40:38Z

@patriksvensson your changes have been merged, thanks for your contribution 👍

pascalberger linked an issue Nov 15, 2020 that may be closed by this pull request

(Frosting) Support all commands that Cake does #2886

Closed

patriksvensson mentioned this pull request Nov 17, 2020

(Frosting) Tool installer should respect configuration #2904

Closed

pascalberger linked an issue Nov 17, 2020 that may be closed by this pull request

(Frosting) Tool installer should respect configuration #2904

Closed

devlead requested changes Nov 21, 2020

View reviewed changes

devlead approved these changes Dec 1, 2020

View reviewed changes

devlead changed the title ~~Bring Frosting up to speed~~ GH2886/2904: Bring Frosting up to speed Dec 1, 2020

This was referenced Dec 1, 2020

(GH-2956) Remove build.config from Frosting template #2960

Closed

Wrong Cake version in build.config #2956

Closed

pascalberger linked an issue Dec 1, 2020 that may be closed by this pull request

Wrong Cake version in build.config #2956

Closed

pascalberger requested changes Dec 1, 2020

View reviewed changes

pascalberger linked an issue Dec 1, 2020 that may be closed by this pull request

(Frosting) Align command line parsing with Cake #2893

Closed

patriksvensson marked this pull request as ready for review December 2, 2020 13:26

pascalberger reviewed Dec 2, 2020

View reviewed changes

augustoproiete mentioned this pull request Dec 2, 2020

Bootstrapper templates for Cake dotnet tool cake-build/resources#95

Closed

patriksvensson and others added 2 commits December 7, 2020 11:36

Bring Frosting up to speed

a1cbb58

Contains some unavoidable breaking changes.

Fix integration tests

fbff82e

pascalberger reviewed Dec 8, 2020

View reviewed changes

pascalberger requested changes Dec 8, 2020

View reviewed changes

Add Cake.Cli NuGet & net461

3c5a78c

pascalberger approved these changes Dec 8, 2020

View reviewed changes

devlead merged commit 724d059 into cake-build:release/1.0.0 Dec 9, 2020

devlead mentioned this pull request Dec 9, 2020

(Frosting) Support all commands that Cake does #2886

Closed

pascalberger mentioned this pull request Dec 16, 2020

Add upgrade instruction for Cake 1.0 RC2 cake-build/website#1370

Merged

devlead mentioned this pull request Dec 19, 2020

(Frosting) Add ANSI console #2892

Closed

pascalberger mentioned this pull request Jan 2, 2021

Remove unused parameter #3019

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GH2886/2904: Bring Frosting up to speed #2946

GH2886/2904: Bring Frosting up to speed #2946

patriksvensson commented Nov 15, 2020 •

edited

Loading

devlead left a comment

devlead commented Dec 1, 2020 •

edited

Loading

Todo:

devlead left a comment

pascalberger left a comment

pascalberger Dec 1, 2020

patriksvensson Dec 3, 2020

pascalberger Dec 2, 2020

devlead Dec 2, 2020

pascalberger Dec 2, 2020

gep13 Dec 2, 2020

patriksvensson Dec 3, 2020

devlead Dec 3, 2020

patriksvensson Dec 3, 2020

pascalberger Dec 8, 2020

devlead Dec 8, 2020

pascalberger left a comment

devlead commented Dec 8, 2020

devlead commented Dec 8, 2020

pascalberger left a comment •

edited

Loading

devlead commented Dec 9, 2020

		@@ -0,0 +1,2 @@
		dotnet run --project build/Build.csproj -- $args

GH2886/2904: Bring Frosting up to speed #2946

GH2886/2904: Bring Frosting up to speed #2946

Conversation

patriksvensson commented Nov 15, 2020 • edited Loading

devlead left a comment

Choose a reason for hiding this comment

devlead commented Dec 1, 2020 • edited Loading

Todo:

devlead left a comment

Choose a reason for hiding this comment

pascalberger left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pascalberger left a comment

Choose a reason for hiding this comment

devlead commented Dec 8, 2020

devlead commented Dec 8, 2020

pascalberger left a comment • edited Loading

Choose a reason for hiding this comment

devlead commented Dec 9, 2020

patriksvensson commented Nov 15, 2020 •

edited

Loading

devlead commented Dec 1, 2020 •

edited

Loading

pascalberger left a comment •

edited

Loading