Goodbye BOM

* Fix `uses: docker://image:tag` steps when container hook is used

* Update src/Runner.Worker/ActionManager.cs

---------

Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>

images/Dockerfile

@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/runtime-deps:6.0 as build
 
 ARG RUNNER_VERSION
 ARG RUNNER_ARCH="x64"
-ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.1
+ARG RUNNER_CONTAINER_HOOKS_VERSION=0.3.2
 ARG DOCKER_VERSION=20.10.23
 
 RUN apt update -y && apt install curl unzip -y

src/Runner.Common/ActionsRunServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.DistributedTask.Pipelines;

src/Runner.Common/BrokerServer.cs

@@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using GitHub.Actions.RunService.WebApi;
 using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
-using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;
 using Sdk.RSWebApi.Contracts;
@@ -19,7 +18,6 @@ namespace GitHub.Runner.Common
         Task ConnectAsync(Uri serverUrl, VssCredentials credentials);
 
         Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
-        Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken token);
     }
 
     public sealed class BrokerServer : RunnerService, IBrokerServer
@@ -50,20 +48,9 @@ namespace GitHub.Runner.Common
         {
             CheckConnection();
             var jobMessage = RetryRequest<TaskAgentMessage>(
-                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken
+                async () => await _brokerHttpClient.GetRunnerMessageAsync(version, status, cancellationToken), cancellationToken);
-                );
 
             return jobMessage;
         }
-
-        public Task<bool> DeleteRunnerMessageAsync(string messageID, CancellationToken cancellationToken)
-        {
-            CheckConnection();
-
-            return RetryRequest(
-                async () => await _brokerHttpClient.DeleteRunnerMessageAsync(messageID, cancellationToken),
-                cancellationToken
-            );
-        }
     }
 }

src/Runner.Common/CredentialData.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace GitHub.Runner.Common

src/Runner.Common/Exceptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Runner.Common
 {

src/Runner.Common/Extensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 

src/Runner.Common/IExtension.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Runner.Common
 {

src/Runner.Common/LocationServer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using GitHub.Services.WebApi;
 using GitHub.Services.Location.Client;

src/Runner.Common/ProcessChannel.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.IO.Pipes;
 using System.Threading;

src/Runner.Common/ProcessExtensions.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using GitHub.Runner.Sdk;
 using System;
 using System.Collections.Concurrent;

src/Runner.Common/StreamString.cs

@@ -1,4 +1,4 @@
-// Defines the data protocol for reading and writing strings on our stream
+// Defines the data protocol for reading and writing strings on our stream
 using System;
 using System.IO;
 using System.Text;

src/Runner.Common/Terminal.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace GitHub.Runner.Common

src/Runner.Common/TraceSetting.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Runtime.Serialization;

src/Runner.Common/Util/EnumUtil.cs

@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Common.Util
+namespace GitHub.Runner.Common.Util
 {
     using System;
 

src/Runner.Common/Util/NodeUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.ObjectModel;
 
 namespace GitHub.Runner.Common.Util

src/Runner.Common/Util/PlanUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 

src/Runner.Common/Util/TaskResultUtil.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using System;
 
 namespace GitHub.Runner.Common.Util

src/Runner.Common/Util/UnixUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Sdk;

src/Runner.Listener/BrokerMessageListener.cs

@@ -170,17 +170,7 @@ namespace GitHub.Runner.Listener
 
         public async Task DeleteMessageAsync(TaskAgentMessage message)
         {
-            Trace.Entering();
+            await Task.CompletedTask;
-
-            if (MessageUtil.IsRunServiceJob(message.MessageType))
-            {
-                var messageRef = StringUtil.ConvertFromJson<RunnerJobRequestRef>(message.Body);
-
-                using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30)))
-                {
-                    await _brokerServer.DeleteRunnerMessageAsync(messageRef.RunnerRequestId, cs.Token);
-                }
-            }
         }
 
         private bool IsGetNextMessageExceptionRetriable(Exception ex)

src/Runner.Listener/Configuration/ConfigurationManager.cs

@@ -137,7 +137,7 @@ namespace GitHub.Runner.Listener.Configuration
                     GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
                     runnerSettings.ServerUrl = authResult.TenantUrl;
                     runnerSettings.UseV2Flow = authResult.UseV2Flow;
-                    _term.WriteLine($"Using V2 flow: {runnerSettings.UseV2Flow}");
+                    Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
                     creds = authResult.ToVssCredentials();
                     Trace.Info("cred retrieved via GitHub auth");
                 }

src/Runner.Listener/Configuration/CredentialProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.Services.Common;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;

src/Runner.Listener/Configuration/IRSAKeyManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Runtime.Serialization;
 using System.Security.Cryptography;
 using GitHub.Runner.Common;

src/Runner.Listener/Configuration/OAuthCredential.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;
 using GitHub.Services.Common;

src/Runner.Listener/Configuration/OsxServiceControlManager.cs

@@ -1,4 +1,4 @@
-#if OS_OSX
+#if OS_OSX
 using System;
 using System.IO;
 using System.Collections.Generic;

src/Runner.Listener/Runner.cs

@@ -392,7 +392,6 @@ namespace GitHub.Runner.Listener
                     {
                         TaskAgentMessage message = null;
                         bool skipMessageDeletion = false;
-                        bool useBrokerDeletion = false;
                         try
                         {
                             Task<TaskAgentMessage> getNextMessage = _listener.GetNextMessageAsync(messageQueueLoopTokenSource.Token);
@@ -601,15 +600,7 @@ namespace GitHub.Runner.Listener
                             {
                                 try
                                 {
-                                    if (useBrokerDeletion)
+                                    await _listener.DeleteMessageAsync(message);
-                                    {
-                                        // await _listener.DeleteMessageAsync(brokerDeletionParamsMessageID, brokerDeletionParamsToken);
-                                        await _listener.DeleteMessageAsync(message);
-                                    }
-                                    else
-                                    {
-                                        await _listener.DeleteMessageAsync(message);
-                                    }
                                 }
                                 catch (Exception ex)
                                 {

src/Runner.Plugins/Artifact/DownloadArtifact.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;

src/Runner.Plugins/Artifact/FileContainerServer.cs

@@ -1,4 +1,4 @@
-using GitHub.Services.FileContainer.Client;
+using GitHub.Services.FileContainer.Client;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;

src/Runner.Sdk/ITraceWriter.cs

@@ -1,4 +1,4 @@
-namespace GitHub.Runner.Sdk
+namespace GitHub.Runner.Sdk
 {
     public interface ITraceWriter
     {

src/Runner.Sdk/SdkConstants.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Runner.Sdk
 {

src/Runner.Sdk/Util/VssUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Net.Http;

src/Runner.Service/Windows/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ServiceProcess;
 using System.Diagnostics;
 using System.ComponentModel;

src/Runner.Service/Windows/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 

src/Runner.Service/Windows/Resource.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000

src/Runner.Service/Windows/RunnerService.Designer.cs

@@ -1,4 +1,4 @@
-namespace RunnerService
+namespace RunnerService
 {
     partial class RunnerService
     {

src/Runner.Service/Windows/RunnerService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;

src/Runner.Worker/ActionManager.cs

@@ -317,15 +317,28 @@ namespace GitHub.Runner.Worker
 
             if (action.Reference.Type == Pipelines.ActionSourceType.ContainerRegistry)
             {
-                Trace.Info("Load action that reference container from registry.");
+                if (FeatureManager.IsContainerHooksEnabled(executionContext.Global.Variables))
-                CachedActionContainers.TryGetValue(action.Id, out var container);
-                ArgUtil.NotNull(container, nameof(container));
-                definition.Data.Execution = new ContainerActionExecutionData()
                 {
-                    Image = container.ContainerImage
+                    Trace.Info("Load action that will run container through container hooks.");
-                };
+                    var containerAction = action.Reference as Pipelines.ContainerRegistryReference;
+                    definition.Data.Execution = new ContainerActionExecutionData()
+                    {
+                        Image = containerAction.Image,
+                    };
+                    Trace.Info($"Using action container image: {containerAction.Image}.");
+                }
+                else
+                {
+                    Trace.Info("Load action that reference container from registry.");
+                    CachedActionContainers.TryGetValue(action.Id, out var container);
+                    ArgUtil.NotNull(container, nameof(container));
+                    definition.Data.Execution = new ContainerActionExecutionData()
+                    {
+                        Image = container.ContainerImage
+                    };
 
-                Trace.Info($"Using action container image: {container.ContainerImage}.");
+                    Trace.Info($"Using action container image: {container.ContainerImage}.");
+                }
             }
             else if (action.Reference.Type == Pipelines.ActionSourceType.Repository)
             {

src/Runner.Worker/Container/ContainerHooks/ContainerHookManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Worker/Container/ContainerHooks/HookInput.cs

@@ -83,7 +83,7 @@ namespace GitHub.Runner.Worker.Container.ContainerHooks
         public HookContainer(ContainerInfo container)
         {
             Image = container.ContainerImage;
-            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()) ?? new List<string>();
+            EntryPointArgs = container.ContainerEntryPointArgs?.Split(' ').Select(arg => arg.Trim()).Where(arg => !string.IsNullOrEmpty(arg)) ?? new List<string>();
             EntryPoint = container.ContainerEntryPoint;
             WorkingDirectory = container.ContainerWorkDirectory;
             CreateOptions = container.ContainerCreateOptions;

src/Runner.Worker/Container/ContainerInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using GitHub.Runner.Common;

src/Runner.Worker/Container/DockerCommandManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Worker/Container/DockerUtil.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 

src/Runner.Worker/ContainerOperationProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;

src/Runner.Worker/DiagnosticLogManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;

src/Runner.Worker/Expressions/AlwaysFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

src/Runner.Worker/Expressions/CancelledFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

src/Runner.Worker/Expressions/FailureFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

src/Runner.Worker/Expressions/SuccessFunction.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;

src/Runner.Worker/FeatureManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using GitHub.Runner.Common;
 
 namespace GitHub.Runner.Worker

src/Runner.Worker/Handlers/ContainerActionHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

src/Runner.Worker/Handlers/HandlerFactory.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;

src/Runner.Worker/Handlers/RunnerPluginHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;
 using GitHub.Runner.Sdk;

src/Runner.Worker/Handlers/ScriptHandler.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Text;

src/Runner.Worker/Handlers/StepHost.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using GitHub.DistributedTask.Pipelines.ContextData;
 using System.Text;

src/Runner.Worker/JobHookProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;

src/Runner.Worker/JobRunner.cs

@@ -150,6 +150,11 @@ namespace GitHub.Runner.Worker
                 _runnerSettings = HostContext.GetService<IConfigurationStore>().GetSettings();
                 jobContext.SetRunnerContext("name", _runnerSettings.AgentName);
 
+                if (jobContext.Global.Variables.TryGetValue(WellKnownDistributedTaskVariables.RunnerEnvironment, out var runnerEnvironment))
+                {
+                    jobContext.SetRunnerContext("environment", runnerEnvironment);
+                }
+
                 string toolsDirectory = HostContext.GetDirectory(WellKnownDirectory.Tools);
                 Directory.CreateDirectory(toolsDirectory);
                 jobContext.SetRunnerContext("tool_cache", toolsDirectory);

src/Runner.Worker/PipelineDirectoryManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using GitHub.DistributedTask.Pipelines;

src/Runner.Worker/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Threading.Tasks;
 using GitHub.Runner.Common;

src/Runner.Worker/RunnerPluginManager.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Sdk;
 using GitHub.Runner.Common.Util;
 using GitHub.Services.WebApi;

src/Runner.Worker/StepsContext.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.Pipelines.ContextData;
+using GitHub.DistributedTask.Pipelines.ContextData;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using System;

src/Runner.Worker/TempDirectoryManager.cs

@@ -1,4 +1,4 @@
-using GitHub.Runner.Common.Util;
+using GitHub.Runner.Common.Util;
 using System;
 using System.IO;
 using System.Threading;

src/Runner.Worker/TrackingConfig.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.Pipelines;
+using GitHub.DistributedTask.Pipelines;
 using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using Newtonsoft.Json;

src/Runner.Worker/TrackingManager.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using GitHub.Runner.Common.Util;
 using Newtonsoft.Json;
 using System;

src/Runner.Worker/Worker.cs

@@ -1,4 +1,4 @@
-using GitHub.DistributedTask.WebApi;
+using GitHub.DistributedTask.WebApi;
 using Pipelines = GitHub.DistributedTask.Pipelines;
 using GitHub.Runner.Common.Util;
 using Newtonsoft.Json;

src/Sdk/Common/Common/Authentication/FederatedCredential.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Net;
 using GitHub.Services.Common.Internal;

src/Sdk/Common/Common/Authentication/HttpRequestMessageWrapper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;

src/Sdk/Common/Common/Authentication/HttpResponseMessageWrapper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Sdk/Common/Common/Authentication/IHttpHeaders.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace GitHub.Services.Common

src/Sdk/Common/Common/Authentication/IHttpRequest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace GitHub.Services.Common

src/Sdk/Common/Common/Authentication/IHttpResponse.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/Authentication/IVssCredentialPrompt.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 
 namespace GitHub.Services.Common

src/Sdk/Common/Common/Authentication/IVssCredentialStorage.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/Authentication/IssuedToken.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;

src/Sdk/Common/Common/Authentication/IssuedTokenCredential.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 

src/Sdk/Common/Common/Authentication/IssuedTokenProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;

src/Sdk/Common/Common/Authentication/VssCredentials.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;

src/Sdk/Common/Common/ClientStorage/IVssClientStorage.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 

src/Sdk/Common/Common/ClientStorage/VssFileStorage.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel;

src/Sdk/Common/Common/Diagnostics/HttpRequestMessageExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Net.Http;
 

src/Sdk/Common/Common/Diagnostics/VssHttpEventSource.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Tracing;
 using System.Globalization;

src/Sdk/Common/Common/Diagnostics/VssHttpMethod.cs

@@ -1,4 +1,4 @@
-
+
 namespace GitHub.Services.Common.Diagnostics
 {
     internal enum VssHttpMethod

src/Sdk/Common/Common/Diagnostics/VssTraceActivity.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.Serialization;
 

src/Sdk/Common/Common/ExceptionMappingAttribute.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 
 namespace GitHub.Services.Common

src/Sdk/Common/Common/Exceptions/AuthenticationExceptions.cs

@@ -1,4 +1,4 @@
-using GitHub.Services.Common.Internal;
+using GitHub.Services.Common.Internal;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;

src/Sdk/Common/Common/Exceptions/CommonExceptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 

src/Sdk/Common/Common/Exceptions/PropertyExceptions.cs

@@ -1,4 +1,4 @@
-using GitHub.Services.Common.Internal;
+using GitHub.Services.Common.Internal;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;

src/Sdk/Common/Common/GenerateConstantAttributes.cs

@@ -1,4 +1,4 @@
-// Microsoft Confidential
+// Microsoft Confidential
 // Copyright (c) Microsoft Corporation.  All rights reserved.
 
 using System;

src/Sdk/Common/Common/IVssClientCertificateManager.cs

@@ -1,4 +1,4 @@
-using System.Security.Cryptography.X509Certificates;
+using System.Security.Cryptography.X509Certificates;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/IVssHttpRetryInfo.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

src/Sdk/Common/Common/Performance/PerformanceTimerConstants.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/Performance/PerformanceTimingGroup.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
 

src/Sdk/Common/Common/TaskCancellationExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Threading;

src/Sdk/Common/Common/Utility/ArgumentUtility.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;

src/Sdk/Common/Common/Utility/ArrayUtility.cs

@@ -1,4 +1,4 @@
-//*************************************************************************************************
+//*************************************************************************************************
 // ArrayUtil.cs
 //
 // A class with random array processing helper routines.

src/Sdk/Common/Common/Utility/BackoffTimerHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 
 namespace GitHub.Services.Common

src/Sdk/Common/Common/Utility/CollectionsExtensions.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/Utility/ConvertUtility.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using System.Reflection;

src/Sdk/Common/Common/Utility/DictionaryExtensions.cs

@@ -1,4 +1,4 @@
-using GitHub.Services.Common.Internal;
+using GitHub.Services.Common.Internal;
 using System;
 using System.Collections.Generic;
 using System.Globalization;

src/Sdk/Common/Common/Utility/EnumerableExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;

src/Sdk/Common/Common/Utility/ExpectedExceptionExtensions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace GitHub.Services.Common
 {

src/Sdk/Common/Common/Utility/HashAlgorithmExtensions.cs

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;