Merge pull request #727 from Hugo-Dahl-Tyler/bugfix/GitHubActions-Fil…

…e-Output-Has-Redundant-Entries GitHub actions file output has redundant entries
dotnet · Mar 6, 2022 · d66ac53 · d66ac53
2 parents 06fb918 + b6e44c3
commit d66ac53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/NerdBank.GitVersioning/CloudBuildServices/GitHubActions.cs b/src/NerdBank.GitVersioning/CloudBuildServices/GitHubActions.cs
@@ -28,7 +28,7 @@ internal class GitHubActions : ICloudBuild
 
         public IReadOnlyDictionary<string, string> SetCloudBuildVariable(string name, string value, TextWriter stdout, TextWriter stderr)
         {
-            Utilities.FileOperationWithRetry(() => File.AppendAllText(EnvironmentFile, $"{Environment.NewLine}{name}={value}{Environment.NewLine}"));
+            Utilities.FileOperationWithRetry(() => File.AppendAllLines(EnvironmentFile, new [] {$"{name}={value}"}));
             return GetDictionaryFor(name, value);
         }
 

diff --git a/src/Shared/Utilities.cs b/src/Shared/Utilities.cs
@@ -19,6 +19,7 @@ internal static void FileOperationWithRetry(Action operation)
                 try
                 {
                     operation();
+                    break;
                 }
                 catch (IOException ex) when (ex.HResult == ProcessCannotAccessFileHR && retriesLeft > 0)
                 {