Skip to content

Commit ceb7359

Browse files
committed
refactor(build): Simplify CI build flag logic
Globally sets continuous integration build for non-local builds, then explicitly disables it for unit tests to ensure consistent test execution.
1 parent d44d47f commit ceb7359

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

build/build/BuildLifetime.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using Build.Tasks;
21
using Build.Utilities;
32
using Common.Lifetime;
43
using Common.Utilities;
@@ -18,7 +17,7 @@ public override void Setup(BuildContext context, ISetupContext info)
1817

1918
if (context.Version is not null)
2019
{
21-
SetMsBuildSettingsVersion(context, info);
20+
SetMsBuildSettingsVersion(context);
2221
}
2322

2423
context.StartGroup("Build Setup");
@@ -27,7 +26,7 @@ public override void Setup(BuildContext context, ISetupContext info)
2726
context.EndGroup();
2827
}
2928

30-
private static void SetMsBuildSettingsVersion(BuildContext context, ISetupContext info)
29+
private static void SetMsBuildSettingsVersion(BuildContext context)
3130
{
3231
var msBuildSettings = context.MsBuildSettings;
3332
ArgumentNullException.ThrowIfNull(context.Version);
@@ -38,13 +37,7 @@ private static void SetMsBuildSettingsVersion(BuildContext context, ISetupContex
3837
msBuildSettings.SetPackageVersion(version.NugetVersion);
3938
msBuildSettings.SetFileVersion(version.Version);
4039
msBuildSettings.SetInformationalVersion(version.GitVersion.InformationalVersion);
41-
var continuousIntegrationBuild = !(
42-
context.IsLocalBuild
43-
|| info.TargetTask.Name == nameof(Test)
44-
|| info.TargetTask.Name == nameof(UnitTest)
45-
|| info.TargetTask.Name == nameof(PublishCoverage)
46-
);
47-
msBuildSettings.SetContinuousIntegrationBuild(continuousIntegrationBuild);
40+
msBuildSettings.SetContinuousIntegrationBuild(!context.IsLocalBuild);
4841
msBuildSettings.WithProperty("RepositoryBranch", version.GitVersion.BranchName);
4942
msBuildSettings.WithProperty("RepositoryCommit", version.GitVersion.Sha);
5043
msBuildSettings.WithProperty("NoPackageAnalysis", "true");

build/build/Tasks/Test/UnitTest.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ private static void TestProjectForTarget(BuildContext context, FilePath project,
7272
PathType = DotNetTestPathType.Project,
7373
Framework = $"net{framework}",
7474
Configuration = context.MsBuildConfiguration,
75+
MSBuildSettings = new()
7576
};
77+
settings.MSBuildSettings.SetContinuousIntegrationBuild(false);
7678

7779
var resultsPath = context.MakeAbsolute(testResultsPath.CombineWithFilePath($"{projectName}.results.xml"));
7880
settings.WithArgumentCustomization(args => args

0 commit comments

Comments
 (0)