Merge pull request #729 from dotnet/v3.4

Merge v3.4 to master

Author: AArnott

src/NerdBank.GitVersioning/CloudBuildServices/GitHubActions.cs

@@ -28,7 +28,7 @@ public IReadOnlyDictionary<string, string> SetCloudBuildNumber(string buildNumbe
 
         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);
         }
 

src/Nerdbank.GitVersioning.Tasks/ContextAwareTask.cs

@@ -56,7 +56,7 @@ where outerProperty.SetMethod is not null && outerProperty.GetMethod is not null
             // On .NET Framework (on Windows), we find native binaries by adding them to our PATH.
             if (this.UnmanagedDllDirectory is not null)
             {
-                string pathEnvVar = Environment.GetEnvironmentVariable("PATH");
+                string pathEnvVar = Environment.GetEnvironmentVariable("PATH") ?? string.Empty;
                 string[] searchPaths = pathEnvVar.Split(Path.PathSeparator);
                 if (!searchPaths.Contains(this.UnmanagedDllDirectory, StringComparer.OrdinalIgnoreCase))
                 {

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)
                 {