Skip to content

Commit 26a70b9

Browse files
committed
(build) update cake to 1.3.0
1 parent e41cc2b commit 26a70b9

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

build/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project>
22
<ItemGroup>
3-
<PackageReference Include="Cake.Common" Version="1.2.0" />
3+
<PackageReference Include="Cake.Common" Version="1.3.0" />
44
<PackageReference Include="Cake.Compression" Version="0.2.6" />
5-
<PackageReference Include="Cake.Frosting" Version="1.2.0" />
5+
<PackageReference Include="Cake.Frosting" Version="1.3.0" />
66
<PackageReference Include="Cake.Incubator" Version="6.0.0" />
77

88
<PackageReference Include="Cake.Docker" Version="1.0.0" />

build/build/BuildLifetime.cs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,25 @@ public override void Setup(BuildContext context)
1414

1515
context.Credentials = Credentials.GetCredentials(context);
1616

17-
SetMsBuildSettingsVersion(context.MsBuildSettings, context.Version!);
17+
SetMsBuildSettingsVersion(context);
1818

1919
context.StartGroup("Build Setup");
2020
LogBuildInformation(context);
2121
context.Information("Configuration: {0}", context.MsBuildConfiguration);
2222
context.EndGroup();
2323
}
2424

25-
private static void SetMsBuildSettingsVersion(DotNetCoreMSBuildSettings msBuildSettings, BuildVersion version)
25+
private static void SetMsBuildSettingsVersion(BuildContext context)
2626
{
27-
msBuildSettings.WithProperty("Version", version.SemVersion);
28-
msBuildSettings.WithProperty("AssemblyVersion", version.Version);
29-
msBuildSettings.WithProperty("PackageVersion", version.NugetVersion);
30-
msBuildSettings.WithProperty("FileVersion", version.Version);
31-
msBuildSettings.WithProperty("InformationalVersion", version.GitVersion.InformationalVersion);
27+
var msBuildSettings = context.MsBuildSettings;
28+
var version = context.Version!;
29+
30+
msBuildSettings.SetVersion(version.SemVersion);
31+
msBuildSettings.SetAssemblyVersion(version.Version);
32+
msBuildSettings.SetPackageVersion(version.NugetVersion);
33+
msBuildSettings.SetFileVersion(version.Version);
34+
msBuildSettings.SetInformationalVersion(version.GitVersion.InformationalVersion);
35+
msBuildSettings.SetContinuousIntegrationBuild(!context.IsLocalBuild);
3236
msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
3337
msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
3438
msBuildSettings.WithProperty("NoPackageAnalysis", "true");

build/common/Utilities/Arguments.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ namespace Common.Utilities;
22

33
public class Arguments
44
{
5+
public const string Target = "target";
56
public const string Configuration = "configuration";
67
public const string Architecture = "arch";
78
public const string DotnetTarget = "dotnet_target";

build/common/Utilities/BuildLifetimeBase.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public override void Teardown(T context, ITeardownContext info)
5050
}
5151
protected void LogBuildInformation(T context)
5252
{
53+
if (context.HasArgument(Arguments.Target))
54+
{
55+
context.Information("Target: {0}", context.Argument<string>(Arguments.Target));
56+
}
5357
context.Information("Version: {0}", context.Version?.SemVersion);
5458
context.Information("Build Agent: {0}", context.GetBuildAgent());
5559
context.Information("OS: {0}", context.GetOS());

0 commit comments

Comments
 (0)