From 534bcec44bf1435c0fd37ca6d7c55d4d530d2453 Mon Sep 17 00:00:00 2001
From: Luke Tomlinson <luketomlinson@github.com>
Date: Tue, 21 Mar 2023 11:29:42 -0400
Subject: [PATCH] Fix conflicts

---
 src/Runner.Common/RunnerDotcomServer.cs        | 3 +--
 src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs | 9 ---------
 src/Sdk/DTWebApi/WebApi/Runner.cs              | 2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/Runner.Common/RunnerDotcomServer.cs b/src/Runner.Common/RunnerDotcomServer.cs
index 96cf82b00..77fdaf88e 100644
--- a/src/Runner.Common/RunnerDotcomServer.cs
+++ b/src/Runner.Common/RunnerDotcomServer.cs
@@ -165,8 +165,7 @@ namespace GitHub.Runner.Common
 
             var body = new StringContent(StringUtil.ConvertToJson(bodyObject), null, "application/json");
 
-            var response = await RetryRequest(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
-            var runner = StringUtil.ConvertFromJson<GitHub.DistributedTask.WebApi.Runner>(response);
+            var runner = await RetryRequest<DistributedTask.WebApi.Runner>(githubApiUrl, githubToken, RequestType.Post, 3, "Failed to add agent", body);
             agent.Id = runner.Id;
             agent.Authorization = new TaskAgentAuthorization()
             {
diff --git a/src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs b/src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs
index e223083cd..ddc83813f 100644
--- a/src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs
+++ b/src/Sdk/DTWebApi/WebApi/ListRunnersResponse.cs
@@ -34,13 +34,6 @@ namespace GitHub.DistributedTask.WebApi
             set;
         }
 
-        public List<TaskAgent> ToTaskAgents()
-        {
-            List<TaskAgent> taskAgents = new List<TaskAgent>();
-
-            return Runners.Select(runner => new TaskAgent() { Name = runner.Name }).ToList();
-        }
-
         public ListRunnersResponse Clone()
         {
             return new ListRunnersResponse(this);
@@ -48,8 +41,6 @@ namespace GitHub.DistributedTask.WebApi
 
         public List<TaskAgent> ToTaskAgents()
         {
-            List<TaskAgent> taskAgents = new List<TaskAgent>();
-
             return Runners.Select(runner => new TaskAgent() { Name = runner.Name }).ToList();
         }
     }
diff --git a/src/Sdk/DTWebApi/WebApi/Runner.cs b/src/Sdk/DTWebApi/WebApi/Runner.cs
index e6d9de992..7e981bc97 100644
--- a/src/Sdk/DTWebApi/WebApi/Runner.cs
+++ b/src/Sdk/DTWebApi/WebApi/Runner.cs
@@ -1,5 +1,5 @@
+using System;
 using Newtonsoft.Json;
-using System.Security.AccessControl;
 
 namespace GitHub.DistributedTask.WebApi
 {