Updating Octokit.GraphQL and making adjustments

Author: StanleyGoldman

lib/Octokit.GraphQL.0.1.1-beta.nupkg

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using GitHub.Extensions;
 using GitHub.Primitives;
@@ -23,7 +24,7 @@ public GraphQLKeychainCredentialStore(IKeychain keychain, HostAddress address)
             this.address = address;
         }
 
-        public async Task<string> GetCredentials()
+        public async Task<string> GetCredentials(CancellationToken cancellationToken = default)
         {
             var userPass = await keychain.Load(address).ConfigureAwait(false);
             return userPass?.Item2;

src/GitHub.Api/GraphQLKeychainCredentialStore.cs

@@ -23,6 +23,7 @@
 using Rothko;
 using static System.FormattableString;
 using static Octokit.GraphQL.Variable;
+using CheckAnnotationLevel = GitHub.Models.CheckAnnotationLevel;
 
 namespace GitHub.Services
 {
@@ -71,27 +72,27 @@ public async Task<List<CheckSuiteModel>> ReadCheckSuites(
                         commit => commit.Commit.CheckSuites(null,null, null,null, null).AllPages()
                             .Select(suite => new CheckSuiteModel
                             {
-                                Conclusion = (CheckSuiteConclusionStateEnum?) suite.Conclusion,
-                                Status = (CheckSuiteStatusStateEnum) suite.Status,
+                                Conclusion = (CheckSuiteConclusionState?) suite.Conclusion,
+                                Status = (CheckSuiteStatusState) suite.Status,
                                 CreatedAt = suite.CreatedAt,
                                 UpdatedAt = suite.UpdatedAt,
                                 CheckRuns = suite.CheckRuns(null, null, null, null, null).AllPages()
                                     .Select(run => new CheckRunModel
                                     {
-                                        Conclusion = (CheckSuiteConclusionStateEnum?) run.Conclusion,
-                                        Status = (CheckSuiteStatusStateEnum) run.Status,
+                                        Conclusion = (CheckSuiteConclusionState?) run.Conclusion,
+                                        Status = (CheckSuiteStatusState) run.Status,
                                         StartedAt = run.StartedAt,
                                         CompletedAt = run.CompletedAt,
                                         Annotations = run.Annotations(null, null, null, null).AllPages()
                                             .Select(annotation => new CheckRunAnnotationModel
                                             {
                                                 BlobUrl = annotation.BlobUrl,
-                                                StartLine = annotation.StartLine,
-                                                EndLine = annotation.EndLine,
-                                                Filename = annotation.Filename,
+                                                StartLine = annotation.Location.Start.Line,
+                                                EndLine = annotation.Location.End.Line,
+                                                Filename = annotation.Path,
                                                 Message = annotation.Message,
                                                 Title = annotation.Title,
-                                                WarningLevel = (CheckAnnotationLevelEnum?) annotation.WarningLevel,
+                                                WarningLevel = (CheckAnnotationLevel?) annotation.AnnotationLevel,
                                                 RawDetails = annotation.RawDetails
                                             }).ToList()
                                     }).ToList()

src/GitHub.App/Services/ChecksService.cs

@@ -933,9 +933,9 @@ class LastCommitSummaryModel
 
         class CheckSuiteSummaryModel
         {
-            public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
+            public CheckSuiteConclusionState? Conclusion { get; set; }
 
-            public CheckSuiteStatusStateEnum Status { get; set; }
+            public CheckSuiteStatusState Status { get; set; }
         }
     }
 }

src/GitHub.App/Services/PullRequestService.cs

@@ -171,7 +171,7 @@
     <Compile Include="GitHubLogicException.cs" />
     <Compile Include="Models\ActorModel.cs" />
     <Compile Include="Models\AnnotationModel.cs" />
-    <Compile Include="Models\CheckAnnotationLevelEnum.cs" />
+    <Compile Include="Models\CheckAnnotationLevel.cs" />
     <Compile Include="Models\CheckConclusionStateEnum.cs" />
     <Compile Include="Models\CheckRunModel.cs" />
     <Compile Include="Models\CheckStatusStateEnum.cs" />

src/GitHub.Exports/GitHub.Exports.csproj

@@ -14,7 +14,7 @@ public class CheckRunAnnotationModel
 
         public string Title { get; set; }
 
-        public CheckAnnotationLevelEnum? WarningLevel { get; set; }
+        public CheckAnnotationLevel? WarningLevel { get; set; }
 
         public string RawDetails { get; set; }
     }

src/GitHub.Exports/Models/AnnotationModel.cs

@@ -1,6 +1,6 @@
 namespace GitHub.Models
 {
-    public enum CheckAnnotationLevelEnum
+    public enum CheckAnnotationLevel
     {
         Failure,
         Notice,

…ports/Models/CheckAnnotationLevelEnum.cs …b.Exports/Models/CheckAnnotationLevel.cssrc/GitHub.Exports/Models/CheckAnnotationLevelEnum.cs renamed to src/GitHub.Exports/Models/CheckAnnotationLevel.cs src/GitHub.Exports/Models/CheckAnnotationLevelEnum.cs renamed to src/GitHub.Exports/Models/CheckAnnotationLevel.cs

@@ -5,9 +5,9 @@ namespace GitHub.Models
 {
     public class CheckRunModel
     {
-        public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
+        public CheckSuiteConclusionState? Conclusion { get; set; }
 
-        public CheckSuiteStatusStateEnum Status { get; set; }
+        public CheckSuiteStatusState Status { get; set; }
 
         public DateTimeOffset? StartedAt { get; set; }
 

src/GitHub.Exports/Models/CheckRunModel.cs

@@ -1,6 +1,6 @@
 namespace GitHub.Models
 {
-    public enum CheckSuiteConclusionStateEnum
+    public enum CheckSuiteConclusionState
     {
         ActionRequired,
         TimedOut,

…ports/Models/CheckConclusionStateEnum.cs …orts/Models/CheckSuiteConclusionState.cssrc/GitHub.Exports/Models/CheckConclusionStateEnum.cs renamed to src/GitHub.Exports/Models/CheckSuiteConclusionState.cs src/GitHub.Exports/Models/CheckConclusionStateEnum.cs renamed to src/GitHub.Exports/Models/CheckSuiteConclusionState.cs

@@ -5,9 +5,9 @@ namespace GitHub.Models
 {
     public class CheckSuiteModel
     {
-        public CheckSuiteConclusionStateEnum? Conclusion { get; set; }
+        public CheckSuiteConclusionState? Conclusion { get; set; }
 
-        public CheckSuiteStatusStateEnum Status { get; set; }
+        public CheckSuiteStatusState Status { get; set; }
 
         public DateTimeOffset CreatedAt { get; set; }