Added LocalBuild agent (#3006)

arturcic · web-flow · commit b0649e183d29 · 2022-02-21T21:03:30.000+01:00
* (#3005) cleanup the build agents * (#3005) introduce LocalBuild agent
diff --git a/src/GitVersion.App/ArgumentParser.cs b/src/GitVersion.App/ArgumentParser.cs
@@ -19,7 +19,7 @@ public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, I
         this.environment = environment.NotNull();
         this.console = console.NotNull();
         this.globbingResolver = globbingResolver.NotNull();
-        this.buildAgent = buildAgent;
+        this.buildAgent = buildAgent.NotNull();
     }
 
     public Arguments ParseArguments(string commandLineArguments)
@@ -42,7 +42,7 @@ public Arguments ParseArguments(string[] commandLineArguments)
 
             AddAuthentication(args);
 
-            args.NoFetch = this.buildAgent != null && this.buildAgent.PreventFetch();
+            args.NoFetch = this.buildAgent.PreventFetch();
 
             return args;
         }
diff --git a/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/Abstractions/IBuildAgentResolver.cs
@@ -2,5 +2,5 @@ namespace GitVersion.BuildAgents;
 
 public interface IBuildAgentResolver
 {
-    ICurrentBuildAgent? Resolve();
+    ICurrentBuildAgent Resolve();
 }
diff --git a/src/GitVersion.Core/BuildAgents/AppVeyor.cs b/src/GitVersion.Core/BuildAgents/AppVeyor.cs
@@ -13,7 +13,7 @@ public AppVeyor(IEnvironment environment, ILog log) : base(environment, log)
 
     public const string EnvironmentVariableName = "APPVEYOR";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string GenerateSetVersionMessage(VersionVariables variables)
     {
diff --git a/src/GitVersion.Core/BuildAgents/AzurePipelines.cs b/src/GitVersion.Core/BuildAgents/AzurePipelines.cs
@@ -13,7 +13,7 @@ public AzurePipelines(IEnvironment environment, ILog log) : base(environment, lo
 
     public const string EnvironmentVariableName = "TF_BUILD";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string[] GenerateSetParameterMessage(string name, string value) => new[]
     {
diff --git a/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs b/src/GitVersion.Core/BuildAgents/BuildAgentResolver.cs
@@ -13,17 +13,18 @@ public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)
         this.buildAgents = buildAgents;
     }
 
-    public ICurrentBuildAgent? Resolve()
+    public ICurrentBuildAgent Resolve() => new Lazy<ICurrentBuildAgent>(ResolveInternal).Value;
+
+    private ICurrentBuildAgent ResolveInternal()
     {
-        ICurrentBuildAgent? instance = null;
-        foreach (var buildAgent in this.buildAgents)
+        ICurrentBuildAgent instance = (ICurrentBuildAgent)this.buildAgents.Single(x => x is LocalBuild);
+
+        foreach (var buildAgent in this.buildAgents.Where(x => x is not LocalBuild))
         {
             var agentName = buildAgent.GetType().Name;
             try
             {
                 if (!buildAgent.CanApplyToCurrentContext()) continue;
-
-                this.log.Info($"Applicable build agent found: '{agentName}'.");
                 instance = (ICurrentBuildAgent)buildAgent;
             }
             catch (Exception ex)
@@ -32,6 +33,7 @@ public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)
             }
         }
 
+        this.log.Info($"Applicable build agent found: '{instance.GetType().Name}'.");
         return instance;
     }
 }
diff --git a/src/GitVersion.Core/BuildAgents/BuildKite.cs b/src/GitVersion.Core/BuildAgents/BuildKite.cs
@@ -11,7 +11,7 @@ public BuildKite(IEnvironment environment, ILog log) : base(environment, log)
 
     public const string EnvironmentVariableName = "BUILDKITE";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase);
 
diff --git a/src/GitVersion.Core/BuildAgents/BuildServerModule.cs b/src/GitVersion.Core/BuildAgents/BuildServerModule.cs
@@ -14,8 +14,6 @@ public override void RegisterTypes(IServiceCollection services)
         }
 
         services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
-        services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());
-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.
+        services.AddSingleton(sp => sp.GetRequiredService<IBuildAgentResolver>().Resolve());
     }
 }
diff --git a/src/GitVersion.Core/BuildAgents/CodeBuild.cs b/src/GitVersion.Core/BuildAgents/CodeBuild.cs
@@ -14,7 +14,7 @@ public sealed class CodeBuild : BuildAgentBase
 
     public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
-    protected override string EnvironmentVariable => throw new NotSupportedException($"Accessing {nameof(EnvironmentVariable)} is not supported as {nameof(CodeBuild)} supports two environment variables for branch names.");
+    protected override string EnvironmentVariable => WebHookEnvironmentVariableName;
 
     public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
 
@@ -25,7 +25,6 @@ public override string[] GenerateSetParameterMessage(string name, string value)
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
-
         var currentBranch = Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName);
 
         if (currentBranch.IsNullOrEmpty())
@@ -45,6 +44,6 @@ public override void WriteIntegration(Action<string?> writer, VersionVariables v
 
     public override bool PreventFetch() => true;
 
-    public override bool CanApplyToCurrentContext()
-        => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty() || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty();
+    public override bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(WebHookEnvironmentVariableName).IsNullOrEmpty()
+                                                       || !Environment.GetEnvironmentVariable(SourceVersionEnvironmentVariableName).IsNullOrEmpty();
 }
diff --git a/src/GitVersion.Core/BuildAgents/ContinuaCi.cs b/src/GitVersion.Core/BuildAgents/ContinuaCi.cs
@@ -11,7 +11,7 @@ public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)
 
     public const string EnvironmentVariableName = "ContinuaCI.Version";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string[] GenerateSetParameterMessage(string name, string value) => new[]
     {
diff --git a/src/GitVersion.Core/BuildAgents/Drone.cs b/src/GitVersion.Core/BuildAgents/Drone.cs
@@ -11,7 +11,7 @@ public Drone(IEnvironment environment, ILog log) : base(environment, log)
     }
 
     public const string EnvironmentVariableName = "DRONE";
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
     public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase);
 
     public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
diff --git a/src/GitVersion.Core/BuildAgents/EnvRun.cs b/src/GitVersion.Core/BuildAgents/EnvRun.cs
@@ -11,7 +11,7 @@ public EnvRun(IEnvironment environment, ILog log) : base(environment, log)
     }
 
     public const string EnvironmentVariableName = "ENVRUN_DATABASE";
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
     public override bool CanApplyToCurrentContext()
     {
         var envRunDatabasePath = Environment.GetEnvironmentVariable(EnvironmentVariableName);
diff --git a/src/GitVersion.Core/BuildAgents/GitHubActions.cs b/src/GitVersion.Core/BuildAgents/GitHubActions.cs
@@ -15,7 +15,7 @@ public GitHubActions(IEnvironment environment, ILog log) : base(environment, log
     public const string EnvironmentVariableName = "GITHUB_ACTIONS";
     public const string GitHubSetEnvTempFileEnvironmentVariableName = "GITHUB_ENV";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string GenerateSetVersionMessage(VersionVariables variables) =>
         string.Empty; // There is no equivalent function in GitHub Actions.
diff --git a/src/GitVersion.Core/BuildAgents/GitLabCi.cs b/src/GitVersion.Core/BuildAgents/GitLabCi.cs
@@ -12,7 +12,7 @@ public class GitLabCi : BuildAgentBase
 
     public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
 
     public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;
diff --git a/src/GitVersion.Core/BuildAgents/Jenkins.cs b/src/GitVersion.Core/BuildAgents/Jenkins.cs
@@ -8,7 +8,7 @@ public class Jenkins : BuildAgentBase
 {
     public const string EnvironmentVariableName = "JENKINS_URL";
     private string? file;
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public Jenkins(IEnvironment environment, ILog log) : base(environment, log) => WithPropertyFile("gitversion.properties");
 
diff --git a/src/GitVersion.Core/BuildAgents/LocalBuild.cs b/src/GitVersion.Core/BuildAgents/LocalBuild.cs
@@ -0,0 +1,15 @@
+using GitVersion.Logging;
+using GitVersion.OutputVariables;
+
+namespace GitVersion.BuildAgents;
+
+public class LocalBuild : BuildAgentBase
+{
+    public LocalBuild(IEnvironment environment, ILog log) : base(environment, log)
+    {
+    }
+    protected override string EnvironmentVariable => string.Empty;
+    public override bool CanApplyToCurrentContext() => true;
+    public override string? GenerateSetVersionMessage(VersionVariables variables) => null;
+    public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
+}
diff --git a/src/GitVersion.Core/BuildAgents/MyGet.cs b/src/GitVersion.Core/BuildAgents/MyGet.cs
@@ -12,7 +12,7 @@ public MyGet(IEnvironment environment, ILog log) : base(environment, log)
     }
 
     public const string EnvironmentVariableName = "BuildRunner";
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
     public override bool CanApplyToCurrentContext()
     {
         var buildRunner = Environment.GetEnvironmentVariable(EnvironmentVariable);
diff --git a/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs b/src/GitVersion.Core/BuildAgents/SpaceAutomation.cs
@@ -11,7 +11,7 @@ public SpaceAutomation(IEnvironment environment, ILog log) : base(environment, l
 
     public const string EnvironmentVariableName = "JB_SPACE_PROJECT_KEY";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH");
 
diff --git a/src/GitVersion.Core/BuildAgents/TeamCity.cs b/src/GitVersion.Core/BuildAgents/TeamCity.cs
@@ -13,7 +13,7 @@ public TeamCity(IEnvironment environment, ILog log) : base(environment, log)
 
     public const string EnvironmentVariableName = "TEAMCITY_VERSION";
 
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
     {
diff --git a/src/GitVersion.Core/BuildAgents/TravisCI.cs b/src/GitVersion.Core/BuildAgents/TravisCI.cs
@@ -10,7 +10,7 @@ public TravisCi(IEnvironment environment, ILog log) : base(environment, log)
     }
 
     public const string EnvironmentVariableName = "TRAVIS";
-    protected override string EnvironmentVariable { get; } = EnvironmentVariableName;
+    protected override string EnvironmentVariable => EnvironmentVariableName;
 
     public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable)) && "true".Equals(Environment.GetEnvironmentVariable("CI"));
 
diff --git a/src/GitVersion.Core/Core/GitPreparer.cs b/src/GitVersion.Core/Core/GitPreparer.cs
@@ -16,12 +16,12 @@ public class GitPreparer : IGitPreparer
     private readonly IOptions<GitVersionOptions> options;
     private readonly IGitRepositoryInfo repositoryInfo;
     private readonly IRepositoryStore repositoryStore;
-    private readonly ICurrentBuildAgent? buildAgent;
+    private readonly ICurrentBuildAgent buildAgent;
     private readonly RetryAction<LockedFileException> retryAction;
 
     private const string DefaultRemoteName = "origin";
 
-    public GitPreparer(ILog log, IEnvironment environment, ICurrentBuildAgent? buildAgent, IOptions<GitVersionOptions> options,
+    public GitPreparer(ILog log, IEnvironment environment, ICurrentBuildAgent buildAgent, IOptions<GitVersionOptions> options,
         IMutatingGitRepository repository, IGitRepositoryInfo repositoryInfo, IRepositoryStore repositoryStore)
     {
         this.log = log.NotNull();
@@ -30,7 +30,7 @@ public GitPreparer(ILog log, IEnvironment environment, ICurrentBuildAgent? build
         this.options = options.NotNull();
         this.repositoryInfo = repositoryInfo.NotNull();
         this.repositoryStore = repositoryStore.NotNull();
-        this.buildAgent = buildAgent;
+        this.buildAgent = buildAgent.NotNull();
         this.retryAction = new RetryAction<LockedFileException>();
     }
 
@@ -39,8 +39,8 @@ public void Prepare()
         var gitVersionOptions = this.options.Value;
 
         // Normalize if we are running on build server
-        var normalizeGitDirectory = !gitVersionOptions.Settings.NoNormalize && this.buildAgent != null;
-        var shouldCleanUpRemotes = this.buildAgent != null && this.buildAgent.ShouldCleanUpRemotes();
+        var normalizeGitDirectory = !gitVersionOptions.Settings.NoNormalize && this.buildAgent is not LocalBuild;
+        var shouldCleanUpRemotes = this.buildAgent.ShouldCleanUpRemotes();
         var currentBranch = ResolveCurrentBranch();
 
         var dotGitDirectory = this.repositoryInfo.DotGitDirectory;
@@ -79,10 +79,6 @@ private void PrepareInternal(bool normalizeGitDirectory, string? currentBranch,
     {
         var gitVersionOptions = this.options.Value;
         var targetBranch = gitVersionOptions.RepositoryInfo.TargetBranch;
-        if (this.buildAgent == null)
-        {
-            return targetBranch;
-        }
 
         var isDynamicRepository = !gitVersionOptions.RepositoryInfo.DynamicRepositoryClonePath.IsNullOrWhiteSpace();
         var currentBranch = this.buildAgent.GetCurrentBranch(isDynamicRepository) ?? targetBranch;
diff --git a/src/GitVersion.Core/Core/GitVersionCalculateTool.cs b/src/GitVersion.Core/Core/GitVersionCalculateTool.cs
@@ -40,8 +40,7 @@ public GitVersionCalculateTool(ILog log, INextVersionCalculator nextVersionCalcu
 
     public VersionVariables CalculateVersionVariables()
     {
-        bool isCurrentCommitTagged = this.versionContext.IsValueCreated &&
-            this.versionContext.Value.IsCurrentCommitTagged;
+        bool isCurrentCommitTagged = this.versionContext.IsValueCreated && this.versionContext.Value.IsCurrentCommitTagged;
 
         if (!isCurrentCommitTagged)
         {
diff --git a/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs b/src/GitVersion.Core/VersionConverters/OutputGenerator/OutputGenerator.cs
@@ -24,15 +24,15 @@ public OutputGenerator(ICurrentBuildAgent buildAgent, IConsole console, IFileSys
         this.console = console.NotNull();
         this.fileSystem = fileSystem.NotNull();
         this.options = options.NotNull();
-        this.buildAgent = buildAgent;
+        this.buildAgent = buildAgent.NotNull();
     }
 
     public void Execute(VersionVariables variables, OutputContext context)
     {
         var gitVersionOptions = this.options.Value;
         if (gitVersionOptions.Output.Contains(OutputType.BuildServer))
         {
-            this.buildAgent?.WriteIntegration(this.console.WriteLine, variables, context.UpdateBuildNumber ?? true);
+            this.buildAgent.WriteIntegration(this.console.WriteLine, variables, context.UpdateBuildNumber ?? true);
         }
         if (gitVersionOptions.Output.Contains(OutputType.File))
         {
diff --git a/src/GitVersion.MsBuild/GitVersionTasks.cs b/src/GitVersion.MsBuild/GitVersionTasks.cs
@@ -46,12 +46,12 @@ private static bool ExecuteGitVersionTask<T>(T task, Action<IGitVersionTaskExecu
     private static void Configure(IServiceProvider sp, GitVersionTaskBase task)
     {
         var log = sp.GetRequiredService<ILog>();
-        var buildAgent = sp.GetService<ICurrentBuildAgent>();
+        var buildAgent = sp.GetRequiredService<ICurrentBuildAgent>();
         var gitVersionOptions = sp.GetRequiredService<IOptions<GitVersionOptions>>().Value;
 
         log.AddLogAppender(new MsBuildAppender(task.Log));
 
-        if (buildAgent != null)
+        if (buildAgent is not LocalBuild)
         {
             gitVersionOptions.Output.Add(OutputType.BuildServer);
         }

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, I`
`19`	`19`	`this.environment = environment.NotNull();`
`20`	`20`	`this.console = console.NotNull();`
`21`	`21`	`this.globbingResolver = globbingResolver.NotNull();`
`22`		`- this.buildAgent = buildAgent;`
	`22`	`+ this.buildAgent = buildAgent.NotNull();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public Arguments ParseArguments(string commandLineArguments)`
`@@ -42,7 +42,7 @@ public Arguments ParseArguments(string[] commandLineArguments)`
`42`	`42`
`43`	`43`	`AddAuthentication(args);`
`44`	`44`
`45`		`- args.NoFetch = this.buildAgent != null && this.buildAgent.PreventFetch();`
	`45`	`+ args.NoFetch = this.buildAgent.PreventFetch();`
`46`	`46`
`47`	`47`	`return args;`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ namespace GitVersion.BuildAgents;`
`2`	`2`
`3`	`3`	`public interface IBuildAgentResolver`
`4`	`4`	`{`
`5`		`- ICurrentBuildAgent? Resolve();`
	`5`	`+ ICurrentBuildAgent Resolve();`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public AppVeyor(IEnvironment environment, ILog log) : base(environment, log)`
`13`	`13`
`14`	`14`	`public const string EnvironmentVariableName = "APPVEYOR";`
`15`	`15`
`16`		`- protected override string EnvironmentVariable { get; } = EnvironmentVariableName;`
	`16`	`+ protected override string EnvironmentVariable => EnvironmentVariableName;`
`17`	`17`
`18`	`18`	`public override string GenerateSetVersionMessage(VersionVariables variables)`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public AzurePipelines(IEnvironment environment, ILog log) : base(environment, lo`
`13`	`13`
`14`	`14`	`public const string EnvironmentVariableName = "TF_BUILD";`
`15`	`15`
`16`		`- protected override string EnvironmentVariable { get; } = EnvironmentVariableName;`
	`16`	`+ protected override string EnvironmentVariable => EnvironmentVariableName;`
`17`	`17`
`18`	`18`	`public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,17 +13,18 @@ public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)`
`13`	`13`	`this.buildAgents = buildAgents;`
`14`	`14`	`}`
`15`	`15`
`16`		`- public ICurrentBuildAgent? Resolve()`
	`16`	`+ public ICurrentBuildAgent Resolve() => new Lazy<ICurrentBuildAgent>(ResolveInternal).Value;`
	`17`	`+`
	`18`	`+ private ICurrentBuildAgent ResolveInternal()`
`17`	`19`	`{`
`18`		`- ICurrentBuildAgent? instance = null;`
`19`		`- foreach (var buildAgent in this.buildAgents)`
	`20`	`+ ICurrentBuildAgent instance = (ICurrentBuildAgent)this.buildAgents.Single(x => x is LocalBuild);`
	`21`	`+`
	`22`	`+ foreach (var buildAgent in this.buildAgents.Where(x => x is not LocalBuild))`
`20`	`23`	`{`
`21`	`24`	`var agentName = buildAgent.GetType().Name;`
`22`	`25`	`try`
`23`	`26`	`{`
`24`	`27`	`if (!buildAgent.CanApplyToCurrentContext()) continue;`
`25`		`-`
`26`		`- this.log.Info($"Applicable build agent found: '{agentName}'.");`
`27`	`28`	`instance = (ICurrentBuildAgent)buildAgent;`
`28`	`29`	`}`
`29`	`30`	`catch (Exception ex)`
`@@ -32,6 +33,7 @@ public BuildAgentResolver(IEnumerable<IBuildAgent> buildAgents, ILog log)`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
	`36`	`+ this.log.Info($"Applicable build agent found: '{instance.GetType().Name}'.");`
`35`	`37`	`return instance;`
`36`	`38`	`}`
`37`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,6 @@ public override void RegisterTypes(IServiceCollection services)`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();`
`17`		`-#pragma warning disable CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.`
`18`		`- services.AddSingleton(sp => sp.GetService<IBuildAgentResolver>()?.Resolve());`
`19`		`-#pragma warning restore CS8634 // The type cannot be used as type parameter in the generic type or method. Nullability of type argument doesn't match 'class' constraint.`
	`17`	`+ services.AddSingleton(sp => sp.GetRequiredService<IBuildAgentResolver>().Resolve());`
`20`	`18`	`}`
`21`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)`
`11`	`11`
`12`	`12`	`public const string EnvironmentVariableName = "ContinuaCI.Version";`
`13`	`13`
`14`		`- protected override string EnvironmentVariable { get; } = EnvironmentVariableName;`
	`14`	`+ protected override string EnvironmentVariable => EnvironmentVariableName;`
`15`	`15`
`16`	`16`	`public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public Drone(IEnvironment environment, ILog log) : base(environment, log)`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`public const string EnvironmentVariableName = "DRONE";`
`14`		`- protected override string EnvironmentVariable { get; } = EnvironmentVariableName;`
	`14`	`+ protected override string EnvironmentVariable => EnvironmentVariableName;`
`15`	`15`	`public override bool CanApplyToCurrentContext() => "true".Equals(Environment.GetEnvironmentVariable(EnvironmentVariable), StringComparison.OrdinalIgnoreCase);`
`16`	`16`
`17`	`17`	`public override string GenerateSetVersionMessage(VersionVariables variables) => variables.FullSemVer;`