[main] Update dependencies from dotnet/dnceng-shared (#2033)

dotnet · Feb 26, 2024 · 19b9e44 · 19b9e44
2 parents 5987666 + e59dc92
commit 19b9e44
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 55 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -83,7 +83,7 @@
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
     <PackageVersion Include="NUnit3TestAdapter" Version="3.16.1" />
-    <PackageVersion Include="Octokit" Version="0.49.0" />
+    <PackageVersion Include="Octokit" Version="10.0.0" />
     <PackageVersion Include="ServiceFabricMocks" Version="$(ServiceFabricMocksVersion)" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,61 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Authentication.Algorithms" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.Health" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.ServiceFabric.ServiceHost" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24066.2">
+    <Dependency Name="Microsoft.DotNet.Web.Authentication" Version="1.1.0-beta.24122.2">
       <Uri>https://github.com/dotnet/dnceng-shared</Uri>
-      <Sha>2f84fa6f143080a3339cf86d407af5d0e2e13e9c</Sha>
+      <Sha>4ee484519db441b6152dbac978fc3bfb9fbfd0a3</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,20 +15,20 @@
     <MicrosoftDotNetGitIssueManagerVersion>6.0.0-beta.24113.1</MicrosoftDotNetGitIssueManagerVersion>
     <MicrosoftDotNetVersionToolsVersion>6.0.0-beta.24113.1</MicrosoftDotNetVersionToolsVersion>
     <MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
-    <MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24066.2</MicrosoftDncEngCommandLineLibVersion>
-    <MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24066.2</MicrosoftDncEngConfigurationExtensionsVersion>
-    <MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24066.2</MicrosoftDotNetAuthenticationAlgorithmsVersion>
-    <MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24066.2</MicrosoftDotNetGitHubAuthenticationVersion>
-    <MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
-    <MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalDependencyInjectionVersion>
-    <MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalHealthVersion>
-    <MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
-    <MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
-    <MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24066.2</MicrosoftDotNetInternalTestingUtilityVersion>
-    <MicrosoftDotNetKustoVersion>1.1.0-beta.24066.2</MicrosoftDotNetKustoVersion>
-    <MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24066.2</MicrosoftDotNetServiceFabricServiceHostVersion>
-    <MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24066.2</MicrosoftDotNetServicesUtilityVersion>
-    <MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24066.2</MicrosoftDotNetWebAuthenticationVersion>
+    <MicrosoftDncEngCommandLineLibVersion>1.1.0-beta.24122.2</MicrosoftDncEngCommandLineLibVersion>
+    <MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.24122.2</MicrosoftDncEngConfigurationExtensionsVersion>
+    <MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.24122.2</MicrosoftDotNetAuthenticationAlgorithmsVersion>
+    <MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.24122.2</MicrosoftDotNetGitHubAuthenticationVersion>
+    <MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
+    <MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalDependencyInjectionVersion>
+    <MicrosoftDotNetInternalHealthVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalHealthVersion>
+    <MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
+    <MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
+    <MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.24122.2</MicrosoftDotNetInternalTestingUtilityVersion>
+    <MicrosoftDotNetKustoVersion>1.1.0-beta.24122.2</MicrosoftDotNetKustoVersion>
+    <MicrosoftDotNetServiceFabricServiceHostVersion>1.1.0-beta.24122.2</MicrosoftDotNetServiceFabricServiceHostVersion>
+    <MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.24122.2</MicrosoftDotNetServicesUtilityVersion>
+    <MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.24122.2</MicrosoftDotNetWebAuthenticationVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>

diff --git a/src/DotNet.Status.Web/DotNet.Status.Web.Tests/AzurePipelinesControllerTests.cs b/src/DotNet.Status.Web/DotNet.Status.Web.Tests/AzurePipelinesControllerTests.cs
@@ -657,11 +657,10 @@ public static
                     $"Build failed: {buildData["definition"]["name"].ToString()}/{buildData["sourceBranch"].ToString().Substring("refs/heads/".Length)} " :
                     "";
 
-            Octokit.Issue mockIssue = new Issue(
-                "url", "html", "comments", "events", 123456, ItemState.Open, title,
-                "body", null, null, null, null, null, null, 1, null, null, DateTimeOffset.MinValue,
-                null, 123456, "nodeid", false, null, null);
-
+            Octokit.Issue mockIssue = new Issue("url", "html", "comments", "events", 123456, ItemState.Open, title,
+                "body", default, default, default, default, default, default, 1, default, DateTimeOffset.MinValue,
+                DateTimeOffset.MinValue, default, 123456, "nodeId", default, default, default, default, default);
+
             var issueOwners = new List<string>();
             var issueNames = new List<string>();
             var mockGithubIssues = new Mock<IIssuesClient>();
@@ -675,7 +674,8 @@ public static
                 .Setup(m => m.GetAllForRepository(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<RepositoryIssueRequest>()))
                 .Returns(Task.FromResult((IReadOnlyList<Issue>)(new List<Issue> {mockIssue})));
 
-            Octokit.GitHubApp mockGithubApp = new GitHubApp(12345, "app", null, "desc", "url", "url", DateTimeOffset.MinValue, DateTimeOffset.MinValue);
+            Octokit.GitHubApp mockGithubApp = new GitHubApp(12345, default, "app", default, "desc", "url", "url",
+                DateTimeOffset.MinValue, DateTimeOffset.MinValue, default, default);
 
             var mockGithubAppsClient = new Mock<IGitHubAppsClient>();
             mockGithubAppsClient.Setup(m => m.GetCurrent()).Returns(Task.FromResult(mockGithubApp));

diff --git a/src/DotNet.Status.Web/DotNet.Status.Web/Models/IssueCommentPayloadWithChanges.cs b/src/DotNet.Status.Web/DotNet.Status.Web/Models/IssueCommentPayloadWithChanges.cs
@@ -2,8 +2,12 @@
 
 namespace DotNet.Status.Web.Models;
 
-public class IssueCommentPayloadWithChanges : IssueCommentPayload
+public class IssueCommentPayloadWithChanges 
 {
     public IssueOrPullRequestCommentChanges Changes { get; set; }
-
-}
+    public string Action { get;  set; }
+    public User  User{ get;  set; }
+    public Issue Issue { get; set; }
+    public Repository Repository { get; set; }
+    public IssueComment Comment { get; set; }
+}
diff --git a/src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestCommentPayloadWithChanges.cs b/src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestCommentPayloadWithChanges.cs
@@ -2,7 +2,11 @@
 
 namespace DotNet.Status.Web.Models;
 
-public class PullRequestCommentPayloadWithChanges : PullRequestCommentPayload
+public class PullRequestCommentPayloadWithChanges
 {
     public IssueOrPullRequestCommentChanges Changes { get; set; }
-}
+    public string Action { get; set; }
+    public PullRequest PullRequest { get; set; }
+    public Repository Repository { get; set; }
+    public PullRequestReviewComment Comment { get; set; }
+}
diff --git a/src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestEventPayloadWithChanges.cs b/src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestEventPayloadWithChanges.cs
@@ -2,7 +2,10 @@
 
 namespace DotNet.Status.Web.Models;
 
-public class PullRequestEventPayloadWithChanges : PullRequestEventPayload
+public class PullRequestEventPayloadWithChanges
 {
     public IssueOrPullRequestCommentChanges Changes { get; set; }
+    public string Action { get;  set; }
+    public Repository Repository { get; set; }
+    public PullRequest PullRequest { get; set; }
 }