update: patch

Author: rahulssv-ibm

patches/runner-main-sdk8-ppc64le.patch

@@ -110,7 +110,7 @@ index 2c20d1b1..63957a5d 100644
              public static readonly Architecture PlatformArchitecture = Architecture.X64;
  #endif
 diff --git a/src/Runner.Common/HostTraceListener.cs b/src/Runner.Common/HostTraceListener.cs
-index c1953d88..61561ba7 100644
+index c1953d88..f48d9581 100644
 --- a/src/Runner.Common/HostTraceListener.cs
 +++ b/src/Runner.Common/HostTraceListener.cs
 @@ -4,19 +4,21 @@ using System.Diagnostics;
@@ -150,7 +150,7 @@ index c1953d88..61561ba7 100644
                  _currentPageSize = 0;
              }
 
-@@ -49,12 +51,10 @@ namespace GitHub.Runner.Common
+@@ -49,7 +51,7 @@ namespace GitHub.Runner.Common
          {
              ArgUtil.NotNullOrEmpty(logFile, nameof(logFile));
              Directory.CreateDirectory(Path.GetDirectoryName(logFile));
@@ -159,12 +159,7 @@ index c1953d88..61561ba7 100644
              Writer = new StreamWriter(logStream);
          }
 
--        // Copied and modified slightly from .Net Core source code. Modification was required to make it compile.
--        // There must be some TraceFilter extension class that is missing in this source code.
-         public override void TraceEvent(TraceEventCache eventCache, string source, TraceEventType eventType, int id, string message)
-         {
-             if (Filter != null && !Filter.ShouldTrace(eventCache, source, eventType, id, message, null, null, null))
-@@ -69,10 +69,16 @@ namespace GitHub.Runner.Common
+@@ -69,10 +71,16 @@ namespace GitHub.Runner.Common
 
          public override void WriteLine(string message)
          {
@@ -183,7 +178,7 @@ index c1953d88..61561ba7 100644
                  _currentPageSize += messageSize;
                  if (_currentPageSize > _pageSizeLimit)
                  {
-@@ -93,10 +99,16 @@ namespace GitHub.Runner.Common
+@@ -93,10 +101,16 @@ namespace GitHub.Runner.Common
 
          public override void Write(string message)
          {
@@ -202,7 +197,7 @@ index c1953d88..61561ba7 100644
                  _currentPageSize += messageSize;
              }
 
-@@ -111,30 +123,17 @@ namespace GitHub.Runner.Common
+@@ -111,30 +125,17 @@ namespace GitHub.Runner.Common
          // Altered from the original .Net Core implementation.
          private void WriteHeader(string source, TraceEventType eventType, int id)
          {
@@ -243,7 +238,7 @@ index c1953d88..61561ba7 100644
          }
 
          // Copied and modified slightly from .Net Core source code to make it compile. The original code
-@@ -164,38 +163,43 @@ namespace GitHub.Runner.Common
+@@ -164,38 +165,43 @@ namespace GitHub.Runner.Common
          {
              if (_enableLogRetention)
              {
@@ -309,7 +304,7 @@ index c1953d88..61561ba7 100644
      }
  }
 diff --git a/src/Runner.Common/Logging.cs b/src/Runner.Common/Logging.cs
-index 9200ca59..6fa0decc 100644
+index 9200ca59..eefa042b 100644
 --- a/src/Runner.Common/Logging.cs
 +++ b/src/Runner.Common/Logging.cs
 @@ -1,5 +1,7 @@
@@ -320,93 +315,8 @@ index 9200ca59..6fa0decc 100644
 
  namespace GitHub.Runner.Common
  {
-@@ -8,10 +10,8 @@ namespace GitHub.Runner.Common
-     {
-         long TotalLines { get; }
-         void Setup(Guid timelineId, Guid timelineRecordId);
--
--        void Write(string message);
--
--        void End();
-+        Task WriteAsync(string message); // Changed to async
-+        Task EndAsync();
-     }
- 
-     public class PagingLogger : RunnerService, IPagingLogger
-@@ -70,98 +70,93 @@ namespace GitHub.Runner.Common
-         // and the consumer queues it for upload
-         // Ensure this is lazy.  Create a page on first write
-         //
--        public void Write(string message)
-+        public async Task WriteAsync(string message)
-         {
-             // lazy creation on write
-             if (_pageWriter == null)
-             {
--                NewPage();
-+                await NewPageAsync();
-             }
- 
-             if (_resultsBlockWriter == null)
-             {
--                NewBlock();
-+                await NewBlockAsync();
-             }
- 
--            string line = $"{DateTime.UtcNow.ToString("O")} {message}";
--            _pageWriter.WriteLine(line);
--            _resultsBlockWriter.WriteLine(line);
-+            string line = $"{DateTime.UtcNow:O} {message}";
-+            await _pageWriter.WriteLineAsync(line);
-+            await _resultsBlockWriter.WriteLineAsync(line);
- 
-             _totalLines++;
--            if (line.IndexOf('\n') != -1)
-+            if (line.Contains('\n'))
-             {
--                foreach (char c in line)
--                {
--                    if (c == '\n')
--                    {
--                        _totalLines++;
--                    }
--                }
-+                _totalLines += line.Split('\n').Length - 1;
-             }
- 
--            var bytes = System.Text.Encoding.UTF8.GetByteCount(line);
-+            int bytes = Encoding.UTF8.GetByteCount(line);
-             _byteCount += bytes;
-             _blockByteCount += bytes;
-+
-             if (_byteCount >= PageSize)
-             {
--                NewPage();
-+                await NewPageAsync();
-             }
- 
-             if (_blockByteCount >= BlockSize)
-             {
--                NewBlock();
-+                await NewBlockAsync();
-             }
--
-         }
- 
--        public void End()
-+        public async Task EndAsync()
-         {
--            EndPage();
--            EndBlock(true);
-+            await EndPageAsync();
-+            await EndBlockAsync(true);
-         }
- 
--        private void NewPage()
-+        private async Task NewPageAsync()
-         {
--            EndPage();
-+            await EndPageAsync();
+@@ -125,8 +127,9 @@ namespace GitHub.Runner.Common
+             EndPage();
              _byteCount = 0;
              _dataFileName = Path.Combine(_pagesFolder, $"{_timelineId}_{_timelineRecordId}_{++_pageCount}.log");
 -            _pageData = new FileStream(_dataFileName, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
@@ -416,29 +326,9 @@ index 9200ca59..6fa0decc 100644
 +            _pageWriter = new StreamWriter(bufferedStream, Encoding.UTF8);
          }
 
--        private void EndPage()
-+        private async Task EndPageAsync()
-         {
-             if (_pageWriter != null)
-             {
--                _pageWriter.Flush();
--                _pageData.Flush();
--                //The StreamWriter object calls Dispose() on the provided Stream object when StreamWriter.Dispose is called.
-+                await _pageWriter.FlushAsync();
-+                await _pageData.FlushAsync();
-                 _pageWriter.Dispose();
-                 _pageWriter = null;
-                 _pageData = null;
--                _jobServerQueue.QueueFileUpload(_timelineId, _timelineRecordId, "DistributedTask.Core.Log", "CustomToolLog", _dataFileName, true);
-+                await _jobServerQueue.QueueFileUpload(_timelineId, _timelineRecordId, "DistributedTask.Core.Log", "CustomToolLog", _dataFileName, true);
-             }
-         }
- 
--        private void NewBlock()
-+        private async Task NewBlockAsync()
-         {
--            EndBlock(false);
-+            await EndBlockAsync(false);
+         private void EndPage()
+@@ -148,8 +151,9 @@ namespace GitHub.Runner.Common
+             EndBlock(false);
              _blockByteCount = 0;
              _resultsDataFileName = Path.Combine(_resultsBlockFolder, $"{_timelineId}_{_timelineRecordId}.{++_blockCount}");
 -            _resultsBlockData = new FileStream(_resultsDataFileName, FileMode.CreateNew, FileAccess.ReadWrite, FileShare.ReadWrite);
@@ -448,23 +338,7 @@ index 9200ca59..6fa0decc 100644
 +            _resultsBlockWriter = new StreamWriter(bufferedStream, Encoding.UTF8);
          }
 
--        private void EndBlock(bool finalize)
-+        private async Task EndBlockAsync(bool finalize)
-         {
-             if (_resultsBlockWriter != null)
-             {
--                _resultsBlockWriter.Flush();
--                _resultsBlockData.Flush();
-+                await _resultsBlockWriter.FlushAsync();
-+                await _resultsBlockData.FlushAsync();
-                 _resultsBlockWriter.Dispose();
-                 _resultsBlockWriter = null;
-                 _resultsBlockData = null;
--                _jobServerQueue.QueueResultsUpload(_timelineRecordId, "ResultsLog", _resultsDataFileName, "Results.Core.Log", deleteSource: true, finalize, firstBlock: _resultsDataFileName.EndsWith(".1"), totalLines: _totalLines);
-+                await _jobServerQueue.QueueResultsUpload(_timelineRecordId, "ResultsLog", _resultsDataFileName, "Results.Core.Log", deleteSource: true, finalize, firstBlock: _resultsDataFileName.EndsWith(".1"), totalLines: _totalLines);
-             }
-         }
-     }
+         private void EndBlock(bool finalize)
 diff --git a/src/Runner.Common/Runner.Common.csproj b/src/Runner.Common/Runner.Common.csproj
 index 6c463562..933385ed 100644
 --- a/src/Runner.Common/Runner.Common.csproj