fixed approved files

arturcic · arturcic · commit 23e2390293af · 2023-03-26T16:39:33.000+02:00
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/BuildServerBaseTests.cs
@@ -61,6 +61,6 @@ public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)
 
         public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-        public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
+        public override string[] GenerateSetParameterMessage(string name, string? value) => Array.Empty<string>();
     }
 }
diff --git a/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs b/src/GitVersion.BuildAgents.Tests/Agents/EnvRunTests.cs
@@ -58,7 +58,7 @@ public void GenerateSetVersionMessage(string fullSemVer)
 
     [TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]
     [TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]
-    public void GenerateSetParameterMessage(string name, string value, string expected)
+    public void GenerateSetParameterMessage(string name, string? value, string expected)
     {
         var output = this.buildServer.GenerateSetParameterMessage(name, value);
         output.ShouldHaveSingleItem();
diff --git a/src/GitVersion.BuildAgents/Agents/AppVeyor.cs b/src/GitVersion.BuildAgents/Agents/AppVeyor.cs
@@ -41,7 +41,7 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)
         return $"Set AppVeyor build number to '{variables.FullSemVer}'.";
     }
 
-    public override string[] GenerateSetParameterMessage(string name, string value)
+    public override string[] GenerateSetParameterMessage(string name, string? value)
     {
         var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");
         var httpClient = GetHttpClient(apiUrl);
diff --git a/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs b/src/GitVersion.BuildAgents/Agents/AzurePipelines.cs
@@ -15,7 +15,7 @@ public AzurePipelines(IEnvironment environment, ILog log) : base(environment, lo
 
     protected override string EnvironmentVariable => EnvironmentVariableName;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"##vso[task.setvariable variable=GitVersion.{name}]{value}",
         $"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"
@@ -33,7 +33,7 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)
         if (buildNumberEnv.IsNullOrWhiteSpace())
             return variables.FullSemVer;
 
-        var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);
+        var newBuildNumber = variables.OrderBy(x => x.Key).Aggregate(buildNumberEnv, ReplaceVariables);
 
         // If no variable substitution has happened, use FullSemVer
         if (buildNumberEnv == newBuildNumber)
@@ -48,10 +48,14 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)
         return $"##vso[build.updatebuildnumber]{newBuildNumber}";
     }
 
-    private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string> variable)
+    private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string?> variable)
     {
         var pattern = $@"\$\(GITVERSION[_\.]{variable.Key}\)";
         var replacement = variable.Value;
-        return buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase);
+        return replacement switch
+        {
+            null => buildNumberEnv,
+            _ => buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase)
+        };
     }
 }
diff --git a/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs b/src/GitVersion.BuildAgents/Agents/BitBucketPipelines.cs
@@ -19,7 +19,7 @@ internal class BitBucketPipelines : BuildAgentBase
 
     public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[] { $"GITVERSION_{name.ToUpperInvariant()}={value}" };
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[] { $"GITVERSION_{name.ToUpperInvariant()}={value}" };
 
     public override void WriteIntegration(Action<string?> writer, GitVersionVariables variables, bool updateBuildNumber = true)
     {
diff --git a/src/GitVersion.BuildAgents/Agents/BuildKite.cs b/src/GitVersion.BuildAgents/Agents/BuildKite.cs
@@ -18,7 +18,7 @@ public BuildKite(IEnvironment environment, ILog log) : base(environment, log)
     public override string GenerateSetVersionMessage(GitVersionVariables variables) =>
         string.Empty; // There is no equivalent function in BuildKite.
 
-    public override string[] GenerateSetParameterMessage(string name, string value) =>
+    public override string[] GenerateSetParameterMessage(string name, string? value) =>
         Array.Empty<string>(); // There is no equivalent function in BuildKite.
 
     public override string? GetCurrentBranch(bool usingDynamicRepos)
diff --git a/src/GitVersion.BuildAgents/Agents/CodeBuild.cs b/src/GitVersion.BuildAgents/Agents/CodeBuild.cs
@@ -18,7 +18,7 @@ internal sealed class CodeBuild : BuildAgentBase
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"GitVersion_{name}={value}"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/ContinuaCi.cs b/src/GitVersion.BuildAgents/Agents/ContinuaCi.cs
@@ -13,7 +13,7 @@ public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)
 
     protected override string EnvironmentVariable => EnvironmentVariableName;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"@@continua[setVariable name='GitVersion_{name}' value='{value}' skipIfNotDefined='true']"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/Drone.cs b/src/GitVersion.BuildAgents/Agents/Drone.cs
@@ -16,7 +16,7 @@ public Drone(IEnvironment environment, ILog log) : base(environment, log)
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"GitVersion_{name}={value}"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/EnvRun.cs b/src/GitVersion.BuildAgents/Agents/EnvRun.cs
@@ -31,7 +31,7 @@ public override bool CanApplyToCurrentContext()
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"@@envrun[set name='GitVersion_{name}' value='{value}']"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/GitHubActions.cs b/src/GitVersion.BuildAgents/Agents/GitHubActions.cs
@@ -20,7 +20,7 @@ public GitHubActions(IEnvironment environment, ILog log) : base(environment, log
     public override string GenerateSetVersionMessage(GitVersionVariables variables) =>
         string.Empty; // There is no equivalent function in GitHub Actions.
 
-    public override string[] GenerateSetParameterMessage(string name, string value) =>
+    public override string[] GenerateSetParameterMessage(string name, string? value) =>
         Array.Empty<string>(); // There is no equivalent function in GitHub Actions.
 
     public override void WriteIntegration(Action<string?> writer, GitVersionVariables variables, bool updateBuildNumber = true)
diff --git a/src/GitVersion.BuildAgents/Agents/GitLabCi.cs b/src/GitVersion.BuildAgents/Agents/GitLabCi.cs
@@ -16,7 +16,7 @@ internal class GitLabCi : BuildAgentBase
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"GitVersion_{name}={value}"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/Jenkins.cs b/src/GitVersion.BuildAgents/Agents/Jenkins.cs
@@ -16,7 +16,7 @@ internal class Jenkins : BuildAgentBase
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"GitVersion_{name}={value}"
     };
diff --git a/src/GitVersion.BuildAgents/Agents/MyGet.cs b/src/GitVersion.BuildAgents/Agents/MyGet.cs
@@ -21,7 +21,7 @@ public override bool CanApplyToCurrentContext()
                && buildRunner.Equals("MyGet", StringComparison.InvariantCultureIgnoreCase);
     }
 
-    public override string[] GenerateSetParameterMessage(string name, string value)
+    public override string[] GenerateSetParameterMessage(string name, string? value)
     {
         var messages = new List<string>
         {
diff --git a/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs b/src/GitVersion.BuildAgents/Agents/SpaceAutomation.cs
@@ -15,7 +15,7 @@ public SpaceAutomation(IEnvironment environment, ILog log) : base(environment, l
 
     public override string? GetCurrentBranch(bool usingDynamicRepos) => Environment.GetEnvironmentVariable("JB_SPACE_GIT_BRANCH");
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
+    public override string[] GenerateSetParameterMessage(string name, string? value) => Array.Empty<string>();
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => string.Empty;
 }
diff --git a/src/GitVersion.BuildAgents/Agents/TeamCity.cs b/src/GitVersion.BuildAgents/Agents/TeamCity.cs
@@ -39,7 +39,7 @@ private void WriteBranchEnvVariableWarning() => this.Log.Warning(@"TeamCity does
 
     public override bool PreventFetch() => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable("Git_Branch"));
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"##teamcity[setParameter name='GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']",
         $"##teamcity[setParameter name='system.GitVersion.{name}' value='{ServiceMessageEscapeHelper.EscapeValue(value)}']"
diff --git a/src/GitVersion.BuildAgents/Agents/TravisCI.cs b/src/GitVersion.BuildAgents/Agents/TravisCI.cs
@@ -16,7 +16,7 @@ public TravisCi(IEnvironment environment, ILog log) : base(environment, log)
 
     public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;
 
-    public override string[] GenerateSetParameterMessage(string name, string value) => new[]
+    public override string[] GenerateSetParameterMessage(string name, string? value) => new[]
     {
         $"GitVersion_{name}={value}"
     };
diff --git a/src/GitVersion.Core/Agents/BuildAgentBase.cs b/src/GitVersion.Core/Agents/BuildAgentBase.cs
@@ -19,7 +19,7 @@ protected BuildAgentBase(IEnvironment environment, ILog log)
     public virtual bool IsDefault => false;
 
     public abstract string? GenerateSetVersionMessage(GitVersionVariables variables);
-    public abstract string[] GenerateSetParameterMessage(string name, string value);
+    public abstract string[] GenerateSetParameterMessage(string name, string? value);
 
     public virtual bool CanApplyToCurrentContext() => !Environment.GetEnvironmentVariable(EnvironmentVariable).IsNullOrEmpty();
 
diff --git a/src/GitVersion.Core/Agents/LocalBuild.cs b/src/GitVersion.Core/Agents/LocalBuild.cs
@@ -14,5 +14,5 @@ public LocalBuild(IEnvironment environment, ILog log) : base(environment, log)
     protected override string EnvironmentVariable => string.Empty;
     public override bool CanApplyToCurrentContext() => true;
     public override string? GenerateSetVersionMessage(GitVersionVariables variables) => null;
-    public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();
+    public override string[] GenerateSetParameterMessage(string name, string? value) => Array.Empty<string>();
 }
diff --git a/src/GitVersion.Core/OutputVariables/GitVersionVariables.cs b/src/GitVersion.Core/OutputVariables/GitVersionVariables.cs
@@ -1,35 +1,64 @@
-using GitVersion.Extensions;
 using static GitVersion.Extensions.ObjectExtensions;
 
 namespace GitVersion.OutputVariables;
 
-public class GitVersionVariables : IEnumerable<KeyValuePair<string, string>>
+public class GitVersionVariables : IEnumerable<KeyValuePair<string, string?>>
 {
+    public static readonly List<string> AvailableVariables = new()
+    {
+        nameof(Major),
+        nameof(Minor),
+        nameof(Patch),
+        nameof(BuildMetaData),
+        nameof(FullBuildMetaData),
+        nameof(BranchName),
+        nameof(EscapedBranchName),
+        nameof(Sha),
+        nameof(ShortSha),
+        nameof(MajorMinorPatch),
+        nameof(SemVer),
+        nameof(FullSemVer),
+        nameof(AssemblySemVer),
+        nameof(AssemblySemFileVer),
+        nameof(PreReleaseTag),
+        nameof(PreReleaseTagWithDash),
+        nameof(PreReleaseLabel),
+        nameof(PreReleaseLabelWithDash),
+        nameof(PreReleaseNumber),
+        nameof(WeightedPreReleaseNumber),
+        nameof(InformationalVersion),
+        nameof(CommitDate),
+        nameof(VersionSourceSha),
+        nameof(CommitsSinceVersionSource),
+        nameof(UncommittedChanges),
+    };
+
+    private readonly Dictionary<string, string?> _variables;
     public GitVersionVariables(string major,
-                            string minor,
-                            string patch,
-                            string? buildMetaData,
-                            string? fullBuildMetaData,
-                            string? branchName,
-                            string? escapedBranchName,
-                            string? sha,
-                            string? shortSha,
-                            string majorMinorPatch,
-                            string semVer,
-                            string fullSemVer,
-                            string? assemblySemVer,
-                            string? assemblySemFileVer,
-                            string? preReleaseTag,
-                            string? preReleaseTagWithDash,
-                            string? preReleaseLabel,
-                            string? preReleaseLabelWithDash,
-                            string? preReleaseNumber,
-                            string weightedPreReleaseNumber,
-                            string? informationalVersion,
-                            string? commitDate,
-                            string? versionSourceSha,
-                            string? commitsSinceVersionSource,
-                            string? uncommittedChanges)
+                               string minor,
+                               string patch,
+                               string? buildMetaData,
+                               string? fullBuildMetaData,
+                               string? branchName,
+                               string? escapedBranchName,
+                               string? sha,
+                               string? shortSha,
+                               string majorMinorPatch,
+                               string semVer,
+                               string fullSemVer,
+                               string? assemblySemVer,
+                               string? assemblySemFileVer,
+                               string? preReleaseTag,
+                               string? preReleaseTagWithDash,
+                               string? preReleaseLabel,
+                               string? preReleaseLabelWithDash,
+                               string? preReleaseNumber,
+                               string weightedPreReleaseNumber,
+                               string? informationalVersion,
+                               string? commitDate,
+                               string? versionSourceSha,
+                               string? commitsSinceVersionSource,
+                               string? uncommittedChanges)
     {
         Major = major;
         Minor = minor;
@@ -56,6 +85,35 @@ public GitVersionVariables(string major,
         VersionSourceSha = versionSourceSha;
         CommitsSinceVersionSource = commitsSinceVersionSource;
         UncommittedChanges = uncommittedChanges;
+
+        _variables = new Dictionary<string, string?>
+        {
+            { nameof(Major), Major },
+            { nameof(Minor), Minor },
+            { nameof(Patch), Patch },
+            { nameof(BuildMetaData), BuildMetaData },
+            { nameof(FullBuildMetaData), FullBuildMetaData },
+            { nameof(BranchName), BranchName },
+            { nameof(EscapedBranchName), EscapedBranchName },
+            { nameof(Sha), Sha },
+            { nameof(ShortSha), ShortSha },
+            { nameof(MajorMinorPatch), MajorMinorPatch },
+            { nameof(SemVer), SemVer },
+            { nameof(FullSemVer), FullSemVer },
+            { nameof(AssemblySemVer), AssemblySemVer },
+            { nameof(AssemblySemFileVer), AssemblySemFileVer },
+            { nameof(PreReleaseTag), PreReleaseTag },
+            { nameof(PreReleaseTagWithDash), PreReleaseTagWithDash },
+            { nameof(PreReleaseLabel), PreReleaseLabel },
+            { nameof(PreReleaseLabelWithDash), PreReleaseLabelWithDash },
+            { nameof(PreReleaseNumber), PreReleaseNumber },
+            { nameof(WeightedPreReleaseNumber), WeightedPreReleaseNumber },
+            { nameof(InformationalVersion), InformationalVersion },
+            { nameof(CommitDate), CommitDate },
+            { nameof(VersionSourceSha), VersionSourceSha },
+            { nameof(CommitsSinceVersionSource), CommitsSinceVersionSource },
+            { nameof(UncommittedChanges), UncommittedChanges }
+        };
     }
 
     public string Major { get; }
@@ -84,29 +142,16 @@ public GitVersionVariables(string major,
     public string? CommitDate { get; set; }
     public string? UncommittedChanges { get; }
 
-    [ReflectionIgnore]
-    public static IEnumerable<string> AvailableVariables => typeof(GitVersionVariables)
-        .GetProperties()
-        .Where(p => !p.GetCustomAttributes(typeof(ReflectionIgnoreAttribute), false).Any())
-        .Select(p => p.Name)
-        .OrderBy(a => a, StringComparer.Ordinal);
-
     [ReflectionIgnore]
     public string? FileName { get; set; }
 
-    public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => this.GetProperties().GetEnumerator();
+    public IEnumerator<KeyValuePair<string, string?>> GetEnumerator() => _variables.GetEnumerator();
 
-    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+    IEnumerator IEnumerable.GetEnumerator() => _variables.GetEnumerator();
 
     public bool TryGetValue(string variable, out string? variableValue)
     {
-        var propertyInfo = typeof(GitVersionVariables).GetProperty(variable);
-        if (propertyInfo != null)
-        {
-            variableValue = propertyInfo.GetValue(this, null) as string;
-            return true;
-        }
-
+        if (_variables.TryGetValue(variable, out variableValue)) return true;
         variableValue = null;
         return false;
     }
diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCache.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCache.cs
@@ -26,7 +26,7 @@ public void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, GitVersionVar
 
         variablesFromCache.FileName = cacheFileName;
 
-        Dictionary<string, string> dictionary;
+        Dictionary<string, string?> dictionary;
         using (this.log.IndentLog("Creating dictionary"))
         {
             dictionary = variablesFromCache.ToDictionary(x => x.Key, x => x.Value);
diff --git a/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
diff --git a/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/fs/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
diff --git a/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt b/src/GitVersion.Output.Tests/Output/Approved/vb/GitVersionInfoGeneratorTests.ShouldCreateFile.approved.txt
diff --git a/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs b/src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs
diff --git a/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs b/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,6 @@ public BuildAgent(IEnvironment environment, ILog log) : base(environment, log)`
`61`	`61`
`62`	`62`	`public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;`
`63`	`63`
`64`		`- public override string[] GenerateSetParameterMessage(string name, string value) => Array.Empty<string>();`
	`64`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => Array.Empty<string>();`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public void GenerateSetVersionMessage(string fullSemVer)`
`58`	`58`
`59`	`59`	`[TestCase("Version", "1.2.3", "@@envrun[set name='GitVersion_Version' value='1.2.3']")]`
`60`	`60`	`[TestCase("Version", "1.2.3-rc4", "@@envrun[set name='GitVersion_Version' value='1.2.3-rc4']")]`
`61`		`- public void GenerateSetParameterMessage(string name, string value, string expected)`
	`61`	`+ public void GenerateSetParameterMessage(string name, string? value, string expected)`
`62`	`62`	`{`
`63`	`63`	`var output = this.buildServer.GenerateSetParameterMessage(name, value);`
`64`	`64`	`output.ShouldHaveSingleItem();`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)`
`41`	`41`	`return $"Set AppVeyor build number to '{variables.FullSemVer}'.";`
`42`	`42`	`}`
`43`	`43`
`44`		`- public override string[] GenerateSetParameterMessage(string name, string value)`
	`44`	`+ public override string[] GenerateSetParameterMessage(string name, string? value)`
`45`	`45`	`{`
`46`	`46`	`var apiUrl = Environment.GetEnvironmentVariable("APPVEYOR_API_URL") ?? throw new Exception("APPVEYOR_API_URL environment variable not set");`
`47`	`47`	`var httpClient = GetHttpClient(apiUrl);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public AzurePipelines(IEnvironment environment, ILog log) : base(environment, lo`
`15`	`15`
`16`	`16`	`protected override string EnvironmentVariable => EnvironmentVariableName;`
`17`	`17`
`18`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
	`18`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[]`
`19`	`19`	`{`
`20`	`20`	`$"##vso[task.setvariable variable=GitVersion.{name}]{value}",`
`21`	`21`	`$"##vso[task.setvariable variable=GitVersion.{name};isOutput=true]{value}"`
`@@ -33,7 +33,7 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)`
`33`	`33`	`if (buildNumberEnv.IsNullOrWhiteSpace())`
`34`	`34`	`return variables.FullSemVer;`
`35`	`35`
`36`		`- var newBuildNumber = variables.Aggregate(buildNumberEnv, ReplaceVariables);`
	`36`	`+ var newBuildNumber = variables.OrderBy(x => x.Key).Aggregate(buildNumberEnv, ReplaceVariables);`
`37`	`37`
`38`	`38`	`// If no variable substitution has happened, use FullSemVer`
`39`	`39`	`if (buildNumberEnv == newBuildNumber)`
`@@ -48,10 +48,14 @@ public override string GenerateSetVersionMessage(GitVersionVariables variables)`
`48`	`48`	`return $"##vso[build.updatebuildnumber]{newBuildNumber}";`
`49`	`49`	`}`
`50`	`50`
`51`		`- private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string> variable)`
	`51`	`+ private static string ReplaceVariables(string buildNumberEnv, KeyValuePair<string, string?> variable)`
`52`	`52`	`{`
`53`	`53`	`var pattern = $@"\$\(GITVERSION[_\.]{variable.Key}\)";`
`54`	`54`	`var replacement = variable.Value;`
`55`		`- return buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase);`
	`55`	`+ return replacement switch`
	`56`	`+ {`
	`57`	`+ null => buildNumberEnv,`
	`58`	`+ _ => buildNumberEnv.RegexReplace(pattern, replacement, RegexOptions.IgnoreCase)`
	`59`	`+ };`
`56`	`60`	`}`
`57`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal class BitBucketPipelines : BuildAgentBase`
`19`	`19`
`20`	`20`	`public void WithPropertyFile(string propertiesFileName) => this.file = propertiesFileName;`
`21`	`21`
`22`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[] { $"GITVERSION_{name.ToUpperInvariant()}={value}" };`
	`22`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[] { $"GITVERSION_{name.ToUpperInvariant()}={value}" };`
`23`	`23`
`24`	`24`	`public override void WriteIntegration(Action<string?> writer, GitVersionVariables variables, bool updateBuildNumber = true)`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ internal sealed class CodeBuild : BuildAgentBase`
`18`	`18`
`19`	`19`	`public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;`
`20`	`20`
`21`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
	`21`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[]`
`22`	`22`	`{`
`23`	`23`	`$"GitVersion_{name}={value}"`
`24`	`24`	`};`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public ContinuaCi(IEnvironment environment, ILog log) : base(environment, log)`
`13`	`13`
`14`	`14`	`protected override string EnvironmentVariable => EnvironmentVariableName;`
`15`	`15`
`16`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
	`16`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[]`
`17`	`17`	`{`
`18`	`18`	`$"@@continua[setVariable name='GitVersion_{name}' value='{value}' skipIfNotDefined='true']"`
`19`	`19`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public Drone(IEnvironment environment, ILog log) : base(environment, log)`
`16`	`16`
`17`	`17`	`public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;`
`18`	`18`
`19`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
	`19`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[]`
`20`	`20`	`{`
`21`	`21`	`$"GitVersion_{name}={value}"`
`22`	`22`	`};`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public override bool CanApplyToCurrentContext()`
`31`	`31`
`32`	`32`	`public override string GenerateSetVersionMessage(GitVersionVariables variables) => variables.FullSemVer;`
`33`	`33`
`34`		`- public override string[] GenerateSetParameterMessage(string name, string value) => new[]`
	`34`	`+ public override string[] GenerateSetParameterMessage(string name, string? value) => new[]`
`35`	`35`	`{`
`36`	`36`	`$"@@envrun[set name='GitVersion_{name}' value='{value}']"`
`37`	`37`	`};`