.

2025-12-10 20:36:49 +00:00 · 2022-05-05 19:37:03 +00:00 · 2022-05-05 19:24:55 +00:00 · 2022-05-04 23:36:25 +00:00 · 2022-05-04 18:33:34 +00:00 · 2022-05-04 04:22:59 +00:00
18 changed files with 145 additions and 190 deletions
--- a/src/Runner.Common/RunServer.cs
+++ b/src/Runner.Common/RunServer.cs
@@ -1,7 +1,6 @@
 using GitHub.DistributedTask.WebApi;
 using System;
 using System.Collections.Generic;
-using System.Runtime.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Runner.Common.Util;
@@ -12,12 +11,12 @@ using GitHub.DistributedTask.Pipelines;

 namespace GitHub.Runner.Common
 {
-    [ServiceLocator(Default = typeof(RunServer))]
+    [ServiceLocator(Default = typeof(RunnerServer))]
    public interface IRunServer : IRunnerService
    {
        Task ConnectAsync(Uri serverUrl, VssCredentials credentials);

-        Task<AgentJobRequestMessage> GetJobMessageAsync(Guid scopeId, Guid hostId, string planType, string planGroup, Guid planId, IList<InstanceRef> instanceRefsJson);
+        Task<AgentJobRequestMessage> GetJobMessageAsync(Guid scopeId, string planType, string planGroup, Guid planId, string instanceRefsJson);
    }

    public sealed class RunServer : RunnerService, IRunServer
@@ -28,7 +27,7 @@ namespace GitHub.Runner.Common

        public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
        {
-            // System.Console.WriteLine("RunServer.ConnectAsync");
+            System.Console.WriteLine("RunServer.ConnectAsync");
            _connection = await EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
            _taskAgentClient = _connection.GetClient<TaskAgentHttpClient>();
            _hasConnection = true;
@@ -36,7 +35,7 @@ namespace GitHub.Runner.Common

        private async Task<VssConnection> EstablishVssConnection(Uri serverUrl, VssCredentials credentials, TimeSpan timeout)
        {
-            // System.Console.WriteLine("EstablishVssConnection");
+            System.Console.WriteLine("EstablishVssConnection");
            Trace.Info($"EstablishVssConnection");
            Trace.Info($"Establish connection with {timeout.TotalSeconds} seconds timeout.");
            int attemptCount = 5;
@@ -71,50 +70,14 @@ namespace GitHub.Runner.Common

        public Task<AgentJobRequestMessage> GetJobMessageAsync(
            Guid scopeId,
-            Guid hostId,
            string planType,
            string planGroup,
            Guid planId,
-            IList<InstanceRef> instanceRefsJson)
+            string instanceRefsJson)
        {
-            // System.Console.WriteLine("RunServer.GetMessageAsync");
+            System.Console.WriteLine("RunServer.GetMessageAsync");
            CheckConnection();
-            return _taskAgentClient.GetJobMessageAsync(scopeId, hostId, planType, planGroup, planId, StringUtil.ConvertToJson(instanceRefsJson, Newtonsoft.Json.Formatting.None));
+            return _taskAgentClient.GetJobMessageAsync(scopeId, planType, planGroup, planId, instanceRefsJson);
        }
    }
-
-    // todo: move to SDK?
-    [DataContract]
-    public sealed class MessageRef
-    {
-        [DataMember(Name = "url")]
-        public string Url { get; set; }
-        [DataMember(Name = "token")]
-        public string Token { get; set; }
-        [DataMember(Name = "scopeId")]
-        public Guid ScopeId { get; set; }
-        [DataMember(Name = "hostId")]
-        public Guid HostId { get; set; }
-        [DataMember(Name = "planType")]
-        public string PlanType { get; set; }
-        [DataMember(Name = "planGroup")]
-        public string PlanGroup { get; set; }
-        [DataMember(Name = "planId")]
-        public Guid PlanId { get; set; }
-        [DataMember(Name = "instanceRefs")]
-        public InstanceRef[] InstanceRefs { get; set; }
-        [DataMember(Name = "labels")]
-        public string[] Labels { get; set; }
-    }
-
-    [DataContract]
-    public sealed class InstanceRef
-    {
-        [DataMember(Name = "name")]
-        public string Name { get; set; }
-        [DataMember(Name = "instanceType")]
-        public string InstanceType { get; set; }
-        [DataMember(Name = "attempt")]
-        public int Attempt { get; set; }
-    }
 }
--- a/src/Runner.Common/RunnerServer.cs
+++ b/src/Runner.Common/RunnerServer.cs
@@ -44,7 +44,7 @@ namespace GitHub.Runner.Common
        // job request
        Task<TaskAgentJobRequest> GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken);
        Task<TaskAgentJobRequest> RenewAgentRequestAsync(int poolId, long requestId, Guid lockToken, string orchestrationId, CancellationToken cancellationToken);
-        Task<TaskAgentJobRequest> FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, Guid targetHostId, CancellationToken cancellationToken);
+        Task<TaskAgentJobRequest> FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, CancellationToken cancellationToken);

        // agent package
        Task<List<PackageMetadata>> GetPackagesAsync(string packageType, string platform, int top, bool includeToken, CancellationToken cancellationToken);
@@ -68,15 +68,15 @@ namespace GitHub.Runner.Common

        public async Task ConnectAsync(Uri serverUrl, VssCredentials credentials)
        {
-            // System.Console.WriteLine("RunnerServer.ConnectAsync: Create message connection");
+            System.Console.WriteLine("RunnerServer.ConnectAsync: Create message connection");
            var createMessageConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(60));
            await Task.WhenAll(createMessageConnection);

-            // System.Console.WriteLine("RunnerServer.ConnectAsync: Create generic connection");
+            System.Console.WriteLine("RunnerServer.ConnectAsync: Create generic connection");
            var createGenericConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(100));
            await Task.WhenAll(createGenericConnection);

-            // System.Console.WriteLine("RunnerServer.ConnectAsync: Create request connection");
+            System.Console.WriteLine("RunnerServer.ConnectAsync: Create request connection");
            var createRequestConnection = EstablishVssConnection(serverUrl, credentials, TimeSpan.FromSeconds(60));
            await Task.WhenAll(createRequestConnection);

@@ -194,7 +194,7 @@ namespace GitHub.Runner.Common

        private async Task<VssConnection> EstablishVssConnection(Uri serverUrl, VssCredentials credentials, TimeSpan timeout)
        {
-            // System.Console.WriteLine("EstablishVssConnection");
+            System.Console.WriteLine("EstablishVssConnection");
            Trace.Info($"EstablishVssConnection");
            Trace.Info($"Establish connection with {timeout.TotalSeconds} seconds timeout.");
            int attemptCount = 5;
@@ -252,48 +252,48 @@ namespace GitHub.Runner.Common

        public Task<List<TaskAgentPool>> GetAgentPoolsAsync(string agentPoolName = null, TaskAgentPoolType poolType = TaskAgentPoolType.Automation)
        {
-            // System.Console.WriteLine("RunnerServer.GetAgentPoolsAsync");
+            System.Console.WriteLine("RunnerServer.GetAgentPoolsAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.GetAgentPoolsAsync(agentPoolName, poolType: poolType);
        }

        public Task<TaskAgent> AddAgentAsync(Int32 agentPoolId, TaskAgent agent)
        {
-            // System.Console.WriteLine("RunnerServer.AddAgentAsync");
+            System.Console.WriteLine("RunnerServer.AddAgentAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.AddAgentAsync(agentPoolId, agent);
        }

        public Task<List<TaskAgent>> GetAgentsAsync(int agentPoolId, string agentName = null)
        {
-            // System.Console.WriteLine("RunnerServer.GetAgentsAsync 1");
+            System.Console.WriteLine("RunnerServer.GetAgentsAsync 1");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.GetAgentsAsync(agentPoolId, agentName, false);
        }

        public Task<List<TaskAgent>> GetAgentsAsync(string agentName)
        {
-            // System.Console.WriteLine("RunnerServer.GetAgentsAsync 2");
+            System.Console.WriteLine("RunnerServer.GetAgentsAsync 2");
            return GetAgentsAsync(0, agentName); // search in all all agentPools
        }

        public Task<TaskAgent> ReplaceAgentAsync(int agentPoolId, TaskAgent agent)
        {
-            // System.Console.WriteLine("RunnerServer.ReplaceAgentAsync");
+            System.Console.WriteLine("RunnerServer.ReplaceAgentAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.ReplaceAgentAsync(agentPoolId, agent);
        }

        public Task DeleteAgentAsync(int agentPoolId, int agentId)
        {
-            // System.Console.WriteLine("RunnerServer.DeleteAgentAsync");
+            System.Console.WriteLine("RunnerServer.DeleteAgentAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.DeleteAgentAsync(agentPoolId, agentId);
        }

        public Task DeleteAgentAsync(int agentId)
        {
-            // System.Console.WriteLine("RunnerServer.DeleteAgentAsync");
+            System.Console.WriteLine("RunnerServer.DeleteAgentAsync");
            return DeleteAgentAsync(0, agentId); // agentPool is ignored server side
        }

@@ -303,28 +303,28 @@ namespace GitHub.Runner.Common

        public Task<TaskAgentSession> CreateAgentSessionAsync(Int32 poolId, TaskAgentSession session, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.CreateAgentSessionAsync");
+            System.Console.WriteLine("RunnerServer.CreateAgentSessionAsync");
            CheckConnection(RunnerConnectionType.MessageQueue);
            return _messageTaskAgentClient.CreateAgentSessionAsync(poolId, session, cancellationToken: cancellationToken);
        }

        public Task DeleteAgentMessageAsync(Int32 poolId, Int64 messageId, Guid sessionId, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.DeleteAgentMessageAsync");
+            System.Console.WriteLine("RunnerServer.DeleteAgentMessageAsync");
            CheckConnection(RunnerConnectionType.MessageQueue);
            return _messageTaskAgentClient.DeleteMessageAsync(poolId, messageId, sessionId, cancellationToken: cancellationToken);
        }

        public Task DeleteAgentSessionAsync(Int32 poolId, Guid sessionId, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.DeleteAgentSessionAsync");
+            System.Console.WriteLine("RunnerServer.DeleteAgentSessionAsync");
            CheckConnection(RunnerConnectionType.MessageQueue);
            return _messageTaskAgentClient.DeleteAgentSessionAsync(poolId, sessionId, cancellationToken: cancellationToken);
        }

        public Task<TaskAgentMessage> GetAgentMessageAsync(Int32 poolId, Guid sessionId, Int64? lastMessageId, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.GetAgentMessageAsync");
+            System.Console.WriteLine("RunnerServer.GetAgentMessageAsync");
            CheckConnection(RunnerConnectionType.MessageQueue);
            return _messageTaskAgentClient.GetMessageAsync(poolId, sessionId, lastMessageId, cancellationToken: cancellationToken);
        }
@@ -335,21 +335,21 @@ namespace GitHub.Runner.Common

        public Task<TaskAgentJobRequest> RenewAgentRequestAsync(int poolId, long requestId, Guid lockToken, string orchestrationId = null, CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("RunnerServer.RenewAgentRequestAsync");
+            System.Console.WriteLine("RunnerServer.RenewAgentRequestAsync");
            CheckConnection(RunnerConnectionType.JobRequest);
            return _requestTaskAgentClient.RenewAgentRequestAsync(poolId, requestId, lockToken, orchestrationId: orchestrationId, cancellationToken: cancellationToken);
        }

-        public Task<TaskAgentJobRequest> FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, Guid targetHostId, CancellationToken cancellationToken = default(CancellationToken))
+        public Task<TaskAgentJobRequest> FinishAgentRequestAsync(int poolId, long requestId, Guid lockToken, DateTime finishTime, TaskResult result, CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("RunnerServer.FinishAgentRequestAsync");
+            System.Console.WriteLine("RunnerServer.FinishAgentRequestAsync");
            CheckConnection(RunnerConnectionType.JobRequest);
-            return _requestTaskAgentClient.FinishAgentRequestAsync(poolId, requestId, lockToken, finishTime, result, targetHostId, cancellationToken: cancellationToken);
+            return _requestTaskAgentClient.FinishAgentRequestAsync(poolId, requestId, lockToken, finishTime, result, cancellationToken: cancellationToken);
        }

        public Task<TaskAgentJobRequest> GetAgentRequestAsync(int poolId, long requestId, CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("RunnerServer.GetAgentRequestAsync");
+            System.Console.WriteLine("RunnerServer.GetAgentRequestAsync");
            CheckConnection(RunnerConnectionType.JobRequest);
            return _requestTaskAgentClient.GetAgentRequestAsync(poolId, requestId, cancellationToken: cancellationToken);
        }
@@ -359,21 +359,21 @@ namespace GitHub.Runner.Common
        //-----------------------------------------------------------------
        public Task<List<PackageMetadata>> GetPackagesAsync(string packageType, string platform, int top, bool includeToken, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.GetPackagesAsync");
+            System.Console.WriteLine("RunnerServer.GetPackagesAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.GetPackagesAsync(packageType, platform, top, includeToken, cancellationToken: cancellationToken);
        }

        public Task<PackageMetadata> GetPackageAsync(string packageType, string platform, string version, bool includeToken, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("RunnerServer.GetPackageAsync");
+            System.Console.WriteLine("RunnerServer.GetPackageAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.GetPackageAsync(packageType, platform, version, includeToken, cancellationToken: cancellationToken);
        }

        public Task<TaskAgent> UpdateAgentUpdateStateAsync(int agentPoolId, int agentId, string currentState, string trace)
        {
-            // System.Console.WriteLine("RunnerServer.UpdateAgentUpdateStateAsync");
+            System.Console.WriteLine("RunnerServer.UpdateAgentUpdateStateAsync");
            CheckConnection(RunnerConnectionType.Generic);
            return _genericTaskAgentClient.UpdateAgentUpdateStateAsync(agentPoolId, agentId, currentState, trace);
        }
--- a/src/Runner.Listener/JobDispatcher.cs
+++ b/src/Runner.Listener/JobDispatcher.cs
@@ -23,7 +23,7 @@ namespace GitHub.Runner.Listener
    {
        bool Busy { get; }
        TaskCompletionSource<bool> RunOnceJobCompleted { get; }
-        void Run(Guid targetHostId, Pipelines.AgentJobRequestMessage message, bool runOnce = false);
+        void Run(Pipelines.AgentJobRequestMessage message, bool runOnce = false);
        bool Cancel(JobCancelMessage message);
        Task WaitAsync(CancellationToken token);
        Task ShutdownAsync();
@@ -79,7 +79,7 @@ namespace GitHub.Runner.Listener

        public bool Busy { get; private set; }

-        public void Run(Guid targetHostId, Pipelines.AgentJobRequestMessage jobRequestMessage, bool runOnce = false)
+        public void Run(Pipelines.AgentJobRequestMessage jobRequestMessage, bool runOnce = false)
        {
            Trace.Info($"Job request {jobRequestMessage.RequestId} for plan {jobRequestMessage.Plan.PlanId} job {jobRequestMessage.JobId} received.");

@@ -112,11 +112,11 @@ namespace GitHub.Runner.Listener
            if (runOnce)
            {
                Trace.Info("Start dispatcher for one time used runner.");
-                newDispatch.WorkerDispatch = RunOnceAsync(targetHostId, jobRequestMessage, orchestrationId, currentDispatch, newDispatch.WorkerCancellationTokenSource.Token, newDispatch.WorkerCancelTimeoutKillTokenSource.Token);
+                newDispatch.WorkerDispatch = RunOnceAsync(jobRequestMessage, orchestrationId, currentDispatch, newDispatch.WorkerCancellationTokenSource.Token, newDispatch.WorkerCancelTimeoutKillTokenSource.Token);
            }
            else
            {
-                newDispatch.WorkerDispatch = RunAsync(targetHostId, jobRequestMessage, orchestrationId, currentDispatch, newDispatch.WorkerCancellationTokenSource.Token, newDispatch.WorkerCancelTimeoutKillTokenSource.Token);
+                newDispatch.WorkerDispatch = RunAsync(jobRequestMessage, orchestrationId, currentDispatch, newDispatch.WorkerCancellationTokenSource.Token, newDispatch.WorkerCancelTimeoutKillTokenSource.Token);
            }

            _jobInfos.TryAdd(newDispatch.JobId, newDispatch);
@@ -317,11 +317,11 @@ namespace GitHub.Runner.Listener
            }
        }

-        private async Task RunOnceAsync(Guid targetHostId, Pipelines.AgentJobRequestMessage message, string orchestrationId, WorkerDispatcher previousJobDispatch, CancellationToken jobRequestCancellationToken, CancellationToken workerCancelTimeoutKillToken)
+        private async Task RunOnceAsync(Pipelines.AgentJobRequestMessage message, string orchestrationId, WorkerDispatcher previousJobDispatch, CancellationToken jobRequestCancellationToken, CancellationToken workerCancelTimeoutKillToken)
        {
            try
            {
-                await RunAsync(targetHostId, message, orchestrationId, previousJobDispatch, jobRequestCancellationToken, workerCancelTimeoutKillToken);
+                await RunAsync(message, orchestrationId, previousJobDispatch, jobRequestCancellationToken, workerCancelTimeoutKillToken);
            }
            finally
            {
@@ -330,7 +330,7 @@ namespace GitHub.Runner.Listener
            }
        }

-        private async Task RunAsync(Guid targetHostId, Pipelines.AgentJobRequestMessage message, string orchestrationId, WorkerDispatcher previousJobDispatch, CancellationToken jobRequestCancellationToken, CancellationToken workerCancelTimeoutKillToken)
+        private async Task RunAsync(Pipelines.AgentJobRequestMessage message, string orchestrationId, WorkerDispatcher previousJobDispatch, CancellationToken jobRequestCancellationToken, CancellationToken workerCancelTimeoutKillToken)
        {
            Busy = true;
            try
@@ -383,7 +383,7 @@ namespace GitHub.Runner.Listener
                        await renewJobRequest;

                        // complete job request with result Cancelled
-                        await CompleteJobRequestAsync(targetHostId, _poolId, message, lockToken, TaskResult.Canceled);
+                        await CompleteJobRequestAsync(_poolId, message, lockToken, TaskResult.Canceled);
                        return;
                    }

@@ -540,7 +540,7 @@ namespace GitHub.Runner.Listener
                                await renewJobRequest;

                                // complete job request
-                                await CompleteJobRequestAsync(targetHostId, _poolId, message, lockToken, result, detailInfo);
+                                await CompleteJobRequestAsync(_poolId, message, lockToken, result, detailInfo);

                                // print out unhandled exception happened in worker after we complete job request.
                                // when we run out of disk space, report back to server has higher priority.
@@ -637,7 +637,7 @@ namespace GitHub.Runner.Listener
                            await renewJobRequest;

                            // complete job request
-                            await CompleteJobRequestAsync(targetHostId, _poolId, message, lockToken, resultOnAbandonOrCancel);
+                            await CompleteJobRequestAsync(_poolId, message, lockToken, resultOnAbandonOrCancel);
                        }
                        finally
                        {
@@ -666,25 +666,25 @@ namespace GitHub.Runner.Listener
            {
                try
                {
-// #if USE_BROKER
+#if USE_BROKER
                    if (!firstJobRequestRenewed.Task.IsCompleted)
                    {
                        // fire first renew succeed event.
                        firstJobRequestRenewed.TrySetResult(0);
                    }
-// #else
-//                     request = await runnerServer.RenewAgentRequestAsync(poolId, requestId, lockToken, orchestrationId, token);
-//                     Trace.Info($"Successfully renew job request {requestId}, job is valid till {request?.LockedUntil.Value}");
+#else
+                    request = await runnerServer.RenewAgentRequestAsync(poolId, requestId, lockToken, orchestrationId, token);
+                    Trace.Info($"Successfully renew job request {requestId}, job is valid till {request?.LockedUntil.Value}");

-//                     if (!firstJobRequestRenewed.Task.IsCompleted)
-//                     {
-//                         // fire first renew succeed event.
-//                         firstJobRequestRenewed.TrySetResult(0);
+                    if (!firstJobRequestRenewed.Task.IsCompleted)
+                    {
+                        // fire first renew succeed event.
+                        firstJobRequestRenewed.TrySetResult(0);

-//                         // Update settings if the runner name has been changed server-side
-//                         UpdateAgentNameIfNeeded(request.ReservedAgent?.Name);
-//                     }
-// #endif
+                        // Update settings if the runner name has been changed server-side
+                        UpdateAgentNameIfNeeded(request.ReservedAgent?.Name);
+                    }
+#endif

                    if (encounteringError > 0)
                    {
@@ -919,7 +919,7 @@ namespace GitHub.Runner.Listener
            }
        }

-        private async Task CompleteJobRequestAsync(Guid targetHostId, int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
+        private async Task CompleteJobRequestAsync(int poolId, Pipelines.AgentJobRequestMessage message, Guid lockToken, TaskResult result, string detailInfo = null)
        {
            Trace.Entering();

@@ -936,7 +936,7 @@ namespace GitHub.Runner.Listener
            {
                try
                {
-                    await runnerServer.FinishAgentRequestAsync(poolId, message.RequestId, lockToken, DateTime.UtcNow, result, targetHostId, CancellationToken.None);
+                    await runnerServer.FinishAgentRequestAsync(poolId, message.RequestId, lockToken, DateTime.UtcNow, result, CancellationToken.None);
                    return;
                }
                catch (TaskAgentJobNotFoundException)
--- a/src/Runner.Listener/Runner.cs
+++ b/src/Runner.Listener/Runner.cs
@@ -453,7 +453,7 @@ namespace GitHub.Runner.Listener
                                {
                                    Trace.Info($"Received job message of length {message.Body.Length} from service, with hash '{IOUtil.GetSha256Hash(message.Body)}'");
                                    var jobMessage = StringUtil.ConvertFromJson<Pipelines.AgentJobRequestMessage>(message.Body);
-                                    jobDispatcher.Run(Guid.Empty, jobMessage, runOnce);
+                                    jobDispatcher.Run(jobMessage, runOnce);
                                    if (runOnce)
                                    {
                                        Trace.Info("One time used runner received job message.");
@@ -461,7 +461,6 @@ namespace GitHub.Runner.Listener
                                    }
                                }
                            }
-                            // Broker flow
                            else if (string.Equals(message.MessageType, JobRequestMessageTypes.RunnerJobRequest, StringComparison.OrdinalIgnoreCase))
                            {
                                if (autoUpdateInProgress || runOnceJobReceived)
@@ -479,11 +478,11 @@ namespace GitHub.Runner.Listener

                                    // todo: add retries
                                    var runServer = HostContext.CreateService<IRunServer>();
-                                    await runServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
-                                    var jobMessage = await runServer.GetJobMessageAsync(messageRef.ScopeId, messageRef.HostId, messageRef.PlanType, messageRef.PlanGroup, messageRef.PlanId, messageRef.InstanceRefs);
+                                    await runServer.ConnectAsync(new Uri(messageRef.Url), creds);
+                                    var jobMessage = await runServer.GetJobMessageAsync(messageRef.ScopeId, messageRef.PlanType, messageRef.PlanGroup, messageRef.PlanId, StringUtil.ConvertToJson(messageRef.InstanceRefs, Newtonsoft.Json.Formatting.None));

                                    // todo: Trace.Info($"Received job message of length {message.Body.Length} from service, with hash '{IOUtil.GetSha256Hash(message.Body)}'");
-                                    jobDispatcher.Run(messageRef.HostId, jobMessage, runOnce);
+                                    jobDispatcher.Run(jobMessage, runOnce);
                                    if (runOnce)
                                    {
                                        Trace.Info("One time used runner received job message.");
@@ -619,5 +618,38 @@ Examples:
    _term.WriteLine($@"  .{separator}config.{ext} --url <url> --token <token> --runasservice");
 #endif
        }
+
+        [DataContract]
+        public sealed class MessageRef
+        {
+            [DataMember(Name = "url")]
+            public string Url { get; set; }
+            [DataMember(Name = "token")]
+            public string Token { get; set; }
+            [DataMember(Name = "scopeId")]
+            public Guid ScopeId { get; set; }
+            [DataMember(Name = "planType")]
+            public string PlanType { get; set; }
+            [DataMember(Name = "planGroup")]
+
+            public string PlanGroup { get; set; }
+            [DataMember(Name = "planId")]
+            public Guid PlanId { get; set; }
+            [DataMember(Name = "instanceRefs")]
+            public InstanceRef[] InstanceRefs { get; set; }
+            [DataMember(Name = "labels")]
+            public string[] Labels { get; set; }
+        }
+
+        [DataContract]
+        public sealed class InstanceRef
+        {
+            [DataMember(Name = "name")]
+            public string Name { get; set; }
+            [DataMember(Name = "instanceType")]
+            public string InstanceType { get; set; }
+            [DataMember(Name = "attempt")]
+            public int Attempt { get; set; }
+        }
    }
 }
--- a/src/Runner.Sdk/Util/VssUtil.cs
+++ b/src/Runner.Sdk/Util/VssUtil.cs
@@ -36,7 +36,7 @@ namespace GitHub.Runner.Sdk

        public static VssConnection CreateConnection(Uri serverUri, VssCredentials credentials, IEnumerable<DelegatingHandler> additionalDelegatingHandler = null, TimeSpan? timeout = null)
        {
-            // System.Console.WriteLine("VssUtil.CreateConnection");
+            System.Console.WriteLine("VssUtil.CreateConnection");
            VssClientHttpRequestSettings settings = VssClientHttpRequestSettings.Default.Clone();

            int maxRetryRequest;
--- a/src/Sdk/Common/Common/Authentication/FederatedCredential.cs
+++ b/src/Sdk/Common/Common/Authentication/FederatedCredential.cs
@@ -18,7 +18,6 @@ namespace GitHub.Services.Common

        public override bool IsAuthenticationChallenge(IHttpResponse webResponse)
        {
-            // System.Console.WriteLine($"FederatedCredential.IsAuthenticationChallenge");
            if (webResponse == null)
            {
                return false;
--- a/src/Sdk/Common/Common/Authentication/IssuedTokenCredential.cs
+++ b/src/Sdk/Common/Common/Authentication/IssuedTokenCredential.cs
@@ -88,7 +88,7 @@ namespace GitHub.Services.Common
            IHttpResponse response,
            IssuedToken failedToken)
        {
-            // System.Console.WriteLine("IssuedTokenCredential.CreateTokenProvider");
+            System.Console.WriteLine("IssuedTokenCredential.CreateTokenProvider");
            if (response != null && !IsAuthenticationChallenge(response))
            {
                throw new InvalidOperationException();
@@ -100,14 +100,12 @@ namespace GitHub.Services.Common
                {
                    throw new InvalidOperationException($"The {nameof(TokenStorageUrl)} property must have a value if the {nameof(Storage)} property is set on this instance of {GetType().Name}.");
                }
-                // System.Console.WriteLine($"IssuedTokenCredential.CreateTokenProvider: TokenStorageUrl: {TokenStorageUrl}");
                InitialToken = Storage.RetrieveToken(TokenStorageUrl, CredentialType);
            }

            IssuedTokenProvider provider = OnCreateTokenProvider(serverUrl, response);
            if (provider != null)
            {
-                // System.Console.WriteLine($"IssuedTokenCredential.CreateTokenProvider: provider: {provider}");
                provider.TokenStorageUrl = TokenStorageUrl;
            }

@@ -126,7 +124,6 @@ namespace GitHub.Services.Common

        internal virtual string GetAuthenticationChallenge(IHttpResponse webResponse)
        {
-            // System.Console.WriteLine($"IssuedTokenCredential.GetAuthenticationChallenge");
            IEnumerable<String> values;
            if (!webResponse.Headers.TryGetValues(Internal.HttpHeaders.WwwAuthenticate, out values))
            {
--- a/src/Sdk/Common/Common/Authentication/VssCredentials.cs
+++ b/src/Sdk/Common/Common/Authentication/VssCredentials.cs
@@ -108,7 +108,6 @@ namespace GitHub.Services.Common
            TaskScheduler scheduler,
            IVssCredentialPrompt credentialPrompt)
        {
-            // System.Console.WriteLine($"VssCredentials.ctor");
            this.PromptType = promptType;

            if (promptType == CredentialPromptType.PromptIfNeeded && scheduler == null)
@@ -151,7 +150,6 @@ namespace GitHub.Services.Common
        {
            get
            {
-                // System.Console.WriteLine($"VssCredentials.get_PromptType");
                return m_promptType;
            }
            set
@@ -172,7 +170,6 @@ namespace GitHub.Services.Common
        {
            get
            {
-                // System.Console.WriteLine($"VssCredentials.get_Federated");
                return m_federatedCredential;
            }
        }
@@ -187,7 +184,6 @@ namespace GitHub.Services.Common
        {
            get
            {
-                // System.Console.WriteLine($"VssCredentials.get_Storage");
                return m_credentialStorage;
            }
            set
@@ -207,7 +203,6 @@ namespace GitHub.Services.Common
        /// </summary>
        internal virtual bool TryGetValidAdalToken(IVssCredentialPrompt prompt)
        {
-            // System.Console.WriteLine($"VssCredentials.TryGetValidAdalToken");
            return false;
        }

@@ -223,7 +218,7 @@ namespace GitHub.Services.Common
            IHttpResponse webResponse,
            IssuedToken failedToken)
        {
-            // System.Console.WriteLine("VssCredential.CreateTokenProvider");
+            System.Console.WriteLine("VssCredential.CreateTokenProvider");
            ArgumentUtility.CheckForNull(serverUrl, "serverUrl");

            IssuedTokenProvider tokenProvider = null;
@@ -269,7 +264,6 @@ namespace GitHub.Services.Common
            Uri serverUrl,
            out IssuedTokenProvider provider)
        {
-            // System.Console.WriteLine($"VssCredentials.TryGetTokenProvider");
            ArgumentUtility.CheckForNull(serverUrl, "serverUrl");

            lock (m_thisLock)
@@ -279,13 +273,13 @@ namespace GitHub.Services.Common
                {
                    if (m_federatedCredential != null)
                    {
-                        // System.Console.WriteLine($"VssCredentials.TryGetTokenProvider: Using federated credential");
+                        System.Console.WriteLine($"VssCredentials.TryGetTokenProvider: Using federated credential");
                        m_currentProvider = m_federatedCredential.CreateTokenProvider(serverUrl, null, null);
                    }

                    if (m_currentProvider != null)
                    {
-                        // System.Console.WriteLine($"VssCredentials.TryGetTokenProvider: Issued token provider created");
+                        System.Console.WriteLine($"VssCredentials.TryGetTokenProvider: Issued token provider created");
                        VssHttpEventSource.Log.IssuedTokenProviderCreated(VssTraceActivity.Current, m_currentProvider);
                    }
                }
@@ -303,7 +297,6 @@ namespace GitHub.Services.Common
        /// <returns>True if this is an token authentication redirect, false otherwise</returns>
        internal bool IsAuthenticationChallenge(IHttpResponse webResponse)
        {
-            // System.Console.WriteLine($"VssCredentials.IsAuthenticationChallenge");
            if (webResponse == null)
            {
                return false;
@@ -323,7 +316,6 @@ namespace GitHub.Services.Common
            Uri serviceLocation,
            string identityProvider)
        {
-            // System.Console.WriteLine($"VssCredentials.SignOut");
            // Remove the token in the storage and the current token provider. Note that we don't
            // call InvalidateToken here because we want to remove the whole token not just its value
            if ((m_currentProvider != null) && (m_currentProvider.CurrentToken != null))
@@ -360,7 +352,6 @@ namespace GitHub.Services.Common
            string token,
            IDictionary<string, string> attributes)
        {
-            // System.Console.WriteLine($"VssCredentials.WriteAuthorizationToken");
            int i = 0;
            for (int j = 0; j < token.Length; i++, j += 128)
            {
@@ -372,7 +363,6 @@ namespace GitHub.Services.Common

        protected static string ReadAuthorizationToken(IDictionary<string, string> attributes)
        {
-            // System.Console.WriteLine($"VssCredentials.ReadAuthorizationToken");
            string authTokenCountValue;
            if (attributes.TryGetValue("AuthTokenSegmentCount", out authTokenCountValue))
            {
--- a/src/Sdk/Common/Common/VssHttpMessageHandler.cs
+++ b/src/Sdk/Common/Common/VssHttpMessageHandler.cs
@@ -49,7 +49,7 @@ namespace GitHub.Services.Common
            VssHttpRequestSettings settings,
            HttpMessageHandler innerHandler)
        {
-            // System.Console.WriteLine("VssHttpMessageHandler.ctor");
+            System.Console.WriteLine("VssHttpMessageHandler.ctor");
            this.Credentials = credentials;
            this.Settings = settings;
            this.ExpectContinue = settings.ExpectContinue;
@@ -123,7 +123,7 @@ namespace GitHub.Services.Common
            HttpRequestMessage request,
            CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("VssHttpMessageHandler.SendAsync");
+            System.Console.WriteLine("VssHttpMessageHandler.SendAsync");
            VssTraceActivity traceActivity = VssTraceActivity.Current;

            var traceInfo = VssHttpMessageHandlerTraceInfo.GetTraceInfo(request);
@@ -132,7 +132,7 @@ namespace GitHub.Services.Common
            if (!m_appliedClientCertificatesToTransportHandler &&
                request.RequestUri.Scheme == "https")
            {
-                // System.Console.WriteLine("VssHttpMessageHandler.SendAsync: !appliedClientCertificatesToTransportHandler");
+                System.Console.WriteLine("VssHttpMessageHandler.SendAsync: !appliedClientCertificatesToTransportHandler");
                HttpClientHandler httpClientHandler = m_transportHandler as HttpClientHandler;
                if (httpClientHandler != null &&
                    this.Settings.ClientCertificateManager != null &&
@@ -147,7 +147,7 @@ namespace GitHub.Services.Common
            if (!m_appliedServerCertificateValidationCallbackToTransportHandler &&
                request.RequestUri.Scheme == "https")
            {
-                // System.Console.WriteLine("VssHttpMessageHandler.SendAsync: !appliedServerCertificateValidationCallbackToTransportHandler");
+                System.Console.WriteLine("VssHttpMessageHandler.SendAsync: !appliedServerCertificateValidationCallbackToTransportHandler");
                HttpClientHandler httpClientHandler = m_transportHandler as HttpClientHandler;
                if (httpClientHandler != null &&
                    this.Settings.ServerCertificateValidationCallback != null)
@@ -169,7 +169,7 @@ namespace GitHub.Services.Common
            IssuedTokenProvider provider;
            if (this.Credentials.TryGetTokenProvider(request.RequestUri, out provider))
            {
-                // System.Console.WriteLine("VssHttpMessageHandler.SendAsync: Got token provider from credentials");
+                System.Console.WriteLine("VssHttpMessageHandler.SendAsync: Got token provider from credentials");
                token = provider.CurrentToken;
            }

@@ -230,7 +230,6 @@ namespace GitHub.Services.Common

                    traceInfo?.TraceResponseContentTime();

-                    // System.Console.WriteLine($"VssHttpMessageHandler.SendAsync: Creating response wrapper");
                    responseWrapper = new HttpResponseMessageWrapper(response);

                    if (!this.Credentials.IsAuthenticationChallenge(responseWrapper))
@@ -238,7 +237,7 @@ namespace GitHub.Services.Common
                        // Validate the token after it has been successfully authenticated with the server.
                        if (provider != null)
                        {
-                            // System.Console.WriteLine("VssHttpMessageHandler.SendAsync: Validating token");
+                            System.Console.WriteLine("VssHttpMessageHandler.SendAsync: Validating token");
                            provider.ValidateToken(token, responseWrapper);
                        }

@@ -250,7 +249,7 @@ namespace GitHub.Services.Common
                    }
                    else
                    {
-                        // System.Console.WriteLine($"VssHttpMessageHandler.SendAsync: Auth challenge. Response status code {response.StatusCode}; headers {response.Headers}");
+                        System.Console.WriteLine($"VssHttpMessageHandler.SendAsync: Auth challenge. Response status code {response.StatusCode}; headers {response.Headers}");
                        // In the case of a Windows token, only apply it to the web proxy if it
                        // returned a 407 Proxy Authentication Required. If we didn't get this
                        // status code back, then the proxy (if there is one) is clearly working fine,
@@ -296,7 +295,6 @@ namespace GitHub.Services.Common
                        }

                        // Now invoke the provider and await the result
-                        // System.Console.WriteLine($"VssHttpMessageHandler.SendAsync: Calling GetTokenAsync");
                        token = await provider.GetTokenAsync(token, tokenSource.Token).ConfigureAwait(false);

                        // I always see 0 here, but the method above could take more time so keep for now
@@ -441,7 +439,7 @@ namespace GitHub.Services.Common
                    activity != VssTraceActivity.Empty &&
                    !request.Headers.Contains(HttpHeaders.TfsSessionHeader))
                {
-                    // System.Console.WriteLine($"VssHttpMessageHandler.ApplyHeaders: Activity ID {activity.Id}");
+                    System.Console.WriteLine($"VssHttpMessageHandler.ApplyHeaders: Activity ID {activity.Id}");
                    request.Headers.Add(HttpHeaders.TfsSessionHeader, activity.Id.ToString("D"));
                }

@@ -462,16 +460,16 @@ namespace GitHub.Services.Common
            ICredentials credentialsToken = token as ICredentials;
            if (credentialsToken != null)
            {
-                // System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Credentials token != null");
+                System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Credentials token != null");
                if (applyICredentialsToWebProxy)
                {
-                    // System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Apply credentials to web proxy");
+                    System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Apply credentials to web proxy");
                    HttpClientHandler httpClientHandler = m_transportHandler as HttpClientHandler;

                    if (httpClientHandler != null &&
                        httpClientHandler.Proxy != null)
                    {
-                        // System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Setting proxy crednetials");
+                        System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Setting proxy crednetials");
                        httpClientHandler.Proxy.Credentials = credentialsToken;
                    }
                }
@@ -480,7 +478,7 @@ namespace GitHub.Services.Common
            }
            else
            {
-                // System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Applying credentials to request");
+                System.Console.WriteLine("VssHttpMessageHandler.ApplyToken: Applying credentials to request");
                token.ApplyTo(new HttpRequestMessageWrapper(request));
            }
        }
@@ -493,7 +491,7 @@ namespace GitHub.Services.Common
            HttpClientHandler httpClientHandler = handler as HttpClientHandler;
            if (httpClientHandler != null)
            {
-                // System.Console.WriteLine($"VssHttpMessageHandler.ApplySettings: Default credentials = {defaultCredentials} AllowAutoRedirect = {settings.AllowAutoRedirect}");
+                System.Console.WriteLine($"VssHttpMessageHandler.ApplySettings: Default credentials = {defaultCredentials} AllowAutoRedirect = {settings.AllowAutoRedirect}");
                httpClientHandler.AllowAutoRedirect = true; //settings.AllowAutoRedirect;
                httpClientHandler.ClientCertificateOptions = ClientCertificateOption.Manual;
                //Setting httpClientHandler.UseDefaultCredentials to false in .Net Core, clears httpClientHandler.Credentials if
@@ -565,7 +563,7 @@ namespace GitHub.Services.Common
                Uri uri,
                String authType)
            {
-                // System.Console.WriteLine($"CredentialWrapper.GetCredential: InnerCredentials = {InnerCredentials}");
+                System.Console.WriteLine($"CredentialWrapper.GetCredential: InnerCredentials = {InnerCredentials}");
                return InnerCredentials != null ? InnerCredentials.GetCredential(uri, authType) : null;
            }
        }
--- a/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
+++ b/src/Sdk/DTGenerated/Generated/TaskAgentHttpClientBase.cs
@@ -379,7 +379,6 @@ namespace GitHub.DistributedTask.WebApi
        /// <param name="requestId"></param>
        /// <param name="lockToken"></param>
        /// <param name="request"></param>
-        /// <param name="targetHostId"></param>
        /// <param name="userState"></param>
        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
        [EditorBrowsable(EditorBrowsableState.Never)]
@@ -388,7 +387,6 @@ namespace GitHub.DistributedTask.WebApi
            long requestId,
            Guid lockToken,
            TaskAgentJobRequest request,
-            Guid targetHostId,
            object userState = null,
            CancellationToken cancellationToken = default)
        {
@@ -399,7 +397,6 @@ namespace GitHub.DistributedTask.WebApi

            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
            queryParams.Add("lockToken", lockToken.ToString());
-            queryParams.Add("targetHostId", targetHostId.ToString());

            return SendAsync<TaskAgentJobRequest>(
                httpMethod,
@@ -718,9 +715,8 @@ namespace GitHub.DistributedTask.WebApi
        /// <param name="userState"></param>
        /// <param name="cancellationToken">The cancellation token to cancel operation.</param>
        [EditorBrowsable(EditorBrowsableState.Never)]
-        public virtual Task<Pipelines.AgentJobRequestMessage> GetJobMessageAsync(
+        public virtual Task<AgentJobRequestMessage> GetJobMessageAsync(
            Guid scopeId,
-            Guid hostId,
            string planType,
            string planGroup,
            Guid planId,
@@ -733,13 +729,12 @@ namespace GitHub.DistributedTask.WebApi

            List<KeyValuePair<string, string>> queryParams = new List<KeyValuePair<string, string>>();
            queryParams.Add("scopeId", scopeId.ToString());
-            queryParams.Add("hostId", hostId.ToString());
            queryParams.Add("planType", planType);
            queryParams.Add("planGroup", planGroup);
            queryParams.Add("planId", planId.ToString());
            queryParams.Add("instanceRefsJson", instanceRefsJson);

-            return SendAsync<Pipelines.AgentJobRequestMessage>(
+            return SendAsync<AgentJobRequestMessage>(
                httpMethod,
                locationId,
                version: new ApiResourceVersion(6.0, 1),
@@ -762,7 +757,7 @@ namespace GitHub.DistributedTask.WebApi
            object userState = null,
            CancellationToken cancellationToken = default)
        {
-            // System.Console.WriteLine("TaskAgentHttpClientBase.CreateAgentSessionAsync");
+            System.Console.WriteLine("TaskAgentHttpClientBase.CreateAgentSessionAsync");
            HttpMethod httpMethod = new HttpMethod("POST");
            Guid locationId = new Guid("134e239e-2df3-4794-a6f6-24f1f19ec8dc");
            object routeValues = new { poolId = poolId };
--- a/src/Sdk/DTWebApi/WebApi/TaskAgentHttpClient.cs
+++ b/src/Sdk/DTWebApi/WebApi/TaskAgentHttpClient.cs
@@ -64,7 +64,6 @@ namespace GitHub.DistributedTask.WebApi
            Guid lockToken,
            DateTime finishTime,
            TaskResult result,
-            Guid targetHostId,
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
@@ -75,7 +74,7 @@ namespace GitHub.DistributedTask.WebApi
                Result = result,
            };

-            return UpdateAgentRequestAsync(poolId, requestId, lockToken, request, targetHostId, userState, cancellationToken);
+            return UpdateAgentRequestAsync(poolId, requestId, lockToken, request, userState, cancellationToken);
        }

        public Task<List<TaskAgent>> GetAgentsAsync(
@@ -153,7 +152,7 @@ namespace GitHub.DistributedTask.WebApi
            CancellationToken cancellationToken = default(CancellationToken),
            Func<HttpResponseMessage, CancellationToken, Task<T>> processResponse = null)
        {
-            // System.Console.WriteLine("TaskAgentHttpClient.SendAsync 1");
+            System.Console.WriteLine("TaskAgentHttpClient.SendAsync 1");
            return SendAsync<T>(method, null, locationId, routeValues, version, content, queryParameters, userState, cancellationToken, processResponse);
        }

@@ -172,7 +171,7 @@ namespace GitHub.DistributedTask.WebApi
            using (VssTraceActivity.GetOrCreate().EnterCorrelationScope())
            using (HttpRequestMessage requestMessage = await CreateRequestMessageAsync(method, additionalHeaders, locationId, routeValues, version, content, queryParameters, userState, cancellationToken).ConfigureAwait(false))
            {
-                // System.Console.WriteLine("TaskAgentHttpClient.SendAsync 2");
+                System.Console.WriteLine("TaskAgentHttpClient.SendAsync 2");
                return await SendAsync<T>(requestMessage, userState, cancellationToken, processResponse).ConfigureAwait(false);
            }
        }
@@ -183,7 +182,7 @@ namespace GitHub.DistributedTask.WebApi
            CancellationToken cancellationToken = default(CancellationToken),
            Func<HttpResponseMessage, CancellationToken, Task<T>> processResponse = null)
        {
-            // System.Console.WriteLine("TaskAgentHttpClient.SendAsync 3");
+            System.Console.WriteLine("TaskAgentHttpClient.SendAsync 3");
            if (processResponse == null)
            {
                processResponse = ReadContentAsAsync<T>;
--- a/src/Sdk/WebApi/WebApi/Location/ServerDataProvider.cs
+++ b/src/Sdk/WebApi/WebApi/Location/ServerDataProvider.cs
@@ -801,7 +801,7 @@ namespace GitHub.Services.WebApi.Location

        private async Task<ConnectionData> GetConnectionDataAsync(ConnectOptions connectOptions, int lastChangeId, CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine("ServerDataProvider.GetConnectionDataAsync");
+            System.Console.WriteLine("ServerDataProvider.GetConnectionDataAsync");
            int timeoutRetries = 1;

            while (true)
--- a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthAccessToken.cs
+++ b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthAccessToken.cs
@@ -75,7 +75,7 @@ namespace GitHub.Services.OAuth

        internal override void ApplyTo(IHttpRequest request)
        {
-            // System.Console.WriteLine($"VssOAuthAccessToken.ApplyTo: Bearer {m_value}");
+            System.Console.WriteLine($"VssOAuthAccessToken.ApplyTo: Bearer {m_value}");
            request.Headers.SetValue(Common.Internal.HttpHeaders.Authorization, $"Bearer {m_value}");
        }

--- a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthAccessTokenCredential.cs
+++ b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthAccessTokenCredential.cs
@@ -60,7 +60,7 @@ namespace GitHub.Services.OAuth
            Uri serverUrl,
            IHttpResponse response)
        {
-            // System.Console.WriteLine($"VssOAuthAccessTokenCredential.OnCreateTokenProvider");
+            System.Console.WriteLine("VssOAuthAccessTokenCredential.OnCreateTokenProvider");
            return new VssOAuthAccessTokenProvider(this, serverUrl, null);
        }

@@ -72,7 +72,6 @@ namespace GitHub.Services.OAuth
                Uri signInUrl) 
                : base(credential, serverUrl, signInUrl)
            { 
-                // System.Console.WriteLine($"VssOAuthAccessTokenProvider.ctor");
            }

            public override Boolean GetTokenIsInteractive
--- a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthCredential.cs
+++ b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthCredential.cs
@@ -103,23 +103,17 @@ namespace GitHub.Services.OAuth
        /// <returns>True if the web response indicates an authorization challenge; otherwise, false</returns>
        public override Boolean IsAuthenticationChallenge(IHttpResponse webResponse)
        {
-            // System.Console.WriteLine($"VssOAuthCredential.IsAuthenticationChallenge");
            if (webResponse == null)
            {
-                // System.Console.WriteLine($"VssOAuthCredential.IsAuthenticationChallenge: webResponse is null");
                return false;
            }

            if (webResponse.StatusCode == HttpStatusCode.Found ||
                webResponse.StatusCode == HttpStatusCode.Unauthorized)
            {
-                // System.Console.WriteLine($"VssOAuthCredential.IsAuthenticationChallenge: found or unauthorized");
-                var result = webResponse.Headers.GetValues(Common.Internal.HttpHeaders.WwwAuthenticate).Any(x => x.IndexOf("Bearer", StringComparison.OrdinalIgnoreCase) >= 0);
-                // System.Console.WriteLine($"VssOAuthCredential.IsAuthenticationChallenge: {result}");
-                return result;
+                return webResponse.Headers.GetValues(Common.Internal.HttpHeaders.WwwAuthenticate).Any(x => x.IndexOf("Bearer", StringComparison.OrdinalIgnoreCase) >= 0);
            }

-            // System.Console.WriteLine($"VssOAuthCredential.IsAuthenticationChallenge: false");
            return false;
        }

@@ -127,7 +121,7 @@ namespace GitHub.Services.OAuth
            Uri serverUrl, 
            IHttpResponse response)
        {
-            // System.Console.WriteLine($"VssOAuthCredential.OnCreateTokenProvider");
+            System.Console.WriteLine("VssOAuthCredential.OnCreateTokenProvider");
            return new VssOAuthTokenProvider(this, serverUrl);
        }

--- a/src/Sdk/WebApi/WebApi/OAuth/VssOAuthTokenProvider.cs
+++ b/src/Sdk/WebApi/WebApi/OAuth/VssOAuthTokenProvider.cs
@@ -47,7 +47,6 @@ namespace GitHub.Services.OAuth
            VssOAuthTokenParameters tokenParameters)
            : base(credential, serverUrl, authorizationUrl)
        {
-            // System.Console.WriteLine($"VssOAuthTokenProvider.ctor");
            m_grant = grant;
            m_tokenParameters = tokenParameters;
            m_clientCredential = clientCrential;
@@ -60,7 +59,6 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_Grant");
                return m_grant;
            }
        }
@@ -72,7 +70,6 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_ClientCredential");
                return m_clientCredential;
            }
        }
@@ -84,7 +81,6 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_TokenParameters");
                return m_tokenParameters;
            }
        }
@@ -96,7 +92,6 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_GetTokenIsInteractive");
                return false;
            }
        }
@@ -105,7 +100,6 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_AuthenticationParameter");
                if (this.ClientCredential == null)
                {
                    return null;
@@ -121,14 +115,12 @@ namespace GitHub.Services.OAuth
        {
            get
            {
-                // System.Console.WriteLine($"VssOAuthTokenProvider.get_AuthenticationScheme");
                return "Bearer";
            }
        }

        public async Task<string> ValidateCredentialAsync(CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine($"VssOAuthTokenProvider.ValidateCredentialAsync: Calling VssOAuthTokenHttpClient.GetTokenAsync");
            var tokenHttpClient = new VssOAuthTokenHttpClient(this.SignInUrl);
            var tokenResponse = await tokenHttpClient.GetTokenAsync(this.Grant, this.ClientCredential, this.TokenParameters, cancellationToken);

@@ -147,7 +139,6 @@ namespace GitHub.Services.OAuth
            IssuedToken failedToken,
            CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine($"VssOAuthTokenProvider.OnGetTokenAsync");
            if (this.SignInUrl == null ||
                this.Grant == null ||
                this.ClientCredential == null)
@@ -160,7 +151,6 @@ namespace GitHub.Services.OAuth
            try
            {
                var tokenHttpClient = new VssOAuthTokenHttpClient(this.SignInUrl);
-                // System.Console.WriteLine($"VssOAuthTokenProvider.OnGetTokenAsync: Calling VssOAuthTokenHttpClient.GetTokenAsync; sign-in url {this.SignInUrl.AbsoluteUri}");
                var tokenResponse = await tokenHttpClient.GetTokenAsync(this.Grant, this.ClientCredential, this.TokenParameters, cancellationToken).ConfigureAwait(false);
                if (!String.IsNullOrEmpty(tokenResponse.AccessToken))
                {
@@ -207,7 +197,6 @@ namespace GitHub.Services.OAuth

        protected virtual IssuedToken CreateIssuedToken(VssOAuthTokenResponse tokenResponse)
        {
-            // System.Console.WriteLine($"VssOAuthTokenProvider.CreateIssuedToken");
            if (tokenResponse.ExpiresIn > 0)
            {
                return new VssOAuthAccessToken(tokenResponse.AccessToken, DateTime.UtcNow.AddSeconds(tokenResponse.ExpiresIn));
--- a/src/Sdk/WebApi/WebApi/VssConnection.cs
+++ b/src/Sdk/WebApi/WebApi/VssConnection.cs
@@ -100,7 +100,7 @@ namespace GitHub.Services.WebApi
            IDictionary<String, String> parameters,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssConnection.ConnectAsync");
+            System.Console.WriteLine("VssConnection.ConnectAsync");
            CheckForDisposed();
            // Set the connectMode on the credential's FederatedPrompt
            if (Credentials.Federated != null && Credentials.Federated.Prompt != null)
--- a/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs
+++ b/src/Sdk/WebApi/WebApi/VssHttpClientBase.cs
@@ -390,7 +390,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 1");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 1");
            return SendAsync<T>(method, null, locationId, routeValues, version, content, queryParameters, userState, cancellationToken);
        }

@@ -405,7 +405,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 2");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 2");
            using (VssTraceActivity.GetOrCreate().EnterCorrelationScope())
            using (HttpRequestMessage requestMessage = await CreateRequestMessageAsync(method, additionalHeaders, locationId, routeValues, version, content, queryParameters, userState, cancellationToken).ConfigureAwait(false))
            {
@@ -424,7 +424,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 3");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 3");
            using (VssTraceActivity.GetOrCreate().EnterCorrelationScope())
            using (HttpRequestMessage requestMessage = await CreateRequestMessageAsync(method, additionalHeaders, locationId, routeValues, version, content, queryParameters, userState, cancellationToken).ConfigureAwait(false))
            {
@@ -458,7 +458,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 4");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 4");
            using (VssTraceActivity.GetOrCreate().EnterCorrelationScope())
            using (HttpRequestMessage requestMessage = await CreateRequestMessageAsync(method, locationId, routeValues, version, content, queryParameters, userState, cancellationToken).ConfigureAwait(false))
            {
@@ -477,7 +477,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 5");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 5");
            using (VssTraceActivity.GetOrCreate().EnterCorrelationScope())
            using (HttpRequestMessage requestMessage = await CreateRequestMessageAsync(method, locationId, routeValues, version, content, queryParameters, userState, cancellationToken).ConfigureAwait(false))
            {
@@ -506,7 +506,7 @@ namespace GitHub.Services.WebApi
            CancellationToken cancellationToken = default(CancellationToken),
            String mediaType = c_jsonMediaType)
        {
-            // System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 1");
+            System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 1");
            return CreateRequestMessageAsync(method, null, locationId, routeValues, version, content, queryParameters, userState, cancellationToken, mediaType);
        }

@@ -532,7 +532,7 @@ namespace GitHub.Services.WebApi
            CancellationToken cancellationToken = default(CancellationToken),
            String mediaType = c_jsonMediaType)
        {
-            // System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 2");
+            System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 2");
            // Lookup the location
            ApiResourceLocation location = await GetResourceLocationAsync(locationId, userState, cancellationToken).ConfigureAwait(false);
            if (location == null)
@@ -562,7 +562,7 @@ namespace GitHub.Services.WebApi
            IEnumerable<KeyValuePair<String, String>> queryParameters = null,
            String mediaType = c_jsonMediaType)
        {
-            // System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 3");
+            System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 3");
            return CreateRequestMessage(method, null, location, routeValues, version, content, queryParameters, mediaType);
        }

@@ -586,7 +586,7 @@ namespace GitHub.Services.WebApi
            IEnumerable<KeyValuePair<String, String>> queryParameters = null,
            String mediaType = c_jsonMediaType)
        {
-            // System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 4");
+            System.Console.WriteLine("VssHttpClientBase.CreateRequestMessageAsync 4");
            CheckForDisposed();
            // Negotiate the request version to send
            ApiResourceVersion requestVersion = NegotiateRequestVersion(location, version);
@@ -758,14 +758,14 @@ namespace GitHub.Services.WebApi
            //from deadlocking...
            using (HttpResponseMessage response = await this.SendAsync(message, userState, cancellationToken).ConfigureAwait(false))
            {
-                // System.Console.WriteLine("VssHttpClientBase.SendAsync 6");
+                System.Console.WriteLine("VssHttpClientBase.SendAsync 6");
                return await ReadContentAsAsync<T>(response, cancellationToken).ConfigureAwait(false);
            }
        }

        protected async Task<T> ReadContentAsAsync<T>(HttpResponseMessage response, CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine($"VssHttpClientBase.ReadContentAsAsync {response.Headers}");
+            System.Console.WriteLine($"VssHttpClientBase.ReadContentAsAsync {response.Headers}");
            CheckForDisposed();
            Boolean isJson = IsJsonResponse(response);
            bool mismatchContentType = false;
@@ -777,20 +777,20 @@ namespace GitHub.Services.WebApi
                    !typeof(Byte[]).GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo()) &&
                    !typeof(JObject).GetTypeInfo().IsAssignableFrom(typeof(T).GetTypeInfo()))
                {
-                    // System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: isJson 1");
+                    System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: isJson 1");
                    // expect it to come back wrapped, if it isn't it is a bug!
                    var wrapper = await ReadJsonContentAsync<VssJsonCollectionWrapper<T>>(response, cancellationToken).ConfigureAwait(false);
                    return wrapper.Value;
                }
                else if (isJson)
                {
-                    // System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: isJson 2");
+                    System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: isJson 2");
                    return await ReadJsonContentAsync<T>(response, cancellationToken).ConfigureAwait(false);
                }
            }
            catch (JsonReaderException)
            {
-                // System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: mismatchContentType");
+                System.Console.WriteLine("VssHttpClientBase.ReadContentAsAsync: mismatchContentType");
                // We thought the content was JSON but failed to parse. 
                // In this case, do nothing and utilize the HandleUnknownContentType call below
                mismatchContentType = true;
@@ -816,7 +816,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 7");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 7");
            // the default in httpClient for HttpCompletionOption is ResponseContentRead so that is what we do here
            return this.SendAsync(
                message,
@@ -831,7 +831,7 @@ namespace GitHub.Services.WebApi
            Object userState = null,
            CancellationToken cancellationToken = default(CancellationToken))
        {
-            // System.Console.WriteLine("VssHttpClientBase.SendAsync 8");
+            System.Console.WriteLine("VssHttpClientBase.SendAsync 8");
            CheckForDisposed();
            if (message.Headers.UserAgent != null)
            {
@@ -867,7 +867,7 @@ namespace GitHub.Services.WebApi
                //ConfigureAwait(false) enables the continuation to be run outside
                //any captured SyncronizationContext (such as ASP.NET's) which keeps things
                //from deadlocking...
-                // System.Console.WriteLine($"VssHttpClientBase.SendAsync 8: Calling Client.SendAsync {message}");
+                System.Console.WriteLine($"VssHttpClientBase.SendAsync 8: Calling Client.SendAsync {message}");
                HttpResponseMessage response = await Client.SendAsync(message, completionOption, cancellationToken).ConfigureAwait(false);

                // Inject delay or failure for testing
@@ -885,7 +885,7 @@ namespace GitHub.Services.WebApi
        [Obsolete("Use VssHttpClientBase.HandleResponseAsync instead")]
        protected virtual void HandleResponse(HttpResponseMessage response)
        {
-            // System.Console.WriteLine("VssHttpClientBase.HandleResponse 1");
+            System.Console.WriteLine("VssHttpClientBase.HandleResponse 1");

        }

@@ -893,7 +893,7 @@ namespace GitHub.Services.WebApi
            HttpResponseMessage response,
            CancellationToken cancellationToken)
        {
-            // System.Console.WriteLine($"VssHttpClientBase.HandleResponse 2 status code {response.StatusCode} headers {response.Headers}");
+            System.Console.WriteLine($"VssHttpClientBase.HandleResponse 2 status code {response.StatusCode} headers {response.Headers}");
            response.Trace();
            VssHttpEventSource.Log.HttpRequestStop(VssTraceActivity.Current, response);

@@ -905,7 +905,7 @@ namespace GitHub.Services.WebApi
            }
            else if (ShouldThrowError(response))
            {
-                // System.Console.WriteLine("VssHttpClientBase.HandleResponse: Should throw error");
+                System.Console.WriteLine("VssHttpClientBase.HandleResponse: Should throw error");
                Exception exToThrow = null;
                if (IsJsonResponse(response))
                {
@@ -929,7 +929,7 @@ namespace GitHub.Services.WebApi
                    {
                        message = response.ReasonPhrase;
                    }
-                    // System.Console.WriteLine($"VssHttpClientBase.HandleResponse: Exception message {message}");
+                    System.Console.WriteLine($"VssHttpClientBase.HandleResponse: Exception message {message}");
                    exToThrow = new VssServiceResponseException(response.StatusCode, message, exToThrow);
                }
Author	SHA1	Message	Date
eric sciple	0bdd5fc7d2	.	2022-05-05 19:37:03 +00:00
eric sciple	9b82c84d51	.	2022-05-05 19:24:55 +00:00
eric sciple	05c3d892f5	.	2022-05-04 23:36:25 +00:00
eric sciple	cf7a3802a9	.	2022-05-04 18:33:34 +00:00
eric sciple	7a06fd7948	working on redirecting to broker	2022-05-04 04:22:59 +00:00