(build) update to cake.frosting 2.0.0-rc1

arturcic · arturcic · commit 7a66b0c160c3 · 2021-11-08T23:09:06.000+01:00
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
@@ -27,9 +27,9 @@
         <Using Include="Cake.Core.Diagnostics" />
         <Using Include="Cake.Core.IO" />
         <Using Include="Cake.Core.Tooling" />
-        <Using Include="Cake.Common.Tools.DotNetCore" />
-        <Using Include="Cake.Common.Tools.DotNetCore.Build" />
-        <Using Include="Cake.Common.Tools.DotNetCore.MSBuild" />
+        <Using Include="Cake.Common.Tools.DotNet" />
+        <Using Include="Cake.Common.Tools.DotNet.Build" />
+        <Using Include="Cake.Common.Tools.DotNet.MSBuild" />
         <Using Include="Cake.Common.Tools.MSBuild" />
         <Using Include="Cake.Docker" />
         <Using Include="Cake.Frosting" />
diff --git a/build/Directory.Packages.props b/build/Directory.Packages.props
@@ -1,8 +1,8 @@
 ﻿<Project>
     <ItemGroup>
-        <PackageReference Include="Cake.Common" Version="1.3.0" />
+        <PackageReference Include="Cake.Common" Version="2.0.0-rc0001" />
         <PackageReference Include="Cake.Compression" Version="0.2.6" />
-        <PackageReference Include="Cake.Frosting" Version="1.3.0" />
+        <PackageReference Include="Cake.Frosting" Version="2.0.0-rc0001" />
         <PackageReference Include="Cake.Incubator" Version="6.0.0" />
 
         <PackageReference Include="Cake.Docker" Version="1.0.0" />
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -1,3 +1,4 @@
+using Cake.Common.Tools.DotNetCore.MSBuild;
 using Common.Utilities;
 
 namespace Artifacts.Tasks;
@@ -26,17 +27,18 @@ public override void Run(BuildContext context)
         var frameworks = new[] { Constants.CoreFxVersion31, Constants.NetVersion50, Constants.NetVersion60 };
         foreach (var framework in frameworks)
         {
-            var dotnetCoreMsBuildSettings = new DotNetCoreMSBuildSettings();
-            dotnetCoreMsBuildSettings.WithProperty("TargetFrameworks", framework);
-            dotnetCoreMsBuildSettings.WithProperty("TargetFramework", framework);
-            dotnetCoreMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
+            // TODO update to DotNetMSBuildSettings when available
+            var dotnetMsBuildSettings = new DotNetCoreMSBuildSettings();
+            dotnetMsBuildSettings.WithProperty("TargetFrameworks", framework);
+            dotnetMsBuildSettings.WithProperty("TargetFramework", framework);
+            dotnetMsBuildSettings.WithProperty("GitVersionMsBuildVersion", version);
             var projPath = context.MakeAbsolute(Paths.Integration.Combine("core"));
 
-            context.DotNetCoreBuild(projPath.FullPath, new DotNetCoreBuildSettings
+            context.DotNetBuild(projPath.FullPath, new DotNetBuildSettings
             {
-                Verbosity = DotNetCoreVerbosity.Minimal,
+                Verbosity = DotNetVerbosity.Minimal,
                 Configuration = context.MsBuildConfiguration,
-                MSBuildSettings = dotnetCoreMsBuildSettings,
+                MSBuildSettings = dotnetMsBuildSettings,
                 Sources = new[] { nugetSource }
             });
 
diff --git a/build/build/BuildContext.cs b/build/build/BuildContext.cs
@@ -1,4 +1,5 @@
 using Build.Utilities;
+using Cake.Common.Tools.DotNetCore.MSBuild;
 using Common.Utilities;
 
 namespace Build;
@@ -18,6 +19,7 @@ public class BuildContext : BuildContextBase
 
     public Credentials? Credentials { get; set; }
 
+    // TODO update to DotNetMSBuildSettings when available
     public DotNetCoreMSBuildSettings MsBuildSettings { get; } = new();
 
     public BuildContext(ICakeContext context) : base(context)
diff --git a/build/build/Tasks/Build.cs b/build/build/Tasks/Build.cs
@@ -1,4 +1,4 @@
-using Cake.Common.Tools.DotNetCore.Restore;
+using Cake.Common.Tools.DotNet.Restore;
 
 namespace Build.Tasks;
 
@@ -13,16 +13,16 @@ public override void Run(BuildContext context)
         context.Information("Builds solution...");
         const string sln = "./src/GitVersion.sln";
 
-        context.DotNetCoreRestore(sln, new DotNetCoreRestoreSettings
+        context.DotNetRestore(sln, new DotNetRestoreSettings
         {
-            Verbosity = DotNetCoreVerbosity.Minimal,
+            Verbosity = DotNetVerbosity.Minimal,
             Sources = new[] { "https://api.nuget.org/v3/index.json" },
             MSBuildSettings = context.MsBuildSettings
         });
 
-        context.DotNetCoreBuild(sln, new DotNetCoreBuildSettings
+        context.DotNetBuild(sln, new DotNetBuildSettings
         {
-            Verbosity = DotNetCoreVerbosity.Minimal,
+            Verbosity = DotNetVerbosity.Minimal,
             Configuration = context.MsBuildConfiguration,
             NoRestore = true,
             MSBuildSettings = context.MsBuildSettings
diff --git a/build/build/Tasks/CodeFormat.cs b/build/build/Tasks/CodeFormat.cs
@@ -1,4 +1,4 @@
-using Common.Addins.Cake.DotNetCoreFormat;
+using Common.Addins.Cake.DotNetFormat;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -10,12 +10,12 @@ public class CodeFormat : FrostingTask<BuildContext>
     public override void Run(BuildContext context)
     {
         context.Information("Code format...");
-        context.DotNetCoreFormat(new DotNetCoreFormatSettings
+        context.DotNetFormat(new DotNetFormatSettings
         {
             Workspace = Paths.Build
         });
 
-        context.DotNetCoreFormat(new DotNetCoreFormatSettings
+        context.DotNetFormat(new DotNetFormatSettings
         {
             Workspace = Paths.Src,
             Exclude = new List<string> { " **/AddFormats/" }
diff --git a/build/build/Tasks/Package/PackageNuget.cs b/build/build/Tasks/Package/PackageNuget.cs
@@ -1,4 +1,4 @@
-using Cake.Common.Tools.DotNetCore.Pack;
+using Cake.Common.Tools.DotNet.Pack;
 using Cake.Common.Tools.NuGet.Pack;
 using Common.Utilities;
 
@@ -18,21 +18,21 @@ public override void Run(BuildContext context)
     }
     private static void PackageWithCli(BuildContext context)
     {
-        var settings = new DotNetCorePackSettings
+        var settings = new DotNetPackSettings
         {
             Configuration = context.MsBuildConfiguration,
             OutputDirectory = Paths.Nuget,
             MSBuildSettings = context.MsBuildSettings,
         };
 
         // GitVersion.MsBuild, global tool & core
-        context.DotNetCorePack("./src/GitVersion.Core", settings);
+        context.DotNetPack("./src/GitVersion.Core", settings);
 
         settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");
-        context.DotNetCorePack("./src/GitVersion.App", settings);
+        context.DotNetPack("./src/GitVersion.App", settings);
 
         settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");
-        context.DotNetCorePack("./src/GitVersion.MsBuild", settings);
+        context.DotNetPack("./src/GitVersion.MsBuild", settings);
     }
     private static void PackageUsingNuspec(BuildContextBase context)
     {
diff --git a/build/build/Tasks/Package/PackagePrepare.cs b/build/build/Tasks/Package/PackagePrepare.cs
@@ -1,4 +1,4 @@
-using Cake.Common.Tools.DotNetCore.Publish;
+using Cake.Common.Tools.DotNet.Publish;
 using Common.Utilities;
 
 namespace Build.Tasks;
@@ -51,7 +51,7 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
         var platform = context.Environment.Platform.Family;
         var outputPath = Paths.Native.Combine(platform.ToString().ToLower()).Combine(runtime);
 
-        var settings = new DotNetCorePublishSettings
+        var settings = new DotNetPublishSettings
         {
             Framework = Constants.NetVersion60,
             Runtime = runtime,
@@ -64,7 +64,7 @@ private static DirectoryPath PackPrepareNative(BuildContext context, string runt
             SelfContained = true
         };
 
-        context.DotNetCorePublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
+        context.DotNetPublish("./src/GitVersion.App/GitVersion.App.csproj", settings);
 
         return outputPath;
     }
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
@@ -97,6 +97,7 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
             settings.Filter = context.IsRunningOnUnix() ? $"TestCategory!={Constants.NoMono}" : $"TestCategory!={Constants.NoNet48}";
         }
 
+        // TODO update to DotNetTest when available
         context.DotNetCoreTest(project.FullPath, settings, coverletSettings);
     }
 }
diff --git a/build/chores/Tasks/ToolsInstall.cs b/build/chores/Tasks/ToolsInstall.cs
@@ -16,7 +16,7 @@ public override void Run(BuildContext context)
         var tools = jToken.Select(x => (JProperty)x).ToDictionary(x => x.Name, x => x.Value["version"]?.Value<string>());
         foreach (var (toolName, version) in tools)
         {
-            // context.DotNetCoreTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");
+            // context.DotNetTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");
         }
     }
 }
diff --git a/build/chores/Tasks/ToolsUpdate.cs b/build/chores/Tasks/ToolsUpdate.cs
@@ -16,7 +16,7 @@ public override void Run(BuildContext context)
             var tools = jToken.Select(x => ((JProperty)x).Name).ToArray();
             foreach (var tool in tools)
             {
-                context.DotNetCoreTool($"tool update --local {tool}");
+                context.DotNetTool($"tool update --local {tool}");
             }
         }
     }
diff --git a/build/common/Addins/Cake.DotNetFormat/DotNetFormatAliases.cs b/build/common/Addins/Cake.DotNetFormat/DotNetFormatAliases.cs
@@ -1,4 +1,4 @@
-namespace Common.Addins.Cake.DotNetCoreFormat;
+namespace Common.Addins.Cake.DotNetFormat;
 
 /// <summary>
 /// <para>Contains aliases related to <see href="https://github.com/dotnet/format">dotnet format</see>.</para>
@@ -10,23 +10,23 @@ namespace Common.Addins.Cake.DotNetCoreFormat;
 /// </code>
 /// </para>
 /// </summary>
-[CakeAliasCategory("DotNetCoreFormat")]
-public static class DotNetCoreFormatAliases
+[CakeAliasCategory("DotNetFormat")]
+public static class DotNetFormatAliases
 {
     /// <summary>
     /// Formats the code using the given settings.
     /// </summary>
     /// <param name="context">The context.</param>
     /// <param name="settings">The settings.</param>
     [CakeMethodAlias]
-    public static void DotNetCoreFormat(this ICakeContext context, DotNetCoreFormatSettings settings)
+    public static void DotNetFormat(this ICakeContext context, DotNetFormatSettings settings)
     {
         if (context is null)
         {
             throw new ArgumentNullException(nameof(context));
         }
 
-        var runner = new DotNetCoreFormatToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
+        var runner = new DotNetFormatToolRunner(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
         runner.Run(settings);
     }
 }
diff --git a/build/common/Addins/Cake.DotNetFormat/DotNetFormatSettings.cs b/build/common/Addins/Cake.DotNetFormat/DotNetFormatSettings.cs
@@ -1,8 +1,8 @@
 using Path = Cake.Core.IO.Path;
 
-namespace Common.Addins.Cake.DotNetCoreFormat;
+namespace Common.Addins.Cake.DotNetFormat;
 
-public sealed class DotNetCoreFormatSettings : DotNetCoreSettings
+public sealed class DotNetFormatSettings : DotNetSettings
 {
     /// <summary>
     /// A path to a solution file, a project file, or a folder containing a solution or project file.
diff --git a/build/common/Addins/Cake.DotNetFormat/DotNetFormatToolRunner.cs b/build/common/Addins/Cake.DotNetFormat/DotNetFormatToolRunner.cs
@@ -1,16 +1,16 @@
-namespace Common.Addins.Cake.DotNetCoreFormat;
+namespace Common.Addins.Cake.DotNetFormat;
 
-public sealed class DotNetCoreFormatToolRunner : DotNetCoreTool<DotNetCoreFormatSettings>
+public sealed class DotNetFormatToolRunner : DotNetTool<DotNetFormatSettings>
 {
-    public DotNetCoreFormatToolRunner(
+    public DotNetFormatToolRunner(
         IFileSystem fileSystem,
         ICakeEnvironment environment,
         IProcessRunner processRunner,
         IToolLocator tools) : base(fileSystem, environment, processRunner, tools)
     {
     }
 
-    public void Run(DotNetCoreFormatSettings settings)
+    public void Run(DotNetFormatSettings settings)
     {
         if (settings == null)
         {
@@ -19,7 +19,7 @@ public void Run(DotNetCoreFormatSettings settings)
         Run(settings, GetArguments(settings));
     }
 
-    private static ProcessArgumentBuilder GetArguments(DotNetCoreFormatSettings settings)
+    private static ProcessArgumentBuilder GetArguments(DotNetFormatSettings settings)
     {
         ProcessArgumentBuilder arguments = new();
 
diff --git a/build/common/Tasks/Default.cs b/build/common/Tasks/Default.cs
@@ -13,7 +13,7 @@ public override void Run(ICakeContext context)
         if (tasks == null) return;
 
         var defaultTask = tasks.Find(x => x.Name.Contains(nameof(Default)));
-        if (tasks.Remove(defaultTask))
+        if (defaultTask != null && tasks.Remove(defaultTask))
         {
             tasks.Insert(0, defaultTask);
         }
diff --git a/build/common/Utilities/BuildLifetimeBase.cs b/build/common/Utilities/BuildLifetimeBase.cs
@@ -9,7 +9,7 @@ public override void Setup(T context)
     {
         var buildSystem = context.BuildSystem();
         context.IsLocalBuild = buildSystem.IsLocalBuild;
-        context.IsAzurePipelineBuild = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted;
+        context.IsAzurePipelineBuild = buildSystem.IsRunningOnAzurePipelines;
         context.IsGitHubActionsBuild = buildSystem.IsRunningOnGitHubActions;
 
         context.IsPullRequest = buildSystem.IsPullRequest;
diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs
@@ -35,7 +35,7 @@ public static bool IsOriginalRepo(this ICakeContext context)
         {
             repositoryName = buildSystem.AppVeyor.Environment.Repository.Name;
         }
-        else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
+        else if (buildSystem.IsRunningOnAzurePipelines)
         {
             repositoryName = buildSystem.AzurePipelines.Environment.Repository.RepoName;
         }
@@ -56,7 +56,7 @@ public static bool IsMainBranch(this ICakeContext context)
         {
             repositoryBranch = buildSystem.AppVeyor.Environment.Repository.Branch;
         }
-        else if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
+        else if (buildSystem.IsRunningOnAzurePipelines)
         {
             repositoryBranch = buildSystem.AzurePipelines.Environment.Repository.SourceBranchName;
         }
@@ -110,7 +110,6 @@ public static string GetBuildAgent(this ICakeContext context)
             BuildProvider.Local => "Local",
             BuildProvider.AppVeyor => "AppVeyor",
             BuildProvider.AzurePipelines => "AzurePipelines",
-            BuildProvider.AzurePipelinesHosted => "AzurePipelines",
             BuildProvider.GitHubActions => "GitHubActions",
             _ => string.Empty
         };
@@ -120,7 +119,7 @@ public static void StartGroup(this ICakeContext context, string title)
     {
         var buildSystem = context.BuildSystem();
         var startGroup = "[group]";
-        if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
+        if (buildSystem.IsRunningOnAzurePipelines)
         {
             startGroup = "##[group]";
         }
@@ -134,7 +133,7 @@ public static void EndGroup(this ICakeContext context)
     {
         var buildSystem = context.BuildSystem();
         var endgroup = "[endgroup]";
-        if (buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted)
+        if (buildSystem.IsRunningOnAzurePipelines)
         {
             endgroup = "##[endgroup]";
         }
diff --git a/build/common/common.csproj b/build/common/common.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
         <OutputType>Library</OutputType>
         <RootNamespace>Common</RootNamespace>
     </PropertyGroup>
diff --git a/build/publish/Tasks/PublishNuget.cs b/build/publish/Tasks/PublishNuget.cs
@@ -1,4 +1,4 @@
-using Cake.Common.Tools.DotNetCore.NuGet.Push;
+using Cake.Common.Tools.DotNet.NuGet.Push;
 using Common.Utilities;
 
 namespace Publish.Tasks;
@@ -53,7 +53,7 @@ private static void PublishToNugetRepo(BuildContext context, string apiKey, stri
         foreach (var (packageName, filePath, _) in context.Packages.Where(x => !x.IsChocoPackage))
         {
             context.Information($"Package {packageName}, version {nugetVersion} is being published.");
-            context.DotNetCoreNuGetPush(filePath.FullPath, new DotNetCoreNuGetPushSettings
+            context.DotNetNuGetPush(filePath.FullPath, new DotNetNuGetPushSettings
             {
                 ApiKey = apiKey,
                 Source = apiUrl,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Common.Addins.Cake.DotNetCoreFormat;`
	`1`	`+using Common.Addins.Cake.DotNetFormat;`
`2`	`2`	`using Common.Utilities;`
`3`	`3`
`4`	`4`	`namespace Build.Tasks;`
`@@ -10,12 +10,12 @@ public class CodeFormat : FrostingTask<BuildContext>`
`10`	`10`	`public override void Run(BuildContext context)`
`11`	`11`	`{`
`12`	`12`	`context.Information("Code format...");`
`13`		`- context.DotNetCoreFormat(new DotNetCoreFormatSettings`
	`13`	`+ context.DotNetFormat(new DotNetFormatSettings`
`14`	`14`	`{`
`15`	`15`	`Workspace = Paths.Build`
`16`	`16`	`});`
`17`	`17`
`18`		`- context.DotNetCoreFormat(new DotNetCoreFormatSettings`
	`18`	`+ context.DotNetFormat(new DotNetFormatSettings`
`19`	`19`	`{`
`20`	`20`	`Workspace = Paths.Src,`
`21`	`21`	`Exclude = new List<string> { " **/AddFormats/" }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Cake.Common.Tools.DotNetCore.Pack;`
	`1`	`+using Cake.Common.Tools.DotNet.Pack;`
`2`	`2`	`using Cake.Common.Tools.NuGet.Pack;`
`3`	`3`	`using Common.Utilities;`
`4`	`4`
`@@ -18,21 +18,21 @@ public override void Run(BuildContext context)`
`18`	`18`	`}`
`19`	`19`	`private static void PackageWithCli(BuildContext context)`
`20`	`20`	`{`
`21`		`- var settings = new DotNetCorePackSettings`
	`21`	`+ var settings = new DotNetPackSettings`
`22`	`22`	`{`
`23`	`23`	`Configuration = context.MsBuildConfiguration,`
`24`	`24`	`OutputDirectory = Paths.Nuget,`
`25`	`25`	`MSBuildSettings = context.MsBuildSettings,`
`26`	`26`	`};`
`27`	`27`
`28`	`28`	`// GitVersion.MsBuild, global tool & core`
`29`		`- context.DotNetCorePack("./src/GitVersion.Core", settings);`
	`29`	`+ context.DotNetPack("./src/GitVersion.Core", settings);`
`30`	`30`
`31`	`31`	`settings.ArgumentCustomization = arg => arg.Append("/p:PackAsTool=true");`
`32`		`- context.DotNetCorePack("./src/GitVersion.App", settings);`
	`32`	`+ context.DotNetPack("./src/GitVersion.App", settings);`
`33`	`33`
`34`	`34`	`settings.ArgumentCustomization = arg => arg.Append("/p:IsPackaging=true");`
`35`		`- context.DotNetCorePack("./src/GitVersion.MsBuild", settings);`
	`35`	`+ context.DotNetPack("./src/GitVersion.MsBuild", settings);`
`36`	`36`	`}`
`37`	`37`	`private static void PackageUsingNuspec(BuildContextBase context)`
`38`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,`
`97`	`97`	`settings.Filter = context.IsRunningOnUnix() ? $"TestCategory!={Constants.NoMono}" : $"TestCategory!={Constants.NoNet48}";`
`98`	`98`	`}`
`99`	`99`
	`100`	`+ // TODO update to DotNetTest when available`
`100`	`101`	`context.DotNetCoreTest(project.FullPath, settings, coverletSettings);`
`101`	`102`	`}`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public override void Run(BuildContext context)`
`16`	`16`	`var tools = jToken.Select(x => (JProperty)x).ToDictionary(x => x.Name, x => x.Value["version"]?.Value<string>());`
`17`	`17`	`foreach (var (toolName, version) in tools)`
`18`	`18`	`{`
`19`		`- // context.DotNetCoreTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");`
	`19`	`+ // context.DotNetTool($"tool update --tool-path {context.Configuration.GetToolPath()} --version {version} {toolName}");`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`	`}`