Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump us to Octokit v10.0.0 #2033

Merged
merged 15 commits into from
Feb 26, 2024
Merged

Bump us to Octokit v10.0.0 #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
df4bc2f
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 16, 2024
1969587
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 17, 2024
9a82545
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 18, 2024
8e61b86
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 19, 2024
c8be4ac
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 20, 2024
0c75072
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 21, 2024
b374916
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 22, 2024
c5225b9
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 23, 2024
4b345f2
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 23, 2024
9c36afd
Bump OctoKit to 10.0.0
AlitzelMendez Feb 23, 2024
9a3619a
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 24, 2024
0a0cbf3
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 25, 2024
b8a23cf
Update dependencies from https://github.com/dotnet/dnceng-shared buil…
dotnet-maestro[bot] Feb 26, 2024
9a8e730
Fix models for githu hook controller
AlitzelMendez Feb 26, 2024
e59dc92
Merge branch 'darc-main-f2941538-06f3-4d41-8cb1-5935a5b8cf60' of http…
AlitzelMendez Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions src/DotNet.Status.Web/DotNet.Status.Web.Tests/AzurePipelinesControllerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>();
Expand All @@ -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));
Expand Down
10 changes: 7 additions & 3 deletions src/DotNet.Status.Web/DotNet.Status.Web/Models/IssueCommentPayloadWithChanges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
8 changes: 6 additions & 2 deletions src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestCommentPayloadWithChanges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}
5 changes: 4 additions & 1 deletion src/DotNet.Status.Web/DotNet.Status.Web/Models/PullRequestEventPayloadWithChanges.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
}