diff --git a/Directory.Build.props b/Directory.Build.props index bc1be942..87512307 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ $(Company), NGitLab contributors - 11.0 + 12 true strict true diff --git a/NGitLab.Mock.Tests/MergeRequestsMockTests.cs b/NGitLab.Mock.Tests/MergeRequestsMockTests.cs index e42e185d..4be03cd9 100644 --- a/NGitLab.Mock.Tests/MergeRequestsMockTests.cs +++ b/NGitLab.Mock.Tests/MergeRequestsMockTests.cs @@ -57,7 +57,7 @@ public void Test_merge_requests_approvable_by_me_can_be_listed() .BuildServer(); var client = server.CreateClient("user1"); - var mergeRequests = client.MergeRequests.Get(new MergeRequestQuery { ApproverIds = new[] { 1 } }).ToArray(); + var mergeRequests = client.MergeRequests.Get(new MergeRequestQuery { ApproverIds = [1L] }).ToArray(); Assert.That(mergeRequests, Has.Length.EqualTo(1), "Merge requests count is invalid"); Assert.That(mergeRequests[0].Title, Is.EqualTo("Merge request 2"), "Merge request found is invalid"); diff --git a/NGitLab.Mock.Tests/MilestonesMockTests.cs b/NGitLab.Mock.Tests/MilestonesMockTests.cs index 151a5819..a00de3b9 100644 --- a/NGitLab.Mock.Tests/MilestonesMockTests.cs +++ b/NGitLab.Mock.Tests/MilestonesMockTests.cs @@ -103,8 +103,8 @@ public void Test_milestones_can_be_closed_and_activated_from_project() [Test] public void Test_projects_merge_request_can_be_found_from_milestone() { - const int ProjectId = 1; - const int MilestoneId = 1; + const long ProjectId = 1; + const long MilestoneId = 1; using var server = new GitLabConfig() .WithUser("user1", isDefault: true) .WithProject("Test", id: ProjectId, addDefaultUserAsMaintainer: true, configure: project => project @@ -122,8 +122,8 @@ public void Test_projects_merge_request_can_be_found_from_milestone() [Test] public void Test_groups_merge_request_can_be_found_from_milestone() { - const int projectId = 1; - const int milestoneId = 1; + const long projectId = 1; + const long milestoneId = 1; using var server = new GitLabConfig() .WithUser("user1", isDefault: true) .WithGroup("parentGroup", id: projectId, configure: group => group diff --git a/NGitLab.Mock.Tests/ProjectsMockTests.cs b/NGitLab.Mock.Tests/ProjectsMockTests.cs index 47b1c359..67929cc0 100644 --- a/NGitLab.Mock.Tests/ProjectsMockTests.cs +++ b/NGitLab.Mock.Tests/ProjectsMockTests.cs @@ -1,6 +1,7 @@ using System; using System.Globalization; using System.IO; +using System.Linq; using System.Net; using System.Threading.Tasks; using FluentAssertions; @@ -213,7 +214,7 @@ public async Task CreateAsync_WhenMockCreatedWithSupportedOptions_TheyAreAvailab { Name = "MyProject", Path = "my-project", - NamespaceId = "my-group", + NamespaceId = server.Groups.First(g => string.Equals(g.Name, "MyGroup", StringComparison.Ordinal)).Id, Description = "Description", DefaultBranch = "foo", InitializeWithReadme = true, @@ -228,7 +229,7 @@ public async Task CreateAsync_WhenMockCreatedWithSupportedOptions_TheyAreAvailab actual.Name.Should().Be(expected.Name); actual.Path.Should().Be(expected.Path); actual.Description.Should().Be(expected.Description); - actual.Namespace.FullPath.Should().Be(expected.NamespaceId); + actual.Namespace.Id.Should().Be(expected.NamespaceId); actual.NameWithNamespace.Should().Be($"MyGroup / {expected.Name}"); actual.PathWithNamespace.Should().Be($"my-group/{expected.Path}"); actual.DefaultBranch.Should().Be(expected.DefaultBranch); diff --git a/NGitLab.Mock/Badge.cs b/NGitLab.Mock/Badge.cs index 2d64f307..232aa5fe 100644 --- a/NGitLab.Mock/Badge.cs +++ b/NGitLab.Mock/Badge.cs @@ -4,7 +4,7 @@ namespace NGitLab.Mock; public sealed class Badge : GitLabObject { - public int Id { get; set; } + public long Id { get; set; } public string LinkUrl { get; set; } diff --git a/NGitLab.Mock/BadgeCollection.cs b/NGitLab.Mock/BadgeCollection.cs index 5ecc312a..1c5b6fc5 100644 --- a/NGitLab.Mock/BadgeCollection.cs +++ b/NGitLab.Mock/BadgeCollection.cs @@ -10,7 +10,7 @@ public BadgeCollection(GitLabObject parent) { } - public Badge GetById(int id) + public Badge GetById(long id) { return this.FirstOrDefault(badge => badge.Id == id); } diff --git a/NGitLab.Mock/Clients/BranchClient.cs b/NGitLab.Mock/Clients/BranchClient.cs index e8cc8654..cce0b36e 100644 --- a/NGitLab.Mock/Clients/BranchClient.cs +++ b/NGitLab.Mock/Clients/BranchClient.cs @@ -8,9 +8,9 @@ namespace NGitLab.Mock.Clients; internal sealed class BranchClient : ClientBase, IBranchClient { - private readonly int _projectId; + private readonly long _projectId; - public BranchClient(ClientContext context, int projectId) + public BranchClient(ClientContext context, long projectId) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/ClientBase.cs b/NGitLab.Mock/Clients/ClientBase.cs index 80c72af7..4ed64347 100644 --- a/NGitLab.Mock/Clients/ClientBase.cs +++ b/NGitLab.Mock/Clients/ClientBase.cs @@ -30,7 +30,7 @@ protected Group GetGroup(object id, GroupPermission permissions) var group = id switch { - int idInt => Server.AllGroups.FindById(idInt), + long idLong => Server.AllGroups.FindById(idLong), string idStr => Server.AllGroups.FindGroup(idStr), IIdOrPathAddressable gid when gid.Path != null => Server.AllGroups.FindByNamespacedPath(gid.Path), IIdOrPathAddressable gid => Server.AllGroups.FindById(gid.Id), @@ -78,7 +78,7 @@ protected Project GetProject(object id, ProjectPermission permissions) var project = id switch { - int idInt => Server.AllProjects.FindById(idInt), + long idLong => Server.AllProjects.FindById(idLong), string idStr => Server.AllProjects.FindProject(idStr), IIdOrPathAddressable pid when pid.Path != null => Server.AllProjects.FindByNamespacedPath(pid.Path), IIdOrPathAddressable pid => Server.AllProjects.FindById(pid.Id), @@ -116,7 +116,7 @@ protected Project GetProject(object id, ProjectPermission permissions) return project; } - protected User GetUser(int userId) + protected User GetUser(long userId) { var user = Server.Users.GetById(userId); if (user == null) @@ -125,7 +125,7 @@ protected User GetUser(int userId) return user; } - protected Issue GetIssue(int projectId, int issueId) + protected Issue GetIssue(long projectId, long issueId) { var project = GetProject(projectId, ProjectPermission.View); var issue = project.Issues.GetByIid(issueId); @@ -135,7 +135,7 @@ protected Issue GetIssue(int projectId, int issueId) return issue; } - protected Milestone GetMilestone(int projectId, int milestoneId) + protected Milestone GetMilestone(long projectId, long milestoneId) { var project = GetProject(projectId, ProjectPermission.View); var milestone = project.Milestones.GetByIid(milestoneId); @@ -145,7 +145,7 @@ protected Milestone GetMilestone(int projectId, int milestoneId) return milestone; } - protected MergeRequest GetMergeRequest(int projectId, int mergeRequestIid) + protected MergeRequest GetMergeRequest(long projectId, long mergeRequestIid) { var project = GetProject(projectId, ProjectPermission.View); var mergeRequest = project.MergeRequests.GetByIid(mergeRequestIid); diff --git a/NGitLab.Mock/Clients/ClusterClient.cs b/NGitLab.Mock/Clients/ClusterClient.cs index fb35c35e..6f15e3ce 100644 --- a/NGitLab.Mock/Clients/ClusterClient.cs +++ b/NGitLab.Mock/Clients/ClusterClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ClusterClient : ClientBase, IClusterClient { - private readonly int _projectId; + private readonly long _projectId; public ClusterClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/CommitClient.cs b/NGitLab.Mock/Clients/CommitClient.cs index 1ed108ad..4302979f 100644 --- a/NGitLab.Mock/Clients/CommitClient.cs +++ b/NGitLab.Mock/Clients/CommitClient.cs @@ -7,7 +7,7 @@ namespace NGitLab.Mock.Clients; internal sealed class CommitClient : ClientBase, ICommitClient { - private readonly int _projectId; + private readonly long _projectId; public CommitClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/CommitStatusClient.cs b/NGitLab.Mock/Clients/CommitStatusClient.cs index 089af4ae..cc7b49c8 100644 --- a/NGitLab.Mock/Clients/CommitStatusClient.cs +++ b/NGitLab.Mock/Clients/CommitStatusClient.cs @@ -7,7 +7,7 @@ namespace NGitLab.Mock.Clients; internal sealed class CommitStatusClient : ClientBase, ICommitStatusClient { - private readonly int _projectId; + private readonly long _projectId; public CommitStatusClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ContributorClient.cs b/NGitLab.Mock/Clients/ContributorClient.cs index ad5d9c85..193b62a1 100644 --- a/NGitLab.Mock/Clients/ContributorClient.cs +++ b/NGitLab.Mock/Clients/ContributorClient.cs @@ -8,9 +8,9 @@ namespace NGitLab.Mock.Clients; internal sealed class ContributorClient : ClientBase, IContributorClient { - private readonly int _projectId; + private readonly long _projectId; - public ContributorClient(ClientContext context, int projectId) + public ContributorClient(ClientContext context, long projectId) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/EnvironmentClient.cs b/NGitLab.Mock/Clients/EnvironmentClient.cs index 84eeeb06..a2064f61 100644 --- a/NGitLab.Mock/Clients/EnvironmentClient.cs +++ b/NGitLab.Mock/Clients/EnvironmentClient.cs @@ -10,7 +10,7 @@ namespace NGitLab.Mock.Clients; internal sealed class EnvironmentClient : ClientBase, IEnvironmentClient { - private readonly int _projectId; + private readonly long _projectId; public EnvironmentClient(ClientContext context, ProjectId projectId) : base(context) @@ -25,20 +25,20 @@ public EnvironmentInfo Create(string name, string externalUrl) throw new NotImplementedException(); } - public void Delete(int environmentId) + public void Delete(long environmentId) { throw new NotImplementedException(); } - public EnvironmentInfo Edit(int environmentId, string externalUrl) => Edit(environmentId, null, externalUrl); + public EnvironmentInfo Edit(long environmentId, string externalUrl) => Edit(environmentId, null, externalUrl); [EditorBrowsable(EditorBrowsableState.Never)] - public EnvironmentInfo Edit(int environmentId, string name, string externalUrl) + public EnvironmentInfo Edit(long environmentId, string name, string externalUrl) { throw new NotImplementedException(); } - public EnvironmentInfo Stop(int environmentId) + public EnvironmentInfo Stop(long environmentId) { throw new NotImplementedException(); } @@ -48,12 +48,12 @@ public GitLabCollectionResponse GetEnvironmentsAsync(Environmen return GitLabCollectionResponse.Create(Array.Empty()); } - public EnvironmentInfo GetById(int environmentId) + public EnvironmentInfo GetById(long environmentId) { throw new NotImplementedException(); } - public Task GetByIdAsync(int environmentId, CancellationToken cancellationToken = default) + public Task GetByIdAsync(long environmentId, CancellationToken cancellationToken = default) { throw new NotImplementedException(); } diff --git a/NGitLab.Mock/Clients/EventClient.cs b/NGitLab.Mock/Clients/EventClient.cs index 13331abb..e05f5a6f 100644 --- a/NGitLab.Mock/Clients/EventClient.cs +++ b/NGitLab.Mock/Clients/EventClient.cs @@ -6,15 +6,15 @@ namespace NGitLab.Mock.Clients; internal sealed class EventClient : ClientBase, IEventClient { - private readonly int? _userId; - private readonly int? _projectId; + private readonly long? _userId; + private readonly long? _projectId; public EventClient(ClientContext context) : base(context) { } - public EventClient(ClientContext context, int? userId = null, ProjectId? projectId = null) + public EventClient(ClientContext context, long? userId = null, ProjectId? projectId = null) : base(context) { _userId = userId; diff --git a/NGitLab.Mock/Clients/FileClient.cs b/NGitLab.Mock/Clients/FileClient.cs index 0acbb995..f27b1389 100644 --- a/NGitLab.Mock/Clients/FileClient.cs +++ b/NGitLab.Mock/Clients/FileClient.cs @@ -8,9 +8,9 @@ namespace NGitLab.Mock.Clients; internal sealed class FileClient : ClientBase, IFilesClient { - private readonly int _projectId; + private readonly long _projectId; - public FileClient(ClientContext context, int projectId) + public FileClient(ClientContext context, long projectId) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/GitLabClient.cs b/NGitLab.Mock/Clients/GitLabClient.cs index 6588079b..d2106480 100644 --- a/NGitLab.Mock/Clients/GitLabClient.cs +++ b/NGitLab.Mock/Clients/GitLabClient.cs @@ -20,8 +20,6 @@ public GitLabClient(ClientContext context) public IMembersClient Members => new MembersClient(Context); - public ICommitClient GetCommits(int projectId) => GetCommits((long)projectId); - public ICommitClient GetCommits(ProjectId projectId) => new CommitClient(Context, projectId); public IIssueClient Issues => new IssueClient(Context); @@ -58,101 +56,57 @@ public IGraphQLClient GraphQL public IEventClient GetEvents() => new EventClient(Context); - public IEventClient GetUserEvents(int userId) => new EventClient(Context, userId); - - public IEventClient GetProjectEvents(int projectId) => GetProjectEvents((long)projectId); + public IEventClient GetUserEvents(long userId) => new EventClient(Context, userId); public IEventClient GetProjectEvents(ProjectId projectId) => new EventClient(Context, null, projectId); - public ICommitStatusClient GetCommitStatus(int projectId) => GetCommitStatus((long)projectId); - public ICommitStatusClient GetCommitStatus(ProjectId projectId) => new CommitStatusClient(Context, projectId); - public IEnvironmentClient GetEnvironmentClient(int projectId) => GetEnvironmentClient((long)projectId); - public IEnvironmentClient GetEnvironmentClient(ProjectId projectId) => new EnvironmentClient(Context, projectId); - public IClusterClient GetClusterClient(int projectId) => GetClusterClient((long)projectId); - public IClusterClient GetClusterClient(ProjectId projectId) => new ClusterClient(Context, projectId); - public IGroupBadgeClient GetGroupBadgeClient(int groupId) => GetGroupBadgeClient((long)groupId); - public IGroupBadgeClient GetGroupBadgeClient(GroupId groupId) => new GroupBadgeClient(Context, groupId); - public IGroupVariableClient GetGroupVariableClient(int groupId) => GetGroupVariableClient((long)groupId); - public IGroupVariableClient GetGroupVariableClient(GroupId groupId) => new GroupVariableClient(Context, groupId); - public IJobClient GetJobs(int projectId) => GetJobs((long)projectId); - public IJobClient GetJobs(ProjectId projectId) => new JobClient(Context, projectId); - public IMergeRequestClient GetMergeRequest(int projectId) => GetMergeRequest((long)projectId); - public IMergeRequestClient GetMergeRequest(ProjectId projectId) => new MergeRequestClient(Context, projectId); public IMergeRequestClient GetGroupMergeRequest(GroupId groupId) => new MergeRequestClient(Context, groupId); - public IMilestoneClient GetMilestone(int projectId) => GetMilestone((long)projectId); - public IMilestoneClient GetMilestone(ProjectId projectId) => new MilestoneClient(Context, projectId, MilestoneScope.Projects); - public IMilestoneClient GetGroupMilestone(int groupId) => GetGroupMilestone((long)groupId); - public IMilestoneClient GetGroupMilestone(GroupId groupId) => new MilestoneClient(Context, groupId, MilestoneScope.Groups); - public IReleaseClient GetReleases(int projectId) => GetReleases((long)projectId); - public IReleaseClient GetReleases(ProjectId projectId) => new ReleaseClient(Context, projectId); - public IPipelineClient GetPipelines(int projectId) => GetPipelines((long)projectId); - public IPipelineClient GetPipelines(ProjectId projectId) => new PipelineClient(Context, jobClient: GetJobs(projectId), projectId: projectId); public IPipelineScheduleClient GetPipelineSchedules(ProjectId projectId) => new PipelineScheduleClient(Context, projectId); - public IProjectBadgeClient GetProjectBadgeClient(int projectId) => GetProjectBadgeClient((long)projectId); - public IProjectBadgeClient GetProjectBadgeClient(ProjectId projectId) => new ProjectBadgeClient(Context, projectId); - public IProjectIssueNoteClient GetProjectIssueNoteClient(int projectId) => GetProjectIssueNoteClient((long)projectId); - public IProjectIssueNoteClient GetProjectIssueNoteClient(ProjectId projectId) => new ProjectIssueNoteClient(Context, projectId); - public IProjectVariableClient GetProjectVariableClient(int projectId) => GetProjectVariableClient((long)projectId); - public IProjectVariableClient GetProjectVariableClient(ProjectId projectId) => new ProjectVariableClient(Context, projectId); - public IRepositoryClient GetRepository(int projectId) => GetRepository((long)projectId); - public IRepositoryClient GetRepository(ProjectId projectId) => new RepositoryClient(Context, projectId); - public ITriggerClient GetTriggers(int projectId) => GetTriggers((long)projectId); - public ITriggerClient GetTriggers(ProjectId projectId) => new TriggerClient(Context, projectId); - public IWikiClient GetWikiClient(int projectId) => GetWikiClient((long)projectId); - public IWikiClient GetWikiClient(ProjectId projectId) => new WikiClient(Context, projectId); - public IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(int projectId) => GetProjectLevelApprovalRulesClient((long)projectId); - public IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(ProjectId projectId) => new ProjectLevelApprovalRulesClient(Context, projectId); - public IProtectedBranchClient GetProtectedBranchClient(int projectId) => GetProtectedBranchClient((long)projectId); - public IProtectedBranchClient GetProtectedBranchClient(ProjectId projectId) => new ProtectedBranchClient(Context, projectId); public IProtectedTagClient GetProtectedTagClient(ProjectId projectId) => new ProtectedTagClient(Context, projectId); - public ISearchClient GetGroupSearchClient(int groupId) => GetGroupSearchClient((long)groupId); - public ISearchClient GetGroupSearchClient(GroupId groupId) => new GroupSearchClient(Context, groupId); - public ISearchClient GetProjectSearchClient(int projectId) => GetProjectSearchClient((long)projectId); - public ISearchClient GetProjectSearchClient(ProjectId projectId) => new ProjectSearchClient(Context, projectId); public IGroupHooksClient GetGroupHooksClient(GroupId groupId) => new GroupHooksClient(Context, groupId); diff --git a/NGitLab.Mock/Clients/GroupBadgeClient.cs b/NGitLab.Mock/Clients/GroupBadgeClient.cs index 6804d801..d22a377d 100644 --- a/NGitLab.Mock/Clients/GroupBadgeClient.cs +++ b/NGitLab.Mock/Clients/GroupBadgeClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class GroupBadgeClient : ClientBase, IGroupBadgeClient { - private readonly int _groupId; + private readonly long _groupId; public GroupBadgeClient(ClientContext context, GroupId groupId) : base(context) @@ -14,7 +14,7 @@ public GroupBadgeClient(ClientContext context, GroupId groupId) _groupId = Server.AllGroups.FindGroup(groupId.ValueAsString()).Id; } - public Models.Badge this[int id] + public Models.Badge this[long id] { get { @@ -53,7 +53,7 @@ public Models.Badge Create(BadgeCreate badge) } } - public void Delete(int id) + public void Delete(long id) { EnsureUserIsAuthenticated(); @@ -69,7 +69,7 @@ public void Delete(int id) } } - public Models.Badge Update(int id, BadgeUpdate badge) + public Models.Badge Update(long id, BadgeUpdate badge) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/GroupClient.cs b/NGitLab.Mock/Clients/GroupClient.cs index c2917147..2a621c54 100644 --- a/NGitLab.Mock/Clients/GroupClient.cs +++ b/NGitLab.Mock/Clients/GroupClient.cs @@ -67,7 +67,7 @@ public Models.Group Create(GroupCreate group) return Create(group); } - public void Delete(int id) + public void Delete(long id) { using (Context.BeginOperationScope()) { @@ -83,7 +83,7 @@ public void Delete(int id) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task DeleteAsync(int id, CancellationToken cancellationToken = default) + public async Task DeleteAsync(long id, CancellationToken cancellationToken = default) { await Task.Yield(); Delete(id); @@ -148,7 +148,7 @@ public async Task DeleteAsync(int id, CancellationToken cancellationToken = defa return new(page, all.Length > PagedResponse.MaxQueryCountLimit ? null : all.Length); } - public Models.Group this[int id] => GetGroup(id); + public Models.Group this[long id] => GetGroup(id); public Models.Group this[string fullPath] => GetGroup(fullPath); @@ -167,7 +167,7 @@ public Models.Group GetGroup(GroupId id) public Task GetByFullPathAsync(string fullPath, CancellationToken cancellationToken = default) => GetGroupAsync(fullPath, cancellationToken); - public Task GetByIdAsync(int id, CancellationToken cancellationToken = default) => GetGroupAsync(id, cancellationToken); + public Task GetByIdAsync(long id, CancellationToken cancellationToken = default) => GetGroupAsync(id, cancellationToken); [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] public async Task GetGroupAsync(GroupId groupId, CancellationToken cancellationToken = default) @@ -176,12 +176,12 @@ public Models.Group GetGroup(GroupId id) return GetGroup(groupId); } - public void Restore(int id) + public void Restore(long id) { throw new NotImplementedException(); } - public async Task RestoreAsync(int id, CancellationToken cancellationToken = default) + public async Task RestoreAsync(long id, CancellationToken cancellationToken = default) { await Task.Yield(); Restore(id); @@ -197,13 +197,13 @@ public async Task RestoreAsync(int id, CancellationToken cancellationToken = def return GitLabCollectionResponse.Create(Search(search)); } - public IEnumerable SearchProjects(int groupId, string search) => + public IEnumerable SearchProjects(long groupId, string search) => SearchProjectsAsync(groupId, new GroupProjectsQuery { Search = search, }); - public GitLabCollectionResponse GetProjectsAsync(int groupId, GroupProjectsQuery query) => SearchProjectsAsync(groupId, query); + public GitLabCollectionResponse GetProjectsAsync(long groupId, GroupProjectsQuery query) => SearchProjectsAsync(groupId, query); public GitLabCollectionResponse SearchProjectsAsync(GroupId groupId, GroupProjectsQuery query) { @@ -263,7 +263,7 @@ public async Task RestoreAsync(int id, CancellationToken cancellationToken = def return new(page, all.Length > PagedResponse.MaxQueryCountLimit ? null : all.Length); } - public Models.Group Update(int id, GroupUpdate groupUpdate) + public Models.Group Update(long id, GroupUpdate groupUpdate) { using (Context.BeginOperationScope()) { @@ -319,13 +319,13 @@ public Models.Group Update(int id, GroupUpdate groupUpdate) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task UpdateAsync(int id, GroupUpdate groupUpdate, CancellationToken cancellationToken = default) + public async Task UpdateAsync(long id, GroupUpdate groupUpdate, CancellationToken cancellationToken = default) { await Task.Yield(); return Update(id, groupUpdate); } - public GitLabCollectionResponse GetSubgroupsByIdAsync(int id, SubgroupQuery query = null) => GetSubgroupsAsync(id, query); + public GitLabCollectionResponse GetSubgroupsByIdAsync(long id, SubgroupQuery query = null) => GetSubgroupsAsync(id, query); public GitLabCollectionResponse GetSubgroupsByFullPathAsync(string fullPath, SubgroupQuery query = null) => GetSubgroupsAsync(fullPath, query); diff --git a/NGitLab.Mock/Clients/GroupHooksClient.cs b/NGitLab.Mock/Clients/GroupHooksClient.cs index e5aba42b..03270d01 100644 --- a/NGitLab.Mock/Clients/GroupHooksClient.cs +++ b/NGitLab.Mock/Clients/GroupHooksClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class GroupHooksClient : ClientBase, IGroupHooksClient { - public int _groupId { get; } + public long _groupId { get; } public GroupHooksClient(ClientContext context, GroupId groupId) : base(context) @@ -26,7 +26,7 @@ public IEnumerable All } } - public Models.GroupHook this[int hookId] + public Models.GroupHook this[long hookId] { get { @@ -49,7 +49,7 @@ public Models.GroupHook Create(GroupHookUpsert hook) } } - public Models.GroupHook Update(int hookId, GroupHookUpsert hook) + public Models.GroupHook Update(long hookId, GroupHookUpsert hook) { using (Context.BeginOperationScope()) { @@ -71,7 +71,7 @@ public Models.GroupHook Update(int hookId, GroupHookUpsert hook) } } - public void Delete(int hookId) + public void Delete(long hookId) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/GroupSearchClient.cs b/NGitLab.Mock/Clients/GroupSearchClient.cs index 7e98df50..775dde2c 100644 --- a/NGitLab.Mock/Clients/GroupSearchClient.cs +++ b/NGitLab.Mock/Clients/GroupSearchClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class GroupSearchClient : ClientBase, ISearchClient { private readonly ClientContext _context; - private readonly int _groupId; + private readonly long _groupId; public GroupSearchClient(ClientContext context, GroupId groupId) : base(context) diff --git a/NGitLab.Mock/Clients/GroupVariableClient.cs b/NGitLab.Mock/Clients/GroupVariableClient.cs index e135f2f3..0aa39918 100644 --- a/NGitLab.Mock/Clients/GroupVariableClient.cs +++ b/NGitLab.Mock/Clients/GroupVariableClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class GroupVariableClient : ClientBase, IGroupVariableClient { - private readonly int _groupId; + private readonly long _groupId; public GroupVariableClient(ClientContext context, GroupId groupId) : base(context) diff --git a/NGitLab.Mock/Clients/IssueClient.cs b/NGitLab.Mock/Clients/IssueClient.cs index 39060718..247df41a 100644 --- a/NGitLab.Mock/Clients/IssueClient.cs +++ b/NGitLab.Mock/Clients/IssueClient.cs @@ -129,7 +129,7 @@ public Models.Issue Edit(IssueEdit issueEdit) return Edit(issueEdit); } - public IEnumerable ResourceLabelEvents(int projectId, int issueIid) + public IEnumerable ResourceLabelEvents(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -138,7 +138,7 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public GitLabCollectionResponse ResourceLabelEventsAsync(int projectId, int issueIid) + public GitLabCollectionResponse ResourceLabelEventsAsync(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -149,7 +149,7 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public IEnumerable ResourceMilestoneEvents(int projectId, int issueIid) + public IEnumerable ResourceMilestoneEvents(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -158,7 +158,7 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public GitLabCollectionResponse ResourceMilestoneEventsAsync(int projectId, int issueIid) + public GitLabCollectionResponse ResourceMilestoneEventsAsync(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -169,7 +169,7 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public IEnumerable ResourceStateEvents(int projectId, int issueIid) + public IEnumerable ResourceStateEvents(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -178,7 +178,7 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public GitLabCollectionResponse ResourceStateEventsAsync(int projectId, int issueIid) + public GitLabCollectionResponse ResourceStateEventsAsync(long projectId, long issueIid) { using (Context.BeginOperationScope()) { @@ -189,37 +189,37 @@ public Models.Issue Edit(IssueEdit issueEdit) } } - public IEnumerable RelatedTo(int projectId, int issueId) + public IEnumerable RelatedTo(long projectId, long issueId) { throw new NotImplementedException(); } - public GitLabCollectionResponse RelatedToAsync(int projectId, int issueIid) + public GitLabCollectionResponse RelatedToAsync(long projectId, long issueIid) { throw new NotImplementedException(); } - public IEnumerable ClosedBy(int projectId, int issueId) + public IEnumerable ClosedBy(long projectId, long issueId) { throw new NotImplementedException(); } - public GitLabCollectionResponse ClosedByAsync(int projectId, int issueIid) + public GitLabCollectionResponse ClosedByAsync(long projectId, long issueIid) { throw new NotImplementedException(); } - public Task TimeStatsAsync(int projectId, int issueIid, CancellationToken cancellationToken = default) + public Task TimeStatsAsync(long projectId, long issueIid, CancellationToken cancellationToken = default) { throw new NotImplementedException(); } - public Task CloneAsync(int projectId, int issueIid, IssueClone issueClone, CancellationToken cancellationToken = default) + public Task CloneAsync(long projectId, long issueIid, IssueClone issueClone, CancellationToken cancellationToken = default) { throw new NotImplementedException(); } - public IEnumerable ForProject(int projectId) + public IEnumerable ForProject(long projectId) { using (Context.BeginOperationScope()) { @@ -233,22 +233,22 @@ public Task TimeStatsAsync(int projectId, int issueIid, CancellationT } } - public GitLabCollectionResponse ForProjectAsync(int projectId) + public GitLabCollectionResponse ForProjectAsync(long projectId) { return GitLabCollectionResponse.Create(ForProject(projectId)); } - public GitLabCollectionResponse ForGroupsAsync(int groupId) + public GitLabCollectionResponse ForGroupsAsync(long groupId) { throw new NotImplementedException(); } - public GitLabCollectionResponse ForGroupsAsync(int groupId, IssueQuery query) + public GitLabCollectionResponse ForGroupsAsync(long groupId, IssueQuery query) { throw new NotImplementedException(); } - public Models.Issue Get(int projectId, int issueId) + public Models.Issue Get(long projectId, long issueId) { using (Context.BeginOperationScope()) { @@ -260,7 +260,7 @@ public Models.Issue Get(int projectId, int issueId) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task GetAsync(int projectId, int issueId, CancellationToken cancellationToken = default) + public async Task GetAsync(long projectId, long issueId, CancellationToken cancellationToken = default) { await Task.Yield(); return Get(projectId, issueId); @@ -281,7 +281,7 @@ public Models.Issue Get(int projectId, int issueId) return GitLabCollectionResponse.Create(Get(query)); } - public IEnumerable Get(int projectId, IssueQuery query) + public IEnumerable Get(long projectId, IssueQuery query) { using (Context.BeginOperationScope()) { @@ -291,28 +291,28 @@ public Models.Issue Get(int projectId, int issueId) } } - public GitLabCollectionResponse GetAsync(int projectId, IssueQuery query) + public GitLabCollectionResponse GetAsync(long projectId, IssueQuery query) { return GitLabCollectionResponse.Create(Get(projectId, query)); } - public async Task GetByIdAsync(int issueId, CancellationToken cancellationToken = default) + public async Task GetByIdAsync(long issueId, CancellationToken cancellationToken = default) { await Task.Yield(); return GetById(issueId); } - public GitLabCollectionResponse LinkedToAsync(int projectId, int issueId) + public GitLabCollectionResponse LinkedToAsync(long projectId, long issueId) { throw new NotImplementedException(); } - public bool CreateLinkBetweenIssues(int sourceProjectId, int sourceIssueId, int targetProjectId, int targetIssueId) + public bool CreateLinkBetweenIssues(long sourceProjectId, long sourceIssueId, long targetProjectId, long targetIssueId) { throw new NotImplementedException(); } - public Models.Issue GetById(int issueId) + public Models.Issue GetById(long issueId) { using (Context.BeginOperationScope()) { @@ -452,12 +452,12 @@ private IEnumerable FilterByQuery(IEnumerable issues, IssueQuery q return issues; } - public IEnumerable GetParticipants(ProjectId projectId, int issueIid) + public IEnumerable GetParticipants(ProjectId projectId, long issueIid) { throw new NotImplementedException(); } - public Models.Issue Unsubscribe(ProjectId projectId, int issueIid) + public Models.Issue Unsubscribe(ProjectId projectId, long issueIid) { throw new NotImplementedException(); } diff --git a/NGitLab.Mock/Clients/JobClient.cs b/NGitLab.Mock/Clients/JobClient.cs index 7d3f31e2..b7cf9d8b 100644 --- a/NGitLab.Mock/Clients/JobClient.cs +++ b/NGitLab.Mock/Clients/JobClient.cs @@ -11,7 +11,7 @@ namespace NGitLab.Mock.Clients; internal sealed class JobClient : ClientBase, IJobClient { - private readonly int _projectId; + private readonly long _projectId; public JobClient(ClientContext context, ProjectId projectId) : base(context) @@ -19,7 +19,7 @@ public JobClient(ClientContext context, ProjectId projectId) _projectId = Server.AllProjects.FindProject(projectId.ValueAsString()).Id; } - public Models.Job Get(int jobId) + public Models.Job Get(long jobId) { using (Context.BeginOperationScope()) { @@ -34,18 +34,18 @@ public Models.Job Get(int jobId) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task GetAsync(int jobId, CancellationToken cancellationToken = default) + public async Task GetAsync(long jobId, CancellationToken cancellationToken = default) { await Task.Yield(); return Get(jobId); } - public byte[] GetJobArtifacts(int jobId) + public byte[] GetJobArtifacts(long jobId) { throw new NotImplementedException(); } - public byte[] GetJobArtifact(int jobId, string path) + public byte[] GetJobArtifact(long jobId, string path) { throw new NotImplementedException(); } @@ -88,7 +88,7 @@ public byte[] GetJobArtifact(JobArtifactQuery query) return GitLabCollectionResponse.Create(GetJobs(query)); } - public string GetTrace(int jobId) + public string GetTrace(long jobId) { using (Context.BeginOperationScope()) { @@ -103,13 +103,13 @@ public string GetTrace(int jobId) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task GetTraceAsync(int jobId, CancellationToken cancellationToken = default) + public async Task GetTraceAsync(long jobId, CancellationToken cancellationToken = default) { await Task.Yield(); return GetTrace(jobId); } - public Models.Job RunAction(int jobId, JobAction action) + public Models.Job RunAction(long jobId, JobAction action) { using (Context.BeginOperationScope()) { @@ -140,7 +140,7 @@ public Models.Job RunAction(int jobId, JobAction action) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task RunActionAsync(int jobId, JobAction action, CancellationToken cancellationToken = default) + public async Task RunActionAsync(long jobId, JobAction action, CancellationToken cancellationToken = default) { await Task.Yield(); return RunAction(jobId, action); diff --git a/NGitLab.Mock/Clients/LabelClient.cs b/NGitLab.Mock/Clients/LabelClient.cs index 6f172ee6..5493d399 100644 --- a/NGitLab.Mock/Clients/LabelClient.cs +++ b/NGitLab.Mock/Clients/LabelClient.cs @@ -13,7 +13,7 @@ public LabelClient(ClientContext context) { } - public Models.Label CreateProjectLabel(int projectId, ProjectLabelCreate label) + public Models.Label CreateProjectLabel(long projectId, ProjectLabelCreate label) { using (Context.BeginOperationScope()) { @@ -33,7 +33,7 @@ public Models.Label Create(LabelCreate label) }); } - public Models.Label CreateGroupLabel(int groupId, GroupLabelCreate label) + public Models.Label CreateGroupLabel(long groupId, GroupLabelCreate label) { using (Context.BeginOperationScope()) { @@ -53,7 +53,7 @@ public Models.Label CreateGroupLabel(LabelCreate label) }); } - public Models.Label DeleteProjectLabel(int projectId, ProjectLabelDelete label) + public Models.Label DeleteProjectLabel(long projectId, ProjectLabelDelete label) { using (Context.BeginOperationScope()) { @@ -74,7 +74,7 @@ public Models.Label Delete(LabelDelete label) }); } - public Models.Label EditProjectLabel(int projectId, ProjectLabelEdit label) + public Models.Label EditProjectLabel(long projectId, ProjectLabelEdit label) { using (Context.BeginOperationScope()) { @@ -112,7 +112,7 @@ public Models.Label Edit(LabelEdit label) }); } - public Models.Label EditGroupLabel(int groupId, GroupLabelEdit label) + public Models.Label EditGroupLabel(long groupId, GroupLabelEdit label) { using (Context.BeginOperationScope()) { @@ -150,7 +150,7 @@ public Models.Label EditGroupLabel(LabelEdit label) }); } - public IEnumerable ForGroup(int groupId) + public IEnumerable ForGroup(long groupId) { using (Context.BeginOperationScope()) { @@ -159,7 +159,7 @@ public Models.Label EditGroupLabel(LabelEdit label) } } - public IEnumerable ForProject(int projectId) + public IEnumerable ForProject(long projectId) { using (Context.BeginOperationScope()) { @@ -168,7 +168,7 @@ public Models.Label EditGroupLabel(LabelEdit label) } } - public Models.Label GetGroupLabel(int groupId, string name) + public Models.Label GetGroupLabel(long groupId, string name) { using (Context.BeginOperationScope()) { @@ -177,7 +177,7 @@ public Models.Label GetGroupLabel(int groupId, string name) } } - public Models.Label GetProjectLabel(int projectId, string name) + public Models.Label GetProjectLabel(long projectId, string name) { using (Context.BeginOperationScope()) { @@ -187,7 +187,7 @@ public Models.Label GetProjectLabel(int projectId, string name) } [EditorBrowsable(EditorBrowsableState.Never)] - public Models.Label GetLabel(int projectId, string name) + public Models.Label GetLabel(long projectId, string name) { return GetProjectLabel(projectId, name); } diff --git a/NGitLab.Mock/Clients/MergeRequestApprovalClient.cs b/NGitLab.Mock/Clients/MergeRequestApprovalClient.cs index ad08e8cb..005a7908 100644 --- a/NGitLab.Mock/Clients/MergeRequestApprovalClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestApprovalClient.cs @@ -5,10 +5,10 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestApprovalClient : ClientBase, IMergeRequestApprovalClient { - private readonly int _projectId; - private readonly int _mergeRequestIid; + private readonly long _projectId; + private readonly long _mergeRequestIid; - public MergeRequestApprovalClient(ClientContext context, int projectId, int mergeRequestIid) + public MergeRequestApprovalClient(ClientContext context, long projectId, long mergeRequestIid) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/MergeRequestChangeClient.cs b/NGitLab.Mock/Clients/MergeRequestChangeClient.cs index 0d5e2748..5fb0ab36 100644 --- a/NGitLab.Mock/Clients/MergeRequestChangeClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestChangeClient.cs @@ -5,10 +5,10 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestChangeClient : ClientBase, IMergeRequestChangeClient { - private readonly int _projectId; - private readonly int _mergeRequestIid; + private readonly long _projectId; + private readonly long _mergeRequestIid; - public MergeRequestChangeClient(ClientContext context, int projectId, int mergeRequestIid) + public MergeRequestChangeClient(ClientContext context, long projectId, long mergeRequestIid) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/MergeRequestClient.cs b/NGitLab.Mock/Clients/MergeRequestClient.cs index f2644754..5a758b6c 100644 --- a/NGitLab.Mock/Clients/MergeRequestClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestClient.cs @@ -12,7 +12,7 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestClient : ClientBase, IMergeRequestClient { - private readonly int? _projectId; + private readonly long? _projectId; public MergeRequestClient(ClientContext context) : base(context) @@ -40,7 +40,7 @@ private void AssertProjectId() throw new InvalidOperationException("Valid only for a specific project"); } - public Models.MergeRequest this[int iid] + public Models.MergeRequest this[long iid] { get { @@ -58,7 +58,7 @@ public Models.MergeRequest this[int iid] } } - public Task GetByIidAsync(int iid, SingleMergeRequestQuery options, CancellationToken cancellationToken = default) + public Task GetByIidAsync(long iid, SingleMergeRequestQuery options, CancellationToken cancellationToken = default) { return Task.FromResult(this[iid]); } @@ -84,7 +84,7 @@ public IEnumerable All } } - public Models.MergeRequest Accept(int mergeRequestIid, MergeRequestAccept message) + public Models.MergeRequest Accept(long mergeRequestIid, MergeRequestAccept message) { return Accept(mergeRequestIid, new MergeRequestMerge { @@ -93,7 +93,7 @@ public Models.MergeRequest Accept(int mergeRequestIid, MergeRequestAccept messag }); } - public Models.MergeRequest Accept(int mergeRequestIid, MergeRequestMerge message) + public Models.MergeRequest Accept(long mergeRequestIid, MergeRequestMerge message) { AssertProjectId(); using (Context.BeginOperationScope()) @@ -148,7 +148,7 @@ public Models.MergeRequest Accept(int mergeRequestIid, MergeRequestMerge message } } - public Models.MergeRequest Approve(int mergeRequestIid, MergeRequestApprove message) + public Models.MergeRequest Approve(long mergeRequestIid, MergeRequestApprove message) { AssertProjectId(); @@ -194,7 +194,7 @@ public Models.MergeRequest Approve(int mergeRequestIid, MergeRequestApprove mess } } - public RebaseResult Rebase(int mergeRequestIid) + public RebaseResult Rebase(long mergeRequestIid) { AssertProjectId(); using (Context.BeginOperationScope()) @@ -209,7 +209,7 @@ public RebaseResult Rebase(int mergeRequestIid) } } - public Task RebaseAsync(int mergeRequestIid, MergeRequestRebase options, CancellationToken cancellationToken = default) + public Task RebaseAsync(long mergeRequestIid, MergeRequestRebase options, CancellationToken cancellationToken = default) { return Task.FromResult(Rebase(mergeRequestIid)); } @@ -242,21 +242,21 @@ public Task RebaseAsync(int mergeRequestIid, MergeRequestRebase op } } - public IMergeRequestChangeClient Changes(int mergeRequestIid) + public IMergeRequestChangeClient Changes(long mergeRequestIid) { AssertProjectId(); return new MergeRequestChangeClient(Context, _projectId.GetValueOrDefault(), mergeRequestIid); } - public IMergeRequestApprovalClient ApprovalClient(int mergeRequestIid) + public IMergeRequestApprovalClient ApprovalClient(long mergeRequestIid) { AssertProjectId(); return new MergeRequestApprovalClient(Context, _projectId.GetValueOrDefault(), mergeRequestIid); } - public Models.MergeRequest Close(int mergeRequestIid) + public Models.MergeRequest Close(long mergeRequestIid) { AssertProjectId(); @@ -278,21 +278,21 @@ public Models.MergeRequest Close(int mergeRequestIid) } } - public IMergeRequestCommentClient Comments(int mergeRequestIid) + public IMergeRequestCommentClient Comments(long mergeRequestIid) { AssertProjectId(); return new MergeRequestCommentClient(Context, _projectId.GetValueOrDefault(), mergeRequestIid); } - public IMergeRequestCommitClient Commits(int mergeRequestIid) + public IMergeRequestCommitClient Commits(long mergeRequestIid) { AssertProjectId(); return new MergeRequestCommitClient(Context, _projectId.GetValueOrDefault(), mergeRequestIid); } - public Models.MergeRequest CancelMergeWhenPipelineSucceeds(int mergeRequestIid) + public Models.MergeRequest CancelMergeWhenPipelineSucceeds(long mergeRequestIid) { AssertProjectId(); @@ -380,7 +380,7 @@ private void SetLabels(MergeRequest mergeRequest, string labels, string labelsTo } } - public void Delete(int mergeRequestIid) + public void Delete(long mergeRequestIid) { AssertProjectId(); @@ -548,7 +548,7 @@ public void Delete(int mergeRequestIid) return mergeRequests.Select(mr => mr.ToMergeRequestClient()).ToList(); } - public IEnumerable GetParticipants(int mergeRequestIid) + public IEnumerable GetParticipants(long mergeRequestIid) { AssertProjectId(); @@ -566,7 +566,7 @@ public IEnumerable GetParticipants(int mergeRequestIid) } } - public IEnumerable GetPipelines(int mergeRequestIid) + public IEnumerable GetPipelines(long mergeRequestIid) { AssertProjectId(); @@ -588,7 +588,7 @@ public IEnumerable GetPipelines(int mergeRequestIid) } } - public Models.MergeRequest Reopen(int mergeRequestIid) + public Models.MergeRequest Reopen(long mergeRequestIid) { AssertProjectId(); @@ -610,7 +610,7 @@ public Models.MergeRequest Reopen(int mergeRequestIid) } } - public Models.MergeRequest Update(int mergeRequestIid, MergeRequestUpdate mergeRequestUpdate) + public Models.MergeRequest Update(long mergeRequestIid, MergeRequestUpdate mergeRequestUpdate) { AssertProjectId(); @@ -707,29 +707,29 @@ public Models.MergeRequest Update(int mergeRequestIid, MergeRequestUpdate mergeR } } - public IEnumerable ClosesIssues(int mergeRequestIid) + public IEnumerable ClosesIssues(long mergeRequestIid) { throw new NotImplementedException(); } - public GitLabCollectionResponse GetVersionsAsync(int mergeRequestIid) + public GitLabCollectionResponse GetVersionsAsync(long mergeRequestIid) { throw new NotImplementedException(); } - public Task TimeStatsAsync(int mergeRequestIid, CancellationToken cancellationToken = default) + public Task TimeStatsAsync(long mergeRequestIid, CancellationToken cancellationToken = default) { throw new NotImplementedException(); } - public IMergeRequestDiscussionClient Discussions(int mergeRequestIid) + public IMergeRequestDiscussionClient Discussions(long mergeRequestIid) { AssertProjectId(); return new MergeRequestDiscussionClient(Context, _projectId.GetValueOrDefault(), mergeRequestIid); } - public GitLabCollectionResponse ResourceLabelEventsAsync(int projectId, int mergeRequestIid) + public GitLabCollectionResponse ResourceLabelEventsAsync(long projectId, long mergeRequestIid) { using (Context.BeginOperationScope()) { @@ -740,7 +740,7 @@ public IMergeRequestDiscussionClient Discussions(int mergeRequestIid) } } - public GitLabCollectionResponse ResourceMilestoneEventsAsync(int projectId, int mergeRequestIid) + public GitLabCollectionResponse ResourceMilestoneEventsAsync(long projectId, long mergeRequestIid) { using (Context.BeginOperationScope()) { @@ -751,7 +751,7 @@ public IMergeRequestDiscussionClient Discussions(int mergeRequestIid) } } - public GitLabCollectionResponse ResourceStateEventsAsync(int projectId, int mergeRequestIid) + public GitLabCollectionResponse ResourceStateEventsAsync(long projectId, long mergeRequestIid) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/MergeRequestCommentClient.cs b/NGitLab.Mock/Clients/MergeRequestCommentClient.cs index 8bdae201..e4945d70 100644 --- a/NGitLab.Mock/Clients/MergeRequestCommentClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestCommentClient.cs @@ -7,10 +7,10 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestCommentClient : ClientBase, IMergeRequestCommentClient { - private readonly int _projectId; - private readonly int _mergeRequestIid; + private readonly long _projectId; + private readonly long _mergeRequestIid; - public MergeRequestCommentClient(ClientContext context, int projectId, int mergeRequestIid) + public MergeRequestCommentClient(ClientContext context, long projectId, long mergeRequestIid) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/MergeRequestCommitClient.cs b/NGitLab.Mock/Clients/MergeRequestCommitClient.cs index 7f9e4dd1..074e86a3 100644 --- a/NGitLab.Mock/Clients/MergeRequestCommitClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestCommitClient.cs @@ -6,10 +6,10 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestCommitClient : ClientBase, IMergeRequestCommitClient { - private readonly int _projectId; - private readonly int _mergeRequestIid; + private readonly long _projectId; + private readonly long _mergeRequestIid; - public MergeRequestCommitClient(ClientContext context, int projectId, int mergeRequestIid) + public MergeRequestCommitClient(ClientContext context, long projectId, long mergeRequestIid) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/MergeRequestDiscussionClient.cs b/NGitLab.Mock/Clients/MergeRequestDiscussionClient.cs index 1008e47a..54d6ad31 100644 --- a/NGitLab.Mock/Clients/MergeRequestDiscussionClient.cs +++ b/NGitLab.Mock/Clients/MergeRequestDiscussionClient.cs @@ -9,10 +9,10 @@ namespace NGitLab.Mock.Clients; internal sealed class MergeRequestDiscussionClient : ClientBase, IMergeRequestDiscussionClient { - private readonly int _projectId; - private readonly int _mergeRequestIid; + private readonly long _projectId; + private readonly long _mergeRequestIid; - public MergeRequestDiscussionClient(ClientContext context, int projectId, int mergeRequestIid) + public MergeRequestDiscussionClient(ClientContext context, long projectId, long mergeRequestIid) : base(context) { _projectId = projectId; diff --git a/NGitLab.Mock/Clients/MilestoneClient.cs b/NGitLab.Mock/Clients/MilestoneClient.cs index 5c96c2d1..a3a2ddd4 100644 --- a/NGitLab.Mock/Clients/MilestoneClient.cs +++ b/NGitLab.Mock/Clients/MilestoneClient.cs @@ -10,7 +10,7 @@ namespace NGitLab.Mock; internal sealed class MilestoneClient : ClientBase, IMilestoneClient { - private readonly int _resourceId; + private readonly long _resourceId; public MilestoneClient(ClientContext context, IIdOrPathAddressable id, MilestoneScope scope) : base(context) @@ -24,7 +24,7 @@ public MilestoneClient(ClientContext context, IIdOrPathAddressable id, Milestone Scope = scope; } - public Models.Milestone this[int id] + public Models.Milestone this[long id] { get { @@ -39,7 +39,7 @@ public Models.Milestone this[int id] public MilestoneScope Scope { get; } - public Models.Milestone Activate(int milestoneId) + public Models.Milestone Activate(long milestoneId) { using (Context.BeginOperationScope()) { @@ -49,7 +49,7 @@ public Models.Milestone Activate(int milestoneId) } } - public IEnumerable GetMergeRequests(int milestoneId) + public IEnumerable GetMergeRequests(long milestoneId) { using (Context.BeginOperationScope()) { @@ -78,7 +78,7 @@ public Models.Milestone Activate(int milestoneId) return Get(new MilestoneQuery { State = state }); } - public Models.Milestone Close(int milestoneId) + public Models.Milestone Close(long milestoneId) { using (Context.BeginOperationScope()) { @@ -118,7 +118,7 @@ public Models.Milestone Create(MilestoneCreate milestone) } } - public void Delete(int milestoneId) + public void Delete(long milestoneId) { using (Context.BeginOperationScope()) { @@ -171,7 +171,7 @@ public void Delete(int milestoneId) } } - public Models.Milestone Update(int milestoneId, MilestoneUpdate milestone) + public Models.Milestone Update(long milestoneId, MilestoneUpdate milestone) { using (Context.BeginOperationScope()) { @@ -201,7 +201,7 @@ public Models.Milestone Update(int milestoneId, MilestoneUpdate milestone) } } - private Milestone GetMilestone(int milestoneId, bool editing) + private Milestone GetMilestone(long milestoneId, bool editing) { Milestone milestone; diff --git a/NGitLab.Mock/Clients/NamespacesClient.cs b/NGitLab.Mock/Clients/NamespacesClient.cs index 9eac6023..c165bc5a 100644 --- a/NGitLab.Mock/Clients/NamespacesClient.cs +++ b/NGitLab.Mock/Clients/NamespacesClient.cs @@ -11,7 +11,7 @@ public NamespacesClient(ClientContext context) { } - public Namespace this[int id] => throw new NotImplementedException(); + public Namespace this[long id] => throw new NotImplementedException(); public Namespace this[string fullPath] => throw new NotImplementedException(); diff --git a/NGitLab.Mock/Clients/PipelineClient.cs b/NGitLab.Mock/Clients/PipelineClient.cs index c8682551..f199019d 100644 --- a/NGitLab.Mock/Clients/PipelineClient.cs +++ b/NGitLab.Mock/Clients/PipelineClient.cs @@ -11,7 +11,7 @@ namespace NGitLab.Mock.Clients; internal sealed class PipelineClient : ClientBase, IPipelineClient { - private readonly int _projectId; + private readonly long _projectId; private readonly IJobClient _jobClient; public PipelineClient(ClientContext context, IJobClient jobClient, ProjectId projectId) @@ -21,7 +21,7 @@ public PipelineClient(ClientContext context, IJobClient jobClient, ProjectId pro _projectId = Server.AllProjects.FindProject(projectId.ValueAsString()).Id; } - public Models.Pipeline this[int id] + public Models.Pipeline this[long id] { get { @@ -84,7 +84,7 @@ public Models.Pipeline CreatePipelineWithTrigger(string token, string @ref, Dict } } - public void Delete(int pipelineId) + public void Delete(long pipelineId) { using (Context.BeginOperationScope()) { @@ -94,7 +94,7 @@ public void Delete(int pipelineId) } } - public IEnumerable GetVariables(int pipelineId) + public IEnumerable GetVariables(long pipelineId) { using (Context.BeginOperationScope()) { @@ -104,7 +104,7 @@ public IEnumerable GetVariables(int pipelineId) } } - public TestReport GetTestReports(int pipelineId) + public TestReport GetTestReports(long pipelineId) { using (Context.BeginOperationScope()) { @@ -114,7 +114,7 @@ public TestReport GetTestReports(int pipelineId) } } - public TestReportSummary GetTestReportsSummary(int pipelineId) + public TestReportSummary GetTestReportsSummary(long pipelineId) { using (Context.BeginOperationScope()) { @@ -139,7 +139,7 @@ public IEnumerable GetBridges(PipelineBridgeQuery query) } } - public Models.Job[] GetJobs(int pipelineId) + public Models.Job[] GetJobs(long pipelineId) { using (Context.BeginOperationScope()) { @@ -259,7 +259,7 @@ private static IEnumerable QuerySort(IEnumerable pipeline return pipelines.OrderBy(expression); } - public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) + public async Task GetByIdAsync(long id, CancellationToken cancellationToken = default) { await Task.Yield(); return this[id]; @@ -287,12 +287,12 @@ public GitLabCollectionResponse SearchAsync(PipelineQuery query) return GitLabCollectionResponse.Create(Search(query)); } - public GitLabCollectionResponse GetVariablesAsync(int pipelineId) + public GitLabCollectionResponse GetVariablesAsync(long pipelineId) { return GitLabCollectionResponse.Create(GetVariables(pipelineId)); } - public Task RetryAsync(int pipelineId, CancellationToken cancellationToken = default) + public Task RetryAsync(long pipelineId, CancellationToken cancellationToken = default) { using (Context.BeginOperationScope()) { @@ -306,7 +306,7 @@ public GitLabCollectionResponse GetVariablesAsync(int pipeline } } - public Task UpdateMetadataAsync(int pipelineId, PipelineMetadataUpdate update, CancellationToken cancellationToken = default) + public Task UpdateMetadataAsync(long pipelineId, PipelineMetadataUpdate update, CancellationToken cancellationToken = default) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/PipelineScheduleClient.cs b/NGitLab.Mock/Clients/PipelineScheduleClient.cs index f4df22c5..acddffd6 100644 --- a/NGitLab.Mock/Clients/PipelineScheduleClient.cs +++ b/NGitLab.Mock/Clients/PipelineScheduleClient.cs @@ -17,7 +17,7 @@ public PipelineScheduleClient(ClientContext context, ProjectId projectId) _projectId = projectId; } - public Models.PipelineSchedule this[int id] + public Models.PipelineSchedule this[long id] { get { @@ -48,7 +48,7 @@ public IEnumerable All public GitLabCollectionResponse GetAllAsync() => GitLabCollectionResponse.Create(All); - public GitLabCollectionResponse GetAllSchedulePipelinesAsync(int id) + public GitLabCollectionResponse GetAllSchedulePipelinesAsync(long id) { using (Context.BeginOperationScope()) { @@ -61,7 +61,7 @@ public GitLabCollectionResponse GetAllSchedulePipelinesAsync(int } } - public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) + public async Task GetByIdAsync(long id, CancellationToken cancellationToken = default) { await Task.Yield(); diff --git a/NGitLab.Mock/Clients/ProjectBadgeClient.cs b/NGitLab.Mock/Clients/ProjectBadgeClient.cs index c377ab1b..2039d86c 100644 --- a/NGitLab.Mock/Clients/ProjectBadgeClient.cs +++ b/NGitLab.Mock/Clients/ProjectBadgeClient.cs @@ -7,7 +7,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectBadgeClient : ClientBase, IProjectBadgeClient { - private readonly int _projectId; + private readonly long _projectId; public ProjectBadgeClient(ClientContext context, ProjectId projectId) : base(context) @@ -15,7 +15,7 @@ public ProjectBadgeClient(ClientContext context, ProjectId projectId) _projectId = Server.AllProjects.FindProject(projectId.ValueAsString()).Id; } - public Models.Badge this[int id] + public Models.Badge this[long id] { get { @@ -66,7 +66,7 @@ public Models.Badge Create(BadgeCreate badge) } } - public void Delete(int id) + public void Delete(long id) { EnsureUserIsAuthenticated(); @@ -82,7 +82,7 @@ public void Delete(int id) } } - public Models.Badge Update(int id, BadgeUpdate badge) + public Models.Badge Update(long id, BadgeUpdate badge) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/ProjectClient.cs b/NGitLab.Mock/Clients/ProjectClient.cs index 17fd333b..d2b831d1 100644 --- a/NGitLab.Mock/Clients/ProjectClient.cs +++ b/NGitLab.Mock/Clients/ProjectClient.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; +using System.Globalization; using System.IO; using System.Linq; using System.Threading; @@ -17,7 +18,7 @@ public ProjectClient(ClientContext context) { } - public Models.Project this[int id] + public Models.Project this[long id] { get { @@ -81,7 +82,7 @@ public Models.Project Create(ProjectCreate project) { project.Name ??= project.Path; - var parentGroup = GetParentGroup(project.NamespaceId); + var parentGroup = GetParentGroup(project.NamespaceId?.ToString(CultureInfo.InvariantCulture)); var newProject = new Project(name: project.Name, path: project.Path) { @@ -133,7 +134,7 @@ private Group GetParentGroup(string namespaceId) return parentGroup; } - public void Delete(int id) + public void Delete(long id) { using (Context.BeginOperationScope()) { @@ -152,13 +153,13 @@ public async Task DeleteAsync(ProjectId projectId, CancellationToken cancellatio } } - public void Archive(int id) + public void Archive(long id) { var project = GetProject(id, ProjectPermission.Edit); project.Archived = true; } - public void Unarchive(int id) + public void Unarchive(long id) { using (Context.BeginOperationScope()) { @@ -212,10 +213,8 @@ public Models.Project Fork(string id, ForkProject forkProject) case ProjectQueryScope.Owned: projects = projects.Where(p => p.IsUserOwner(Context.User)); break; - case ProjectQueryScope.Visible: - projects = projects.Where(p => p.CanUserViewProject(Context.User)); - break; case ProjectQueryScope.All: + projects = projects.Where(p => p.CanUserViewProject(Context.User)); break; } @@ -249,9 +248,9 @@ public Models.Project Fork(string id, ForkProject forkProject) } } - public Models.Project GetById(int id, SingleProjectQuery query) => this[id]; + public Models.Project GetById(long id, SingleProjectQuery query) => this[id]; - public Task GetByIdAsync(int id, SingleProjectQuery query, CancellationToken cancellationToken = default) => + public Task GetByIdAsync(long id, SingleProjectQuery query, CancellationToken cancellationToken = default) => GetAsync(new ProjectId(id), query, cancellationToken); public Task GetByNamespacedPathAsync(string path, SingleProjectQuery query = null, CancellationToken cancellationToken = default) => diff --git a/NGitLab.Mock/Clients/ProjectHooksClient.cs b/NGitLab.Mock/Clients/ProjectHooksClient.cs index a7b730d8..18a35825 100644 --- a/NGitLab.Mock/Clients/ProjectHooksClient.cs +++ b/NGitLab.Mock/Clients/ProjectHooksClient.cs @@ -6,9 +6,9 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectHooksClient : ClientBase, IProjectHooksClient { - public int ProjectId { get; } + public long ProjectId { get; } - public ProjectHooksClient(ClientContext context, int projectId) + public ProjectHooksClient(ClientContext context, long projectId) : base(context) { ProjectId = projectId; @@ -26,7 +26,7 @@ public IEnumerable All } } - public Models.ProjectHook this[int hookId] + public Models.ProjectHook this[long hookId] { get { @@ -49,7 +49,7 @@ public Models.ProjectHook Create(ProjectHookUpsert hook) } } - public Models.ProjectHook Update(int hookId, ProjectHookUpsert hook) + public Models.ProjectHook Update(long hookId, ProjectHookUpsert hook) { using (Context.BeginOperationScope()) { @@ -69,7 +69,7 @@ public Models.ProjectHook Update(int hookId, ProjectHookUpsert hook) } } - public void Delete(int hookId) + public void Delete(long hookId) { using (Context.BeginOperationScope()) { diff --git a/NGitLab.Mock/Clients/ProjectIssueNoteClient.cs b/NGitLab.Mock/Clients/ProjectIssueNoteClient.cs index 99c74c37..8124345d 100644 --- a/NGitLab.Mock/Clients/ProjectIssueNoteClient.cs +++ b/NGitLab.Mock/Clients/ProjectIssueNoteClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectIssueNoteClient : ClientBase, IProjectIssueNoteClient { - private readonly int _projectId; + private readonly long _projectId; public ProjectIssueNoteClient(ClientContext context, ProjectId projectId) : base(context) @@ -44,7 +44,7 @@ public Models.ProjectIssueNote Edit(ProjectIssueNoteEdit edit) } } - public IEnumerable ForIssue(int issueIid) + public IEnumerable ForIssue(long issueIid) { using (Context.BeginOperationScope()) { @@ -52,7 +52,7 @@ public Models.ProjectIssueNote Edit(ProjectIssueNoteEdit edit) } } - public Models.ProjectIssueNote Get(int issueIid, int noteId) + public Models.ProjectIssueNote Get(long issueIid, long noteId) { using (Context.BeginOperationScope()) { @@ -60,7 +60,7 @@ public Models.ProjectIssueNote Get(int issueIid, int noteId) } } - private Issue GetIssue(int issueIid) + private Issue GetIssue(long issueIid) { var project = GetProject(_projectId, ProjectPermission.View); var issue = project.Issues.FirstOrDefault(iss => iss.Iid == issueIid); @@ -73,7 +73,7 @@ private Issue GetIssue(int issueIid) return issue; } - private ProjectIssueNote GetIssueNote(int issueIid, int issueNoteId) + private ProjectIssueNote GetIssueNote(long issueIid, long issueNoteId) { var issue = GetIssue(issueIid); var note = issue.Notes.FirstOrDefault(n => n.Id == issueNoteId); diff --git a/NGitLab.Mock/Clients/ProjectLevelApprovalRulesClient.cs b/NGitLab.Mock/Clients/ProjectLevelApprovalRulesClient.cs index 3d36d396..8e300325 100644 --- a/NGitLab.Mock/Clients/ProjectLevelApprovalRulesClient.cs +++ b/NGitLab.Mock/Clients/ProjectLevelApprovalRulesClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectLevelApprovalRulesClient : ClientBase, IProjectLevelApprovalRulesClient { - private readonly int _projectId; + private readonly long _projectId; public ProjectLevelApprovalRulesClient(ClientContext context, ProjectId projectId) : base(context) @@ -19,7 +19,7 @@ public List GetProjectLevelApprovalRules() throw new NotImplementedException(); } - public ApprovalRule UpdateProjectLevelApprovalRule(int approvalRuleIdToUpdate, ApprovalRuleUpdate approvalRuleUpdate) + public ApprovalRule UpdateProjectLevelApprovalRule(long approvalRuleIdToUpdate, ApprovalRuleUpdate approvalRuleUpdate) { throw new NotImplementedException(); } @@ -29,7 +29,7 @@ public ApprovalRule CreateProjectLevelRule(ApprovalRuleCreate approvalRuleCreate throw new NotImplementedException(); } - public void DeleteProjectLevelRule(int approvalRuleIdToDelete) + public void DeleteProjectLevelRule(long approvalRuleIdToDelete) { throw new NotImplementedException(); } diff --git a/NGitLab.Mock/Clients/ProjectSearchClient.cs b/NGitLab.Mock/Clients/ProjectSearchClient.cs index 68044d0e..637fdff2 100644 --- a/NGitLab.Mock/Clients/ProjectSearchClient.cs +++ b/NGitLab.Mock/Clients/ProjectSearchClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectSearchClient : ClientBase, ISearchClient { private readonly ClientContext _context; - private readonly int _projectId; + private readonly long _projectId; public ProjectSearchClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ProjectVariableClient.cs b/NGitLab.Mock/Clients/ProjectVariableClient.cs index ce88da54..e32b0e6b 100644 --- a/NGitLab.Mock/Clients/ProjectVariableClient.cs +++ b/NGitLab.Mock/Clients/ProjectVariableClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProjectVariableClient : ClientBase, IProjectVariableClient { - private readonly int _projectId; + private readonly long _projectId; public ProjectVariableClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ProtectedBranchClient.cs b/NGitLab.Mock/Clients/ProtectedBranchClient.cs index 207e9d8f..16527e17 100644 --- a/NGitLab.Mock/Clients/ProtectedBranchClient.cs +++ b/NGitLab.Mock/Clients/ProtectedBranchClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProtectedBranchClient : ClientBase, IProtectedBranchClient { - private readonly int _projectId; + private readonly long _projectId; public ProtectedBranchClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ProtectedTagClient.cs b/NGitLab.Mock/Clients/ProtectedTagClient.cs index 17782e65..369f40ae 100644 --- a/NGitLab.Mock/Clients/ProtectedTagClient.cs +++ b/NGitLab.Mock/Clients/ProtectedTagClient.cs @@ -7,7 +7,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ProtectedTagClient : ClientBase, IProtectedTagClient { - private readonly int _projectId; + private readonly long _projectId; public ProtectedTagClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ReleaseClient.cs b/NGitLab.Mock/Clients/ReleaseClient.cs index e5eeb373..135687dc 100644 --- a/NGitLab.Mock/Clients/ReleaseClient.cs +++ b/NGitLab.Mock/Clients/ReleaseClient.cs @@ -11,7 +11,7 @@ namespace NGitLab.Mock.Clients; internal sealed class ReleaseClient : ClientBase, IReleaseClient { - private readonly int _projectId; + private readonly long _projectId; public ReleaseClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/ReleaseLinkClient.cs b/NGitLab.Mock/Clients/ReleaseLinkClient.cs index 469ff781..03340fb8 100644 --- a/NGitLab.Mock/Clients/ReleaseLinkClient.cs +++ b/NGitLab.Mock/Clients/ReleaseLinkClient.cs @@ -6,17 +6,17 @@ namespace NGitLab.Mock.Clients; internal sealed class ReleaseLinkClient : ClientBase, IReleaseLinkClient { - private readonly int _projectId; + private readonly long _projectId; private readonly string _tagName; - public ReleaseLinkClient(ClientContext context, int projectId, string tagName) + public ReleaseLinkClient(ClientContext context, long projectId, string tagName) : base(context) { _projectId = projectId; _tagName = tagName; } - public ReleaseLink this[int id] => throw new NotImplementedException(); + public ReleaseLink this[long id] => throw new NotImplementedException(); public IEnumerable All => throw new NotImplementedException(); @@ -25,12 +25,12 @@ public ReleaseLink Create(ReleaseLinkCreate data) throw new NotImplementedException(); } - public void Delete(int id) + public void Delete(long id) { throw new NotImplementedException(); } - public ReleaseLink Update(int id, ReleaseLinkUpdate data) + public ReleaseLink Update(long id, ReleaseLinkUpdate data) { throw new NotImplementedException(); } diff --git a/NGitLab.Mock/Clients/RepositoryClient.cs b/NGitLab.Mock/Clients/RepositoryClient.cs index 9fc52d8b..0f16b047 100644 --- a/NGitLab.Mock/Clients/RepositoryClient.cs +++ b/NGitLab.Mock/Clients/RepositoryClient.cs @@ -9,7 +9,7 @@ namespace NGitLab.Mock.Clients; internal sealed class RepositoryClient : ClientBase, IRepositoryClient { - private readonly int _projectId; + private readonly long _projectId; public RepositoryClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Clients/RunnerClient.cs b/NGitLab.Mock/Clients/RunnerClient.cs index ea4b4382..135e3384 100644 --- a/NGitLab.Mock/Clients/RunnerClient.cs +++ b/NGitLab.Mock/Clients/RunnerClient.cs @@ -45,7 +45,7 @@ public RunnerClient(ClientContext context) { } - public Models.Runner this[int id] + public Models.Runner this[long id] { get { @@ -59,7 +59,7 @@ public Models.Runner this[int id] public void Delete(Models.Runner runner) => Delete(runner.Id); - public void Delete(int runnerId) + public void Delete(long runnerId) { using (Context.BeginOperationScope()) { @@ -87,14 +87,13 @@ public void Delete(int runnerId) } } - public Models.Runner Update(int runnerId, RunnerUpdate runnerUpdate) + public Models.Runner Update(long runnerId, RunnerUpdate runnerUpdate) { using (Context.BeginOperationScope()) { var runner = this[runnerId] ?? throw new GitLabNotFoundException(); var runnerOnServer = GetServerRunner(runnerId); - runnerOnServer.Active = runnerUpdate.IsActive() ?? runnerOnServer.IsActive(); runnerOnServer.Paused = runnerUpdate.Paused ?? runnerOnServer.Paused; runnerOnServer.TagList = runnerUpdate.TagList ?? runnerOnServer.TagList; runnerOnServer.Description = !string.IsNullOrEmpty(runnerUpdate.Description) ? runnerUpdate.Description : runnerOnServer.Description; @@ -105,7 +104,7 @@ public Models.Runner Update(int runnerId, RunnerUpdate runnerUpdate) } } - public IEnumerable OfGroup(int groupId) + public IEnumerable OfGroup(long groupId) { using (Context.BeginOperationScope()) { @@ -114,12 +113,12 @@ public Models.Runner Update(int runnerId, RunnerUpdate runnerUpdate) } } - public GitLabCollectionResponse OfGroupAsync(int groupId) + public GitLabCollectionResponse OfGroupAsync(long groupId) { return GitLabCollectionResponse.Create(OfGroup(groupId)); } - public IEnumerable OfProject(int projectId) + public IEnumerable OfProject(long projectId) { using (Context.BeginOperationScope()) { @@ -128,23 +127,18 @@ public Models.Runner Update(int runnerId, RunnerUpdate runnerUpdate) } } - public GitLabCollectionResponse OfProjectAsync(int projectId) + public GitLabCollectionResponse OfProjectAsync(long projectId) { return GitLabCollectionResponse.Create(OfProject(projectId)); } - public IEnumerable GetJobs(int runnerId, JobScope jobScope) - { - throw new NotImplementedException(); - } - - public IEnumerable GetJobs(int runnerId, JobStatus? status = null) + public IEnumerable GetJobs(long runnerId, JobStatus? status = null) { throw new NotImplementedException(); } [Obsolete("Use OfProject() or OfGroup() instead")] - IEnumerable IRunnerClient.GetAvailableRunners(int projectId) + IEnumerable IRunnerClient.GetAvailableRunners(long projectId) { return OfProject(projectId); } @@ -154,7 +148,7 @@ public Models.Runner Update(int runnerId, RunnerUpdate runnerUpdate) throw new NotImplementedException(); } - public Models.Runner EnableRunner(int projectId, RunnerId runnerId) + public Models.Runner EnableRunner(long projectId, RunnerId runnerId) { using (Context.BeginOperationScope()) { @@ -174,13 +168,13 @@ public Models.Runner EnableRunner(int projectId, RunnerId runnerId) } [SuppressMessage("Design", "MA0042:Do not use blocking calls in an async method", Justification = "Would be an infinite recursion")] - public async Task EnableRunnerAsync(int projectId, RunnerId runnerId, CancellationToken cancellationToken = default) + public async Task EnableRunnerAsync(long projectId, RunnerId runnerId, CancellationToken cancellationToken = default) { await Task.Yield(); return EnableRunner(projectId, runnerId); } - public void DisableRunner(int projectId, RunnerId runnerId) + public void DisableRunner(long projectId, RunnerId runnerId) { using (Context.BeginOperationScope()) { @@ -205,7 +199,7 @@ private IEnumerable GetOwnedRunners() return runners; } - private Runner GetServerRunner(int id) + private Runner GetServerRunner(long id) { return GetOwnedRunners().FirstOrDefault(runner => runner.Id == id) ?? throw new GitLabNotFoundException(); } @@ -224,7 +218,7 @@ public Models.Runner Register(RunnerRegister request) var group = Server.AllGroups.SingleOrDefault(g => string.Equals(g.RunnersToken, request.Token, StringComparison.Ordinal)); if (group != null) { - var runner = group.AddRunner(request.Description, active: !request.Paused ?? true, paused: request.Paused ?? false, tagList: request.TagList, runUntagged: request.RunUntagged ?? false, locked: request.Locked ?? true); + var runner = group.AddRunner(request.Description, paused: request.Paused ?? false, tagList: request.TagList, runUntagged: request.RunUntagged ?? false, locked: request.Locked ?? true); return runner.ToClientRunner(Context.User); } diff --git a/NGitLab.Mock/Clients/SnippetClient.cs b/NGitLab.Mock/Clients/SnippetClient.cs index b156bc44..852b4045 100644 --- a/NGitLab.Mock/Clients/SnippetClient.cs +++ b/NGitLab.Mock/Clients/SnippetClient.cs @@ -36,27 +36,27 @@ public void Update(SnippetProjectUpdate snippet) throw new NotImplementedException(); } - public void Delete(int snippetId) + public void Delete(long snippetId) { throw new NotImplementedException(); } - public void Delete(int projectId, int snippetId) + public void Delete(long projectId, long snippetId) { throw new NotImplementedException(); } - public IEnumerable ForProject(int projectId) + public IEnumerable ForProject(long projectId) { throw new NotImplementedException(); } - public Snippet Get(int projectId, int snippetId) + public Snippet Get(long projectId, long snippetId) { throw new NotImplementedException(); } - public void GetContent(int projectId, int snippetId, Action parser) + public void GetContent(long projectId, long snippetId, Action parser) { throw new NotImplementedException(); } diff --git a/NGitLab.Mock/Clients/SystemHookClient.cs b/NGitLab.Mock/Clients/SystemHookClient.cs index f8d8f5df..909127f6 100644 --- a/NGitLab.Mock/Clients/SystemHookClient.cs +++ b/NGitLab.Mock/Clients/SystemHookClient.cs @@ -12,7 +12,7 @@ public SystemHookClient(ClientContext context) { } - public Models.SystemHook this[int hookId] + public Models.SystemHook this[long hookId] { get { @@ -61,7 +61,7 @@ public Models.SystemHook Create(SystemHookUpsert hook) } } - public void Delete(int hookId) + public void Delete(long hookId) { AssertIsAdmin(); using (Context.BeginOperationScope()) diff --git a/NGitLab.Mock/Clients/TagClient.cs b/NGitLab.Mock/Clients/TagClient.cs index 5f6f978f..30c10def 100644 --- a/NGitLab.Mock/Clients/TagClient.cs +++ b/NGitLab.Mock/Clients/TagClient.cs @@ -12,9 +12,9 @@ namespace NGitLab.Mock.Clients; internal sealed class TagClient : ClientBase, ITagClient { - private readonly int _projectId; + private readonly long _projectId; - public TagClient(ClientContext context, int projectId) + public TagClient(ClientContext context, long projectId) : base(context) { _projectId = projectId; @@ -36,7 +36,7 @@ public Tag Create(TagCreate tag) using (Context.BeginOperationScope()) { var project = GetProject(_projectId, ProjectPermission.Contribute); - var createdTag = project.Repository.CreateTag(Context.User, tag.Name, tag.Ref, tag.Message, tag.ReleaseDescription); + var createdTag = project.Repository.CreateTag(Context.User, tag.Name, tag.Ref, tag.Message); return ToTagClient(createdTag); } diff --git a/NGitLab.Mock/Clients/TriggerClient.cs b/NGitLab.Mock/Clients/TriggerClient.cs index 437b7021..f34ae30e 100644 --- a/NGitLab.Mock/Clients/TriggerClient.cs +++ b/NGitLab.Mock/Clients/TriggerClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class TriggerClient : ClientBase, ITriggerClient { - private readonly int _projectId; + private readonly long _projectId; public TriggerClient(ClientContext context, ProjectId projectId) : base(context) @@ -14,7 +14,7 @@ public TriggerClient(ClientContext context, ProjectId projectId) _projectId = Server.AllProjects.FindProject(projectId.ValueAsString()).Id; } - public Trigger this[int id] => throw new NotImplementedException(); + public Trigger this[long id] => throw new NotImplementedException(); public IEnumerable All => throw new NotImplementedException(); diff --git a/NGitLab.Mock/Clients/UserClient.cs b/NGitLab.Mock/Clients/UserClient.cs index 89fde676..2fc2dc89 100644 --- a/NGitLab.Mock/Clients/UserClient.cs +++ b/NGitLab.Mock/Clients/UserClient.cs @@ -14,7 +14,7 @@ public UserClient(ClientContext context) { } - public Models.User this[int id] + public Models.User this[long id] { get { @@ -83,7 +83,7 @@ public async Task CreateTokenAsync(UserTokenCreate tokenRequest, Canc return CreateToken(tokenRequest); } - public void Delete(int id) + public void Delete(long id) { using (Context.BeginOperationScope()) { @@ -98,7 +98,7 @@ public void Delete(int id) } } - public void Activate(int id) + public void Activate(long id) { using (Context.BeginOperationScope()) { @@ -113,7 +113,7 @@ public void Activate(int id) } } - public void Deactivate(int id) + public void Deactivate(long id) { using (Context.BeginOperationScope()) { @@ -154,12 +154,12 @@ public void Deactivate(int id) } } - public ISshKeyClient SShKeys(int userId) + public ISshKeyClient SShKeys(long userId) { throw new NotImplementedException(); } - public Models.User Update(int id, UserUpsert userUpsert) + public Models.User Update(long id, UserUpsert userUpsert) { using (Context.BeginOperationScope()) { @@ -178,7 +178,7 @@ public Models.User Update(int id, UserUpsert userUpsert) } } - public async Task GetByIdAsync(int id, CancellationToken cancellationToken = default) + public async Task GetByIdAsync(long id, CancellationToken cancellationToken = default) { await Task.Yield(); return this[id]; diff --git a/NGitLab.Mock/Clients/WikiClient.cs b/NGitLab.Mock/Clients/WikiClient.cs index f1a96e96..842b1d1b 100644 --- a/NGitLab.Mock/Clients/WikiClient.cs +++ b/NGitLab.Mock/Clients/WikiClient.cs @@ -6,7 +6,7 @@ namespace NGitLab.Mock.Clients; internal sealed class WikiClient : ClientBase, IWikiClient { - private readonly int _projectId; + private readonly long _projectId; public WikiClient(ClientContext context, ProjectId projectId) : base(context) diff --git a/NGitLab.Mock/Config/ConfigSerializer.cs b/NGitLab.Mock/Config/ConfigSerializer.cs index b0f5566b..22a659d5 100644 --- a/NGitLab.Mock/Config/ConfigSerializer.cs +++ b/NGitLab.Mock/Config/ConfigSerializer.cs @@ -193,11 +193,11 @@ public static bool TryConvert(Type type, object valueObj, ref object value) return false; } - if (type == typeof(int)) + if (type == typeof(long)) { - if (valueObj is string valueString && int.TryParse(valueString, out var valueInt)) + if (valueObj is string valueString && long.TryParse(valueString, out var valueLong)) { - value = valueInt; + value = valueLong; return true; } diff --git a/NGitLab.Mock/Config/GitLabHelpers.cs b/NGitLab.Mock/Config/GitLabHelpers.cs index aa3b3ca4..5b68c7e9 100644 --- a/NGitLab.Mock/Config/GitLabHelpers.cs +++ b/NGitLab.Mock/Config/GitLabHelpers.cs @@ -196,7 +196,7 @@ public static GitLabConfig WithGroup(this GitLabConfig config, string? name, Act /// Visibility. /// Define default user as maintainer. /// Configuration method - public static GitLabConfig WithGroup(this GitLabConfig config, string? name = null, int id = default, string? @namespace = null, string? description = null, VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, Action? configure = null) + public static GitLabConfig WithGroup(this GitLabConfig config, string? name = null, long id = default, string? @namespace = null, string? description = null, VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, Action? configure = null) { return WithGroup(config, name, group => { @@ -231,7 +231,7 @@ public static GitLabConfig WithGroup(this GitLabConfig config, string? name = nu /// Optional visibility. /// Optionally define default user as maintainer. /// Optional configuration method - public static GitLabConfig WithGroupOfFullPath(this GitLabConfig config, string fullPath, string? name = null, int id = default, string? description = null, VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, Action? configure = null) + public static GitLabConfig WithGroupOfFullPath(this GitLabConfig config, string fullPath, string? name = null, long id = default, string? description = null, VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, Action? configure = null) { if (string.IsNullOrWhiteSpace(fullPath)) throw new ArgumentNullException(nameof(fullPath)); @@ -283,7 +283,7 @@ public static GitLabConfig WithProject(this GitLabConfig config, string? name, A /// Path where to clone repository after server resolving /// Parameters passed to clone command /// Configuration method - public static GitLabConfig WithProject(this GitLabConfig config, string? name = null, int id = default, string? @namespace = null, string? description = null, + public static GitLabConfig WithProject(this GitLabConfig config, string? name = null, long id = default, string? @namespace = null, string? description = null, string? defaultBranch = null, VisibilityLevel visibility = VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string? clonePath = null, string? cloneParameters = null, Action? configure = null) { @@ -336,7 +336,7 @@ public static GitLabConfig WithProject(this GitLabConfig config, string? name = /// Path where to clone repository after server resolving /// Parameters passed to clone command /// Configuration method - public static GitLabConfig WithProjectOfFullPath(this GitLabConfig config, string? fullPath, string? name = null, int id = default, string? description = null, + public static GitLabConfig WithProjectOfFullPath(this GitLabConfig config, string? fullPath, string? name = null, long id = default, string? description = null, string? defaultBranch = null, VisibilityLevel visibility = VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string? clonePath = null, string? cloneParameters = null, Action? configure = null) { @@ -575,7 +575,7 @@ public static GitLabProject WithIssue(this GitLabProject project, string? title, /// Close date time. /// Labels names. /// Configuration method - public static GitLabProject WithIssue(this GitLabProject project, string? title = null, int id = default, string? description = null, string? author = null, string? assignee = null, string? milestone = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, IEnumerable? labels = null, Action? configure = null) + public static GitLabProject WithIssue(this GitLabProject project, string? title = null, long id = default, string? description = null, string? author = null, string? assignee = null, string? milestone = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, IEnumerable? labels = null, Action? configure = null) { return WithIssue(project, title, author, issue => { @@ -674,7 +674,7 @@ public static GitLabProject WithMergeRequest(this GitLabProject project, string? /// Labels names. /// Milestone name. /// Configuration method - public static GitLabProject WithMergeRequest(this GitLabProject project, string? sourceBranch = null, string? title = null, int id = default, string? targetBranch = null, string? description = null, string? author = null, string? assignee = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, DateTime? mergedAt = null, IEnumerable? approvers = null, IEnumerable? labels = null, string? milestone = null, Action? configure = null) + public static GitLabProject WithMergeRequest(this GitLabProject project, string? sourceBranch = null, string? title = null, long id = default, string? targetBranch = null, string? description = null, string? author = null, string? assignee = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, DateTime? mergedAt = null, IEnumerable? approvers = null, IEnumerable? labels = null, string? milestone = null, Action? configure = null) { return WithMergeRequest(project, sourceBranch, title, author, mergeRequest => { @@ -849,7 +849,7 @@ public static GitLabGroup WithMilestone(this GitLabGroup group, string title, Ac /// Update date time. /// Close date time. /// Configuration method - public static GitLabGroup WithMilestone(this GitLabGroup group, string title, int id = default, string? description = null, DateTime? dueDate = null, DateTime? startDate = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, Action? configure = null) + public static GitLabGroup WithMilestone(this GitLabGroup group, string title, long id = default, string? description = null, DateTime? dueDate = null, DateTime? startDate = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, Action? configure = null) { return WithMilestone(group, title, milestone => { @@ -900,7 +900,7 @@ public static GitLabProject WithMilestone(this GitLabProject project, string tit /// Update date time. /// Close date time. /// Configuration method - public static GitLabProject WithMilestone(this GitLabProject project, string title, int id = default, string? description = null, DateTime? dueDate = null, DateTime? startDate = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, Action? configure = null) + public static GitLabProject WithMilestone(this GitLabProject project, string title, long id = default, string? description = null, DateTime? dueDate = null, DateTime? startDate = null, DateTime? createdAt = null, DateTime? updatedAt = null, DateTime? closedAt = null, Action? configure = null) { return WithMilestone(project, title, milestone => { @@ -980,7 +980,7 @@ private static T WithComment(this T obj, string? message, ActionIndicates if comment is resolvable. /// Indicates if comment is resolved. /// Configuration method - public static GitLabIssue WithComment(this GitLabIssue issue, string? message = null, int id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) + public static GitLabIssue WithComment(this GitLabIssue issue, string? message = null, long id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) { return WithComment(issue, message, id, author, system, createdAt, updatedAt, thread, resolvable, resolved, configure); } @@ -999,12 +999,12 @@ public static GitLabIssue WithComment(this GitLabIssue issue, string? message = /// Indicates if comment is resolvable. /// Indicates if comment is resolved. /// Configuration method - public static GitLabMergeRequest WithComment(this GitLabMergeRequest mergeRequest, string? message = null, int id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) + public static GitLabMergeRequest WithComment(this GitLabMergeRequest mergeRequest, string? message = null, long id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) { return WithComment(mergeRequest, message, id, author, system, createdAt, updatedAt, thread, resolvable, resolved, configure); } - private static T WithComment(this T obj, string? message, int id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) + private static T WithComment(this T obj, string? message, long id = default, string? author = null, bool system = false, DateTime? createdAt = null, DateTime? updatedAt = null, string? thread = null, bool resolvable = false, bool resolved = false, Action? configure = null) where T : GitLabObject { return WithComment(obj, message, comment => @@ -1034,7 +1034,7 @@ private static T WithComment(this T obj, string? message, int id = default, s /// Author username (required if default user not defined) /// Creation date time. /// Update date time. - public static GitLabIssue WithSystemComment(this GitLabIssue issue, string? message = null, string? innerHtml = null, int id = default, string? author = null, DateTime? createdAt = null, DateTime? updatedAt = null) + public static GitLabIssue WithSystemComment(this GitLabIssue issue, string? message = null, string? innerHtml = null, long id = default, string? author = null, DateTime? createdAt = null, DateTime? updatedAt = null) { return WithSystemComment(issue, message, innerHtml, id, author, createdAt, updatedAt); } @@ -1049,12 +1049,12 @@ public static GitLabIssue WithSystemComment(this GitLabIssue issue, string? mess /// Author username (required if default user not defined) /// Creation date time. /// Update date time. - public static GitLabMergeRequest WithSystemComment(this GitLabMergeRequest mergeRequest, string? message = null, string? innerHtml = null, int id = default, string? author = null, DateTime? createdAt = null, DateTime? updatedAt = null) + public static GitLabMergeRequest WithSystemComment(this GitLabMergeRequest mergeRequest, string? message = null, string? innerHtml = null, long id = default, string? author = null, DateTime? createdAt = null, DateTime? updatedAt = null) { return WithSystemComment(mergeRequest, message, innerHtml, id, author, createdAt, updatedAt); } - private static T WithSystemComment(this T obj, string? message, string? innerHtml, int id, string? author, DateTime? createdAt, DateTime? updatedAt) + private static T WithSystemComment(this T obj, string? message, string? innerHtml, long id, string? author, DateTime? createdAt, DateTime? updatedAt) where T : GitLabObject { var body = innerHtml == null ? message : $"{message}\n\n{innerHtml}"; diff --git a/NGitLab.Mock/Config/GitLabObject.cs b/NGitLab.Mock/Config/GitLabObject.cs index a6f65df7..c8132d53 100644 --- a/NGitLab.Mock/Config/GitLabObject.cs +++ b/NGitLab.Mock/Config/GitLabObject.cs @@ -8,7 +8,7 @@ protected internal GitLabObject() { } - public int Id { get; set; } + public long Id { get; set; } [YamlIgnore] public object ParentObject { get; internal set; } diff --git a/NGitLab.Mock/Event.cs b/NGitLab.Mock/Event.cs index cf1cdd08..41ca7c8b 100644 --- a/NGitLab.Mock/Event.cs +++ b/NGitLab.Mock/Event.cs @@ -5,11 +5,11 @@ namespace NGitLab.Mock; public sealed class Event : GitLabObject { - public int Id { get; set; } + public long Id { get; set; } public string Title { get; set; } - public int ProjectId { get; set; } + public long ProjectId { get; set; } public DynamicEnum Action { get; set; } @@ -21,7 +21,7 @@ public sealed class Event : GitLabObject public string TargetTitle { get; set; } - public int AuthorId { get; set; } + public long AuthorId { get; set; } public string AuthorUserName { get; set; } diff --git a/NGitLab.Mock/EventCollection.cs b/NGitLab.Mock/EventCollection.cs index 89182cfe..76ddccde 100644 --- a/NGitLab.Mock/EventCollection.cs +++ b/NGitLab.Mock/EventCollection.cs @@ -25,7 +25,7 @@ public override void Add(Event item) base.Add(item); } - internal IEnumerable Get(EventQuery query, int? userId, int? projectId) + internal IEnumerable Get(EventQuery query, long? userId, long? projectId) { var events = this.AsQueryable(); @@ -68,7 +68,7 @@ internal IEnumerable Get(EventQuery query, int? userId, int? projectId) return events; } - private int GetNewId() + private long GetNewId() { return this.Select(evt => evt.Id).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/GitLabServer.cs b/NGitLab.Mock/GitLabServer.cs index 753e4cf9..98ab9213 100644 --- a/NGitLab.Mock/GitLabServer.cs +++ b/NGitLab.Mock/GitLabServer.cs @@ -13,23 +13,23 @@ namespace NGitLab.Mock; public sealed class GitLabServer : GitLabObject, IDisposable { // Setting to a 'magic' high value to avoid having equalities between IDs and IiDs - private int _lastProjectId = 10000; - private int _lastGroupId = 10000; - private int _lastMergeRequestId = 10000; - private int _lastRunnerId = 10000; - private int _lastIssueId = 10000; - private int _lastMilestoneId = 10000; - private int _lastPipelineId = 10000; - private int _lastPipelineScheduleId = 10000; - private int _lastJobId = 10000; - private int _lastBadgeId = 10000; - private int _lastLabelId = 10000; - private int _lastProtectedBranchId = 10000; - private int _lastResourceLabelEventId = 10000; - private int _lastResourceMilestoneEventId = 10000; - private int _lastResourceStateEventId = 10000; - private int _lastTokenId = 10000; - private int _lastRegistrationTokenId = 10000; + private long _lastProjectId = 10000; + private long _lastGroupId = 10000; + private long _lastMergeRequestId = 10000; + private long _lastRunnerId = 10000; + private long _lastIssueId = 10000; + private long _lastMilestoneId = 10000; + private long _lastPipelineId = 10000; + private long _lastPipelineScheduleId = 10000; + private long _lastJobId = 10000; + private long _lastBadgeId = 10000; + private long _lastLabelId = 10000; + private long _lastProtectedBranchId = 10000; + private long _lastResourceLabelEventId = 10000; + private long _lastResourceMilestoneEventId = 10000; + private long _lastResourceStateEventId = 10000; + private long _lastTokenId = 10000; + private long _lastRegistrationTokenId = 10000; public event EventHandler ClientOperation; @@ -105,35 +105,35 @@ public void Dispose() } } - internal int GetNewGroupId() => Interlocked.Increment(ref _lastGroupId); + internal long GetNewGroupId() => Interlocked.Increment(ref _lastGroupId); - internal int GetNewProjectId() => Interlocked.Increment(ref _lastProjectId); + internal long GetNewProjectId() => Interlocked.Increment(ref _lastProjectId); - internal int GetNewMergeRequestId() => Interlocked.Increment(ref _lastMergeRequestId); + internal long GetNewMergeRequestId() => Interlocked.Increment(ref _lastMergeRequestId); - internal int GetNewIssueId() => Interlocked.Increment(ref _lastIssueId); + internal long GetNewIssueId() => Interlocked.Increment(ref _lastIssueId); - internal int GetNewMilestoneId() => Interlocked.Increment(ref _lastMilestoneId); + internal long GetNewMilestoneId() => Interlocked.Increment(ref _lastMilestoneId); - internal int GetNewRunnerId() => Interlocked.Increment(ref _lastRunnerId); + internal long GetNewRunnerId() => Interlocked.Increment(ref _lastRunnerId); - internal int GetNewPipelineId() => Interlocked.Increment(ref _lastPipelineId); + internal long GetNewPipelineId() => Interlocked.Increment(ref _lastPipelineId); - internal int GetNewPipelineScheduleId() => Interlocked.Increment(ref _lastPipelineScheduleId); + internal long GetNewPipelineScheduleId() => Interlocked.Increment(ref _lastPipelineScheduleId); - internal int GetNewJobId() => Interlocked.Increment(ref _lastJobId); + internal long GetNewJobId() => Interlocked.Increment(ref _lastJobId); - internal int GetNewBadgeId() => Interlocked.Increment(ref _lastBadgeId); + internal long GetNewBadgeId() => Interlocked.Increment(ref _lastBadgeId); - internal int GetNewLabelId() => Interlocked.Increment(ref _lastLabelId); + internal long GetNewLabelId() => Interlocked.Increment(ref _lastLabelId); - internal int GetNewProtectedBranchId() => Interlocked.Increment(ref _lastProtectedBranchId); + internal long GetNewProtectedBranchId() => Interlocked.Increment(ref _lastProtectedBranchId); - internal int GetNewResourceLabelEventId() => Interlocked.Increment(ref _lastResourceLabelEventId); + internal long GetNewResourceLabelEventId() => Interlocked.Increment(ref _lastResourceLabelEventId); - internal int GetNewResourceMilestoneEventId() => Interlocked.Increment(ref _lastResourceMilestoneEventId); + internal long GetNewResourceMilestoneEventId() => Interlocked.Increment(ref _lastResourceMilestoneEventId); - internal int GetNewResourceStateEventId() => Interlocked.Increment(ref _lastResourceStateEventId); + internal long GetNewResourceStateEventId() => Interlocked.Increment(ref _lastResourceStateEventId); internal string GetNewRunnerToken() => MakeToken(Convert.ToString(Interlocked.Increment(ref _lastTokenId))); diff --git a/NGitLab.Mock/Group.cs b/NGitLab.Mock/Group.cs index 3d3f6a8f..4c23f0ad 100644 --- a/NGitLab.Mock/Group.cs +++ b/NGitLab.Mock/Group.cs @@ -36,7 +36,7 @@ public Group(User user) IsUserNamespace = true; } - public int Id { get; set; } + public long Id { get; set; } public string Name { @@ -249,14 +249,13 @@ public bool CanUserAddProject(User user) return accessLevel.HasValue && accessLevel.Value >= AccessLevel.Developer; } - public Runner AddRunner(string description, int id = default, string name = "gitlab-runner", bool paused = false, bool locked = true, bool isShared = false, bool runUntagged = false, string[] tagList = null, bool active = true) + public Runner AddRunner(string description, long id = default, string name = "gitlab-runner", bool paused = false, bool locked = true, bool isShared = false, bool runUntagged = false, string[] tagList = null) { var runner = new Runner { Name = name, Description = description, Paused = paused, - Active = active, Locked = locked, IsShared = isShared, IpAddress = "0.0.0.0", @@ -270,7 +269,7 @@ public Runner AddRunner(string description, int id = default, string name = "git return runner; } - public bool RemoveRunner(int runnerId) + public bool RemoveRunner(long runnerId) { return RegisteredRunners.Remove(runnerId); } diff --git a/NGitLab.Mock/GroupHook.cs b/NGitLab.Mock/GroupHook.cs index 6f318de6..f4becc21 100644 --- a/NGitLab.Mock/GroupHook.cs +++ b/NGitLab.Mock/GroupHook.cs @@ -6,7 +6,7 @@ public sealed class GroupHook : GitLabObject { public new Group Parent => (Group)base.Parent; - public int Id { get; internal set; } + public long Id { get; internal set; } public Uri Url { get; set; } diff --git a/NGitLab.Mock/GroupHookCollection.cs b/NGitLab.Mock/GroupHookCollection.cs index 92b60884..e4f55b36 100644 --- a/NGitLab.Mock/GroupHookCollection.cs +++ b/NGitLab.Mock/GroupHookCollection.cs @@ -23,7 +23,7 @@ public override void Add(GroupHook item) base.Add(item); } - private int GetNewId() + private long GetNewId() { return this.Select(hook => hook.Id).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/Issue.cs b/NGitLab.Mock/Issue.cs index 50f7ee06..e0c3a67c 100644 --- a/NGitLab.Mock/Issue.cs +++ b/NGitLab.Mock/Issue.cs @@ -9,11 +9,11 @@ public sealed class Issue : GitLabObject { public Project Project => (Project)Parent; - public int Id { get; set; } + public long Id { get; set; } - public int Iid { get; set; } + public long Iid { get; set; } - public int ProjectId => Project.Id; + public long ProjectId => Project.Id; public string Title { get; set; } diff --git a/NGitLab.Mock/IssueCollection.cs b/NGitLab.Mock/IssueCollection.cs index 0cd258e6..4d258cc8 100644 --- a/NGitLab.Mock/IssueCollection.cs +++ b/NGitLab.Mock/IssueCollection.cs @@ -10,7 +10,7 @@ public IssueCollection(GitLabObject container) { } - public Issue GetByIid(int issueId) + public Issue GetByIid(long issueId) { return this.FirstOrDefault(i => i.Iid == issueId); } @@ -37,7 +37,7 @@ public override void Add(Issue item) base.Add(item); } - private int GetNewIid() + private long GetNewIid() { return this.Select(i => i.Iid).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/Job.cs b/NGitLab.Mock/Job.cs index 6daecbe8..fd0f8f8e 100644 --- a/NGitLab.Mock/Job.cs +++ b/NGitLab.Mock/Job.cs @@ -8,7 +8,7 @@ public sealed class Job : GitLabObject { public string Name { get; set; } - public int Id { get; set; } + public long Id { get; set; } public string Ref { get; set; } diff --git a/NGitLab.Mock/JobCollection.cs b/NGitLab.Mock/JobCollection.cs index f8752fe5..f164c5d6 100644 --- a/NGitLab.Mock/JobCollection.cs +++ b/NGitLab.Mock/JobCollection.cs @@ -10,7 +10,7 @@ public JobCollection(GitLabObject parent) { } - public Job GetById(int id) + public Job GetById(long id) { return this.FirstOrDefault(job => job.Id == id); } diff --git a/NGitLab.Mock/Label.cs b/NGitLab.Mock/Label.cs index 93b6c496..254661b5 100644 --- a/NGitLab.Mock/Label.cs +++ b/NGitLab.Mock/Label.cs @@ -6,7 +6,7 @@ public sealed class Label : GitLabObject public Group Group => Parent as Group; - public int Id { get; set; } + public long Id { get; set; } public string Name { get; set; } diff --git a/NGitLab.Mock/LabelsCollection.cs b/NGitLab.Mock/LabelsCollection.cs index e474d7e4..cc98e904 100644 --- a/NGitLab.Mock/LabelsCollection.cs +++ b/NGitLab.Mock/LabelsCollection.cs @@ -10,7 +10,7 @@ public LabelsCollection(GitLabObject parent) { } - public Label GetById(int id) + public Label GetById(long id) { return this.FirstOrDefault(l => l.Id == id); } diff --git a/NGitLab.Mock/MergeRequest.cs b/NGitLab.Mock/MergeRequest.cs index a9a1b6ac..3b6950dd 100644 --- a/NGitLab.Mock/MergeRequest.cs +++ b/NGitLab.Mock/MergeRequest.cs @@ -30,9 +30,9 @@ public MergeRequest() public Project Project => (Project)Parent; - public int Id { get; internal set; } + public long Id { get; internal set; } - public int Iid { get; internal set; } + public long Iid { get; internal set; } public string Title { get; set; } diff --git a/NGitLab.Mock/MergeRequestCollection.cs b/NGitLab.Mock/MergeRequestCollection.cs index ac326488..4fd11ecc 100644 --- a/NGitLab.Mock/MergeRequestCollection.cs +++ b/NGitLab.Mock/MergeRequestCollection.cs @@ -12,7 +12,7 @@ public MergeRequestCollection(GitLabObject parent) { } - public MergeRequest GetByIid(int iid) + public MergeRequest GetByIid(long iid) { return this.FirstOrDefault(mr => mr.Iid == iid); } @@ -87,7 +87,7 @@ public MergeRequest Add(Project sourceProject, string sourceBranch, string targe return mergeRequest; } - private int GetNewIid() + private long GetNewIid() { return this.Select(mr => mr.Iid).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/MergeRequestComment.cs b/NGitLab.Mock/MergeRequestComment.cs index b3a4af48..95109a58 100644 --- a/NGitLab.Mock/MergeRequestComment.cs +++ b/NGitLab.Mock/MergeRequestComment.cs @@ -6,9 +6,9 @@ public sealed class MergeRequestComment : Note public override string NoteableType => "MergeRequest"; - public override int NoticableId => Parent.Id; + public override long NoticableId => Parent.Id; - public override int NoticableIid => Parent.Iid; + public override long NoticableIid => Parent.Iid; internal Models.MergeRequestComment ToMergeRequestCommentClient() { diff --git a/NGitLab.Mock/Milestone.cs b/NGitLab.Mock/Milestone.cs index 85090170..3c350384 100644 --- a/NGitLab.Mock/Milestone.cs +++ b/NGitLab.Mock/Milestone.cs @@ -9,9 +9,9 @@ public sealed class Milestone : GitLabObject public Group Group => Parent as Group; - public int Id { get; set; } + public long Id { get; set; } - public int Iid { get; set; } + public long Iid { get; set; } public string Title { get; set; } diff --git a/NGitLab.Mock/MilestoneCollection.cs b/NGitLab.Mock/MilestoneCollection.cs index cadf4b6f..458fe9e9 100644 --- a/NGitLab.Mock/MilestoneCollection.cs +++ b/NGitLab.Mock/MilestoneCollection.cs @@ -10,7 +10,7 @@ public MilestoneCollection(GitLabObject container) { } - public Milestone GetByIid(int iid) + public Milestone GetByIid(long iid) { return this.FirstOrDefault(i => i.Iid == iid); } @@ -37,7 +37,7 @@ public override void Add(Milestone item) base.Add(item); } - private int GetNewIid() + private long GetNewIid() { return this.Select(i => i.Iid).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/Note.cs b/NGitLab.Mock/Note.cs index 95ce9a88..9823d1f0 100644 --- a/NGitLab.Mock/Note.cs +++ b/NGitLab.Mock/Note.cs @@ -24,9 +24,9 @@ protected Note() public bool System { get; set; } - public abstract int NoticableId { get; } + public abstract long NoticableId { get; } - public abstract int NoticableIid { get; } + public abstract long NoticableIid { get; } public abstract string NoteableType { get; } diff --git a/NGitLab.Mock/Pipeline.cs b/NGitLab.Mock/Pipeline.cs index 87056b22..9bc331ea 100644 --- a/NGitLab.Mock/Pipeline.cs +++ b/NGitLab.Mock/Pipeline.cs @@ -16,9 +16,9 @@ public Pipeline(string @ref) internal bool IsDownStreamPipeline { get; set; } - public int Id { get; set; } + public long Id { get; set; } - public int ProjectId => Project?.Id ?? 0; + public long ProjectId => Project?.Id ?? 0; public JobStatus Status { get; set; } diff --git a/NGitLab.Mock/PipelineCollection.cs b/NGitLab.Mock/PipelineCollection.cs index 7d8c7ce8..23c16510 100644 --- a/NGitLab.Mock/PipelineCollection.cs +++ b/NGitLab.Mock/PipelineCollection.cs @@ -14,7 +14,7 @@ public PipelineCollection(GitLabObject parent) throw new ArgumentException("Parent must be a Project", nameof(parent)); } - public Pipeline GetById(int id) + public Pipeline GetById(long id) { return this.FirstOrDefault(pipeline => pipeline.Id == id); } diff --git a/NGitLab.Mock/PipelineSchedule.cs b/NGitLab.Mock/PipelineSchedule.cs index e3e7e922..82914d21 100644 --- a/NGitLab.Mock/PipelineSchedule.cs +++ b/NGitLab.Mock/PipelineSchedule.cs @@ -9,7 +9,7 @@ public sealed class PipelineSchedule : GitLabObject { public Project Project => (Project)Parent; - public int Id { get; set; } + public long Id { get; set; } public string Description { get; set; } diff --git a/NGitLab.Mock/PipelineScheduleCollection.cs b/NGitLab.Mock/PipelineScheduleCollection.cs index 3eaa0fc3..9ae8f0c4 100644 --- a/NGitLab.Mock/PipelineScheduleCollection.cs +++ b/NGitLab.Mock/PipelineScheduleCollection.cs @@ -13,7 +13,7 @@ public PipelineScheduleCollection(Project project) _project = project; } - public PipelineSchedule GetById(int id) + public PipelineSchedule GetById(long id) { return this.FirstOrDefault(x => x.Id == id); } diff --git a/NGitLab.Mock/Project.cs b/NGitLab.Mock/Project.cs index ba77de96..399d7d3f 100644 --- a/NGitLab.Mock/Project.cs +++ b/NGitLab.Mock/Project.cs @@ -43,7 +43,7 @@ public Project(string name, string path) ApprovalsBeforeMerge = 0; } - public int Id { get; set; } + public long Id { get; set; } public string Name { get; set; } @@ -99,7 +99,7 @@ public string[] Tags public bool Mirror { get; set; } - public int MirrorUserId { get; set; } + public long MirrorUserId { get; set; } public bool MirrorTriggerBuilds { get; set; } @@ -361,18 +361,18 @@ public MergeRequest CreateMergeRequest(User user, string title, string descripti return mr; } - public bool RemoveRunner(int runnerId) + public bool RemoveRunner(long runnerId) { return RegisteredRunners.Remove(runnerId); } - public Runner AddRunner(string name, string description, bool active, bool locked, bool isShared, bool runUntagged, int id) + public Runner AddRunner(string name, string description, bool paused, bool locked, bool isShared, bool runUntagged, long id) { var runner = new Runner { Name = name, Description = description, - Active = active, + Paused = paused, Locked = locked, IsShared = isShared, IpAddress = "0.0.0.0", @@ -382,7 +382,7 @@ public Runner AddRunner(string name, string description, bool active, bool locke }; RegisteredRunners.Add(runner); - if (active) + if (!paused) { EnabledRunners.Add(new RunnerRef(runner)); } diff --git a/NGitLab.Mock/ProjectHook.cs b/NGitLab.Mock/ProjectHook.cs index f38dde09..a5a558c2 100644 --- a/NGitLab.Mock/ProjectHook.cs +++ b/NGitLab.Mock/ProjectHook.cs @@ -6,7 +6,7 @@ public sealed class ProjectHook : GitLabObject { public new Project Parent => (Project)base.Parent; - public int Id { get; internal set; } + public long Id { get; internal set; } public Uri Url { get; set; } diff --git a/NGitLab.Mock/ProjectHookCollection.cs b/NGitLab.Mock/ProjectHookCollection.cs index 04a25f61..192a891d 100644 --- a/NGitLab.Mock/ProjectHookCollection.cs +++ b/NGitLab.Mock/ProjectHookCollection.cs @@ -23,7 +23,7 @@ public override void Add(ProjectHook item) base.Add(item); } - private int GetNewId() + private long GetNewId() { return this.Select(hook => hook.Id).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/ProjectIssueNote.cs b/NGitLab.Mock/ProjectIssueNote.cs index cd0d525b..0266291e 100644 --- a/NGitLab.Mock/ProjectIssueNote.cs +++ b/NGitLab.Mock/ProjectIssueNote.cs @@ -6,9 +6,9 @@ public sealed class ProjectIssueNote : Note public override string NoteableType => "Issue"; - public override int NoticableId => Parent.Id; + public override long NoticableId => Parent.Id; - public override int NoticableIid => Parent.Iid; + public override long NoticableIid => Parent.Iid; internal Models.ProjectIssueNote ToProjectIssueNote() { diff --git a/NGitLab.Mock/PublicAPI.Unshipped.txt b/NGitLab.Mock/PublicAPI.Unshipped.txt index 6690dbda..fb7674b4 100644 --- a/NGitLab.Mock/PublicAPI.Unshipped.txt +++ b/NGitLab.Mock/PublicAPI.Unshipped.txt @@ -1,10 +1,10 @@ abstract NGitLab.Mock.File.Content.get -> byte[] abstract NGitLab.Mock.Note.NoteableType.get -> string -abstract NGitLab.Mock.Note.NoticableId.get -> int -abstract NGitLab.Mock.Note.NoticableIid.get -> int +abstract NGitLab.Mock.Note.NoticableId.get -> long +abstract NGitLab.Mock.Note.NoticableIid.get -> long NGitLab.Mock.Badge NGitLab.Mock.Badge.Badge() -> void -NGitLab.Mock.Badge.Id.get -> int +NGitLab.Mock.Badge.Id.get -> long NGitLab.Mock.Badge.Id.set -> void NGitLab.Mock.Badge.ImageUrl.get -> string NGitLab.Mock.Badge.ImageUrl.set -> void @@ -19,7 +19,7 @@ NGitLab.Mock.Badge.ToBadgeModel() -> NGitLab.Models.Badge NGitLab.Mock.BadgeCollection NGitLab.Mock.BadgeCollection.Add(string linkUrl, string imageUrl) -> NGitLab.Mock.Badge NGitLab.Mock.BadgeCollection.BadgeCollection(NGitLab.Mock.GitLabObject parent) -> void -NGitLab.Mock.BadgeCollection.GetById(int id) -> NGitLab.Mock.Badge +NGitLab.Mock.BadgeCollection.GetById(long id) -> NGitLab.Mock.Badge NGitLab.Mock.Change NGitLab.Mock.Change.AMode.get -> long NGitLab.Mock.Change.AMode.set -> void @@ -277,7 +277,7 @@ NGitLab.Mock.Config.GitLabMilestone.UpdatedAt.set -> void NGitLab.Mock.Config.GitLabMilestonesCollection NGitLab.Mock.Config.GitLabObject NGitLab.Mock.Config.GitLabObject.GitLabObject() -> void -NGitLab.Mock.Config.GitLabObject.Id.get -> int +NGitLab.Mock.Config.GitLabObject.Id.get -> long NGitLab.Mock.Config.GitLabObject.Id.set -> void NGitLab.Mock.Config.GitLabObject.ParentObject.get -> object NGitLab.Mock.Config.GitLabObject @@ -367,18 +367,18 @@ NGitLab.Mock.EffectiveUserPermission.User.get -> NGitLab.Mock.User NGitLab.Mock.Event NGitLab.Mock.Event.Action.get -> NGitLab.DynamicEnum NGitLab.Mock.Event.Action.set -> void -NGitLab.Mock.Event.AuthorId.get -> int +NGitLab.Mock.Event.AuthorId.get -> long NGitLab.Mock.Event.AuthorId.set -> void NGitLab.Mock.Event.AuthorUserName.get -> string NGitLab.Mock.Event.AuthorUserName.set -> void NGitLab.Mock.Event.CreatedAt.get -> System.DateTime NGitLab.Mock.Event.CreatedAt.set -> void NGitLab.Mock.Event.Event() -> void -NGitLab.Mock.Event.Id.get -> int +NGitLab.Mock.Event.Id.get -> long NGitLab.Mock.Event.Id.set -> void NGitLab.Mock.Event.Note.get -> NGitLab.Mock.Note NGitLab.Mock.Event.Note.set -> void -NGitLab.Mock.Event.ProjectId.get -> int +NGitLab.Mock.Event.ProjectId.get -> long NGitLab.Mock.Event.ProjectId.set -> void NGitLab.Mock.Event.PushData.get -> NGitLab.Models.PushData NGitLab.Mock.Event.PushData.set -> void @@ -429,7 +429,7 @@ NGitLab.Mock.GitLabServer.Users.get -> NGitLab.Mock.UserCollection NGitLab.Mock.GitLabServer.Version.get -> NGitLab.Models.GitLabVersion NGitLab.Mock.GitLabServer.Version.set -> void NGitLab.Mock.Group -NGitLab.Mock.Group.AddRunner(string description, int id = 0, string name = "gitlab-runner", bool paused = false, bool locked = true, bool isShared = false, bool runUntagged = false, string[] tagList = null, bool active = true) -> NGitLab.Mock.Runner +NGitLab.Mock.Group.AddRunner(string description, long id = 0, string name = "gitlab-runner", bool paused = false, bool locked = true, bool isShared = false, bool runUntagged = false, string[] tagList = null) -> NGitLab.Mock.Runner NGitLab.Mock.Group.AllProjects.get -> System.Collections.Generic.IEnumerable NGitLab.Mock.Group.Badges.get -> NGitLab.Mock.BadgeCollection NGitLab.Mock.Group.CanUserAddGroup(NGitLab.Mock.User user) -> bool @@ -453,7 +453,7 @@ NGitLab.Mock.Group.Group(NGitLab.Mock.User user) -> void NGitLab.Mock.Group.Group(string name) -> void NGitLab.Mock.Group.Groups.get -> NGitLab.Mock.GroupCollection NGitLab.Mock.Group.Hooks.get -> NGitLab.Mock.GroupHookCollection -NGitLab.Mock.Group.Id.get -> int +NGitLab.Mock.Group.Id.get -> long NGitLab.Mock.Group.Id.set -> void NGitLab.Mock.Group.IsUserNamespace.get -> bool NGitLab.Mock.Group.IsUserOwner(NGitLab.Mock.User user) -> bool @@ -471,7 +471,7 @@ NGitLab.Mock.Group.PathWithNameSpace.get -> string NGitLab.Mock.Group.Permissions.get -> NGitLab.Mock.PermissionCollection NGitLab.Mock.Group.Projects.get -> NGitLab.Mock.ProjectCollection NGitLab.Mock.Group.RegisteredRunners.get -> NGitLab.Mock.RunnerCollection -NGitLab.Mock.Group.RemoveRunner(int runnerId) -> bool +NGitLab.Mock.Group.RemoveRunner(long runnerId) -> bool NGitLab.Mock.Group.RequestAccessEnabled.get -> bool NGitLab.Mock.Group.RequestAccessEnabled.set -> void NGitLab.Mock.Group.RunnersToken.get -> string @@ -489,7 +489,7 @@ NGitLab.Mock.GroupHook.CreatedAt.set -> void NGitLab.Mock.GroupHook.EnableSslVerification.get -> bool NGitLab.Mock.GroupHook.EnableSslVerification.set -> void NGitLab.Mock.GroupHook.GroupHook() -> void -NGitLab.Mock.GroupHook.Id.get -> int +NGitLab.Mock.GroupHook.Id.get -> long NGitLab.Mock.GroupHook.IssuesEvents.get -> bool NGitLab.Mock.GroupHook.IssuesEvents.set -> void NGitLab.Mock.GroupHook.JobEvents.get -> bool @@ -530,9 +530,9 @@ NGitLab.Mock.Issue.CreatedAt.get -> System.DateTimeOffset NGitLab.Mock.Issue.CreatedAt.set -> void NGitLab.Mock.Issue.Description.get -> string NGitLab.Mock.Issue.Description.set -> void -NGitLab.Mock.Issue.Id.get -> int +NGitLab.Mock.Issue.Id.get -> long NGitLab.Mock.Issue.Id.set -> void -NGitLab.Mock.Issue.Iid.get -> int +NGitLab.Mock.Issue.Iid.get -> long NGitLab.Mock.Issue.Iid.set -> void NGitLab.Mock.Issue.Issue() -> void NGitLab.Mock.Issue.Labels.get -> string[] @@ -542,7 +542,7 @@ NGitLab.Mock.Issue.Milestone.set -> void NGitLab.Mock.Issue.Notes.get -> System.Collections.Generic.IList NGitLab.Mock.Issue.Notes.set -> void NGitLab.Mock.Issue.Project.get -> NGitLab.Mock.Project -NGitLab.Mock.Issue.ProjectId.get -> int +NGitLab.Mock.Issue.ProjectId.get -> long NGitLab.Mock.Issue.State.get -> NGitLab.Mock.IssueState NGitLab.Mock.Issue.State.set -> void NGitLab.Mock.Issue.Title.get -> string @@ -552,7 +552,7 @@ NGitLab.Mock.Issue.UpdatedAt.get -> System.DateTimeOffset NGitLab.Mock.Issue.UpdatedAt.set -> void NGitLab.Mock.Issue.WebUrl.get -> string NGitLab.Mock.IssueCollection -NGitLab.Mock.IssueCollection.GetByIid(int issueId) -> NGitLab.Mock.Issue +NGitLab.Mock.IssueCollection.GetByIid(long issueId) -> NGitLab.Mock.Issue NGitLab.Mock.IssueCollection.IssueCollection(NGitLab.Mock.GitLabObject container) -> void NGitLab.Mock.IssueState NGitLab.Mock.IssueState.closed = 1 -> NGitLab.Mock.IssueState @@ -576,7 +576,7 @@ NGitLab.Mock.Job.FailureReason.get -> string NGitLab.Mock.Job.FailureReason.set -> void NGitLab.Mock.Job.FinishedAt.get -> System.DateTime NGitLab.Mock.Job.FinishedAt.set -> void -NGitLab.Mock.Job.Id.get -> int +NGitLab.Mock.Job.Id.get -> long NGitLab.Mock.Job.Id.set -> void NGitLab.Mock.Job.Job() -> void NGitLab.Mock.Job.JobToken.get -> string @@ -611,7 +611,7 @@ NGitLab.Mock.JobCollection NGitLab.Mock.JobCollection.Add(NGitLab.Mock.Job job, NGitLab.Mock.Pipeline pipeline) -> NGitLab.Mock.Job NGitLab.Mock.JobCollection.AddNew() -> NGitLab.Mock.Job NGitLab.Mock.JobCollection.AddNew(NGitLab.Mock.Pipeline pipeline) -> NGitLab.Mock.Job -NGitLab.Mock.JobCollection.GetById(int id) -> NGitLab.Mock.Job +NGitLab.Mock.JobCollection.GetById(long id) -> NGitLab.Mock.Job NGitLab.Mock.JobCollection.JobCollection(NGitLab.Mock.GitLabObject parent) -> void NGitLab.Mock.Label NGitLab.Mock.Label.Color.get -> string @@ -619,7 +619,7 @@ NGitLab.Mock.Label.Color.set -> void NGitLab.Mock.Label.Description.get -> string NGitLab.Mock.Label.Description.set -> void NGitLab.Mock.Label.Group.get -> NGitLab.Mock.Group -NGitLab.Mock.Label.Id.get -> int +NGitLab.Mock.Label.Id.get -> long NGitLab.Mock.Label.Id.set -> void NGitLab.Mock.Label.Label() -> void NGitLab.Mock.Label.Name.get -> string @@ -628,7 +628,7 @@ NGitLab.Mock.Label.Project.get -> NGitLab.Mock.Project NGitLab.Mock.Label.ToClientLabel() -> NGitLab.Models.Label NGitLab.Mock.LabelsCollection NGitLab.Mock.LabelsCollection.Add(string name = null, string color = null, string description = null) -> NGitLab.Mock.Label -NGitLab.Mock.LabelsCollection.GetById(int id) -> NGitLab.Mock.Label +NGitLab.Mock.LabelsCollection.GetById(long id) -> NGitLab.Mock.Label NGitLab.Mock.LabelsCollection.GetByName(string name) -> NGitLab.Mock.Label NGitLab.Mock.LabelsCollection.LabelsCollection(NGitLab.Mock.GitLabObject parent) -> void NGitLab.Mock.LintCI @@ -665,8 +665,8 @@ NGitLab.Mock.MergeRequest.GetDiscussions() -> System.Collections.Generic.IEnumer NGitLab.Mock.MergeRequest.HasConflicts.get -> bool NGitLab.Mock.MergeRequest.HeadPipeline.get -> NGitLab.Mock.Pipeline NGitLab.Mock.MergeRequest.HeadSha.get -> string -NGitLab.Mock.MergeRequest.Id.get -> int -NGitLab.Mock.MergeRequest.Iid.get -> int +NGitLab.Mock.MergeRequest.Id.get -> long +NGitLab.Mock.MergeRequest.Iid.get -> long NGitLab.Mock.MergeRequest.Labels.get -> System.Collections.Generic.IList NGitLab.Mock.MergeRequest.MergeCommitSha.get -> NGitLab.Sha1? NGitLab.Mock.MergeRequest.MergeCommitSha.set -> void @@ -710,7 +710,7 @@ NGitLab.Mock.MergeRequestCollection NGitLab.Mock.MergeRequestCollection.Add(NGitLab.Mock.Project sourceProject, string sourceBranch, string targetBranch, string title, NGitLab.Mock.User user) -> NGitLab.Mock.MergeRequest NGitLab.Mock.MergeRequestCollection.Add(string sourceBranch, string targetBranch, string title, NGitLab.Mock.User user) -> NGitLab.Mock.MergeRequest NGitLab.Mock.MergeRequestCollection.AddNew(NGitLab.Mock.User author, string title = null, bool addCommit = false) -> NGitLab.Mock.MergeRequest -NGitLab.Mock.MergeRequestCollection.GetByIid(int iid) -> NGitLab.Mock.MergeRequest +NGitLab.Mock.MergeRequestCollection.GetByIid(long iid) -> NGitLab.Mock.MergeRequest NGitLab.Mock.MergeRequestCollection.MergeRequestCollection(NGitLab.Mock.GitLabObject parent) -> void NGitLab.Mock.MergeRequestComment NGitLab.Mock.MergeRequestComment.MergeRequestComment() -> void @@ -724,9 +724,9 @@ NGitLab.Mock.Milestone.Description.set -> void NGitLab.Mock.Milestone.DueDate.get -> System.DateTimeOffset NGitLab.Mock.Milestone.DueDate.set -> void NGitLab.Mock.Milestone.Group.get -> NGitLab.Mock.Group -NGitLab.Mock.Milestone.Id.get -> int +NGitLab.Mock.Milestone.Id.get -> long NGitLab.Mock.Milestone.Id.set -> void -NGitLab.Mock.Milestone.Iid.get -> int +NGitLab.Mock.Milestone.Iid.get -> long NGitLab.Mock.Milestone.Iid.set -> void NGitLab.Mock.Milestone.Milestone() -> void NGitLab.Mock.Milestone.Project.get -> NGitLab.Mock.Project @@ -740,7 +740,7 @@ NGitLab.Mock.Milestone.ToClientMilestone() -> NGitLab.Models.Milestone NGitLab.Mock.Milestone.UpdatedAt.get -> System.DateTimeOffset NGitLab.Mock.Milestone.UpdatedAt.set -> void NGitLab.Mock.MilestoneCollection -NGitLab.Mock.MilestoneCollection.GetByIid(int iid) -> NGitLab.Mock.Milestone +NGitLab.Mock.MilestoneCollection.GetByIid(long iid) -> NGitLab.Mock.Milestone NGitLab.Mock.MilestoneCollection.MilestoneCollection(NGitLab.Mock.GitLabObject container) -> void NGitLab.Mock.MilestoneState NGitLab.Mock.MilestoneState.active = 0 -> NGitLab.Mock.MilestoneState @@ -803,13 +803,13 @@ NGitLab.Mock.Pipeline.Duration.get -> System.TimeSpan? NGitLab.Mock.Pipeline.Duration.set -> void NGitLab.Mock.Pipeline.FinishedAt.get -> System.DateTimeOffset? NGitLab.Mock.Pipeline.FinishedAt.set -> void -NGitLab.Mock.Pipeline.Id.get -> int +NGitLab.Mock.Pipeline.Id.get -> long NGitLab.Mock.Pipeline.Id.set -> void NGitLab.Mock.Pipeline.Name.get -> string NGitLab.Mock.Pipeline.Name.set -> void NGitLab.Mock.Pipeline.Pipeline(string ref) -> void NGitLab.Mock.Pipeline.Project.get -> NGitLab.Mock.Project -NGitLab.Mock.Pipeline.ProjectId.get -> int +NGitLab.Mock.Pipeline.ProjectId.get -> long NGitLab.Mock.Pipeline.Ref.get -> string NGitLab.Mock.Pipeline.Ref.set -> void NGitLab.Mock.Pipeline.Sha.get -> NGitLab.Sha1 @@ -836,7 +836,7 @@ NGitLab.Mock.Pipeline.YamlError.get -> string NGitLab.Mock.Pipeline.YamlError.set -> void NGitLab.Mock.PipelineCollection NGitLab.Mock.PipelineCollection.Add(string ref, NGitLab.JobStatus status, NGitLab.Mock.User user) -> NGitLab.Mock.Pipeline -NGitLab.Mock.PipelineCollection.GetById(int id) -> NGitLab.Mock.Pipeline +NGitLab.Mock.PipelineCollection.GetById(long id) -> NGitLab.Mock.Pipeline NGitLab.Mock.PipelineCollection.PipelineCollection(NGitLab.Mock.GitLabObject parent) -> void NGitLab.Mock.PipelineSchedule NGitLab.Mock.PipelineSchedule.Active.get -> bool @@ -848,7 +848,7 @@ NGitLab.Mock.PipelineSchedule.Cron.get -> string NGitLab.Mock.PipelineSchedule.Cron.set -> void NGitLab.Mock.PipelineSchedule.Description.get -> string NGitLab.Mock.PipelineSchedule.Description.set -> void -NGitLab.Mock.PipelineSchedule.Id.get -> int +NGitLab.Mock.PipelineSchedule.Id.get -> long NGitLab.Mock.PipelineSchedule.Id.set -> void NGitLab.Mock.PipelineSchedule.NextRunAt.get -> System.DateTime NGitLab.Mock.PipelineSchedule.NextRunAt.set -> void @@ -865,14 +865,14 @@ NGitLab.Mock.PipelineSchedule.UpdatedAt.set -> void NGitLab.Mock.PipelineSchedule.Variables.get -> System.Collections.Generic.IDictionary NGitLab.Mock.PipelineSchedule.Variables.set -> void NGitLab.Mock.PipelineScheduleCollection -NGitLab.Mock.PipelineScheduleCollection.GetById(int id) -> NGitLab.Mock.PipelineSchedule +NGitLab.Mock.PipelineScheduleCollection.GetById(long id) -> NGitLab.Mock.PipelineSchedule NGitLab.Mock.PipelineScheduleCollection.PipelineScheduleCollection(NGitLab.Mock.Project project) -> void NGitLab.Mock.Project NGitLab.Mock.Project.AccessibleMergeRequests.get -> bool NGitLab.Mock.Project.AccessibleMergeRequests.set -> void NGitLab.Mock.Project.AddRunner(string name, string description, bool active, bool locked, bool isShared) -> NGitLab.Mock.Runner NGitLab.Mock.Project.AddRunner(string name, string description, bool active, bool locked, bool isShared, bool runUntagged) -> NGitLab.Mock.Runner -NGitLab.Mock.Project.AddRunner(string name, string description, bool active, bool locked, bool isShared, bool runUntagged, int id) -> NGitLab.Mock.Runner +NGitLab.Mock.Project.AddRunner(string name, string description, bool paused, bool locked, bool isShared, bool runUntagged, long id) -> NGitLab.Mock.Runner NGitLab.Mock.Project.AllThreadsMustBeResolvedToMerge.get -> bool NGitLab.Mock.Project.AllThreadsMustBeResolvedToMerge.set -> void NGitLab.Mock.Project.ApprovalsBeforeMerge.get -> int @@ -910,7 +910,7 @@ NGitLab.Mock.Project.GroupRunnersEnabled.get -> bool NGitLab.Mock.Project.GroupRunnersEnabled.set -> void NGitLab.Mock.Project.Hooks.get -> NGitLab.Mock.ProjectHookCollection NGitLab.Mock.Project.HttpUrl.get -> string -NGitLab.Mock.Project.Id.get -> int +NGitLab.Mock.Project.Id.get -> long NGitLab.Mock.Project.Id.set -> void NGitLab.Mock.Project.ImportStatus.get -> string NGitLab.Mock.Project.ImportStatus.set -> void @@ -932,7 +932,7 @@ NGitLab.Mock.Project.MirrorOverwritesDivergedBranches.get -> bool NGitLab.Mock.Project.MirrorOverwritesDivergedBranches.set -> void NGitLab.Mock.Project.MirrorTriggerBuilds.get -> bool NGitLab.Mock.Project.MirrorTriggerBuilds.set -> void -NGitLab.Mock.Project.MirrorUserId.get -> int +NGitLab.Mock.Project.MirrorUserId.get -> long NGitLab.Mock.Project.MirrorUserId.set -> void NGitLab.Mock.Project.Name.get -> string NGitLab.Mock.Project.Name.set -> void @@ -950,7 +950,7 @@ NGitLab.Mock.Project.ProtectedBranches.get -> NGitLab.Mock.ProtectedBranchCollec NGitLab.Mock.Project.RegisteredRunners.get -> NGitLab.Mock.RunnerCollection NGitLab.Mock.Project.Releases.get -> NGitLab.Mock.ReleaseCollection NGitLab.Mock.Project.Remove() -> void -NGitLab.Mock.Project.RemoveRunner(int runnerId) -> bool +NGitLab.Mock.Project.RemoveRunner(long runnerId) -> bool NGitLab.Mock.Project.Repository.get -> NGitLab.Mock.Repository NGitLab.Mock.Project.RepositoryAccessLevel.get -> NGitLab.Models.RepositoryAccessLevel NGitLab.Mock.Project.RepositoryAccessLevel.set -> void @@ -976,7 +976,7 @@ NGitLab.Mock.ProjectHook.CreatedAt.get -> System.DateTime NGitLab.Mock.ProjectHook.CreatedAt.set -> void NGitLab.Mock.ProjectHook.EnableSslVerification.get -> bool NGitLab.Mock.ProjectHook.EnableSslVerification.set -> void -NGitLab.Mock.ProjectHook.Id.get -> int +NGitLab.Mock.ProjectHook.Id.get -> long NGitLab.Mock.ProjectHook.IssuesEvents.get -> bool NGitLab.Mock.ProjectHook.IssuesEvents.set -> void NGitLab.Mock.ProjectHook.JobEvents.get -> bool @@ -1097,11 +1097,11 @@ NGitLab.Mock.ResourceLabelEvent.Action.get -> NGitLab.Models.ResourceLabelEventA NGitLab.Mock.ResourceLabelEvent.Action.set -> void NGitLab.Mock.ResourceLabelEvent.CreatedAt.get -> System.DateTime NGitLab.Mock.ResourceLabelEvent.CreatedAt.set -> void -NGitLab.Mock.ResourceLabelEvent.Id.get -> int +NGitLab.Mock.ResourceLabelEvent.Id.get -> long NGitLab.Mock.ResourceLabelEvent.Id.set -> void NGitLab.Mock.ResourceLabelEvent.Label.get -> NGitLab.Mock.Label NGitLab.Mock.ResourceLabelEvent.Label.set -> void -NGitLab.Mock.ResourceLabelEvent.ResourceId.get -> int +NGitLab.Mock.ResourceLabelEvent.ResourceId.get -> long NGitLab.Mock.ResourceLabelEvent.ResourceId.set -> void NGitLab.Mock.ResourceLabelEvent.ResourceLabelEvent() -> void NGitLab.Mock.ResourceLabelEvent.ResourceType.get -> string @@ -1116,11 +1116,11 @@ NGitLab.Mock.ResourceMilestoneEvent.Action.get -> NGitLab.Models.ResourceMilesto NGitLab.Mock.ResourceMilestoneEvent.Action.set -> void NGitLab.Mock.ResourceMilestoneEvent.CreatedAt.get -> System.DateTime NGitLab.Mock.ResourceMilestoneEvent.CreatedAt.set -> void -NGitLab.Mock.ResourceMilestoneEvent.Id.get -> int +NGitLab.Mock.ResourceMilestoneEvent.Id.get -> long NGitLab.Mock.ResourceMilestoneEvent.Id.set -> void NGitLab.Mock.ResourceMilestoneEvent.Milestone.get -> NGitLab.Mock.Milestone NGitLab.Mock.ResourceMilestoneEvent.Milestone.set -> void -NGitLab.Mock.ResourceMilestoneEvent.ResourceId.get -> int +NGitLab.Mock.ResourceMilestoneEvent.ResourceId.get -> long NGitLab.Mock.ResourceMilestoneEvent.ResourceId.set -> void NGitLab.Mock.ResourceMilestoneEvent.ResourceMilestoneEvent() -> void NGitLab.Mock.ResourceMilestoneEvent.ResourceType.get -> string @@ -1133,9 +1133,9 @@ NGitLab.Mock.ResourceMilestoneEventCollection.ResourceMilestoneEventCollection(N NGitLab.Mock.ResourceStateEvent NGitLab.Mock.ResourceStateEvent.CreatedAt.get -> System.DateTime NGitLab.Mock.ResourceStateEvent.CreatedAt.set -> void -NGitLab.Mock.ResourceStateEvent.Id.get -> int +NGitLab.Mock.ResourceStateEvent.Id.get -> long NGitLab.Mock.ResourceStateEvent.Id.set -> void -NGitLab.Mock.ResourceStateEvent.ResourceId.get -> int +NGitLab.Mock.ResourceStateEvent.ResourceId.get -> long NGitLab.Mock.ResourceStateEvent.ResourceId.set -> void NGitLab.Mock.ResourceStateEvent.ResourceStateEvent() -> void NGitLab.Mock.ResourceStateEvent.ResourceType.get -> string @@ -1148,13 +1148,11 @@ NGitLab.Mock.ResourceStateEvent.User.set -> void NGitLab.Mock.ResourceStateEventCollection NGitLab.Mock.ResourceStateEventCollection.ResourceStateEventCollection(NGitLab.Mock.GitLabObject container) -> void NGitLab.Mock.Runner -NGitLab.Mock.Runner.Active.get -> bool -NGitLab.Mock.Runner.Active.set -> void NGitLab.Mock.Runner.ContactedAt.get -> System.DateTime NGitLab.Mock.Runner.ContactedAt.set -> void NGitLab.Mock.Runner.Description.get -> string NGitLab.Mock.Runner.Description.set -> void -NGitLab.Mock.Runner.Id.get -> int +NGitLab.Mock.Runner.Id.get -> long NGitLab.Mock.Runner.Id.set -> void NGitLab.Mock.Runner.IpAddress.get -> string NGitLab.Mock.Runner.IpAddress.set -> void @@ -1181,10 +1179,10 @@ NGitLab.Mock.Runner.Token.set -> void NGitLab.Mock.Runner.Version.get -> string NGitLab.Mock.Runner.Version.set -> void NGitLab.Mock.RunnerCollection -NGitLab.Mock.RunnerCollection.Remove(int id) -> bool +NGitLab.Mock.RunnerCollection.Remove(long id) -> bool NGitLab.Mock.RunnerCollection.RunnerCollection(NGitLab.Mock.GitLabObject parent) -> void NGitLab.Mock.RunnerRef -NGitLab.Mock.RunnerRef.Id.get -> int +NGitLab.Mock.RunnerRef.Id.get -> long NGitLab.Mock.RunnerRef.RunnerRef(NGitLab.Mock.Runner runner) -> void NGitLab.Mock.RunnerRefCollection NGitLab.Mock.RunnerRefCollection.RunnerRefCollection(NGitLab.Mock.GitLabObject parent) -> void @@ -1197,7 +1195,7 @@ NGitLab.Mock.SystemHook.CreatedAt.get -> System.DateTime NGitLab.Mock.SystemHook.CreatedAt.set -> void NGitLab.Mock.SystemHook.EnableSslVerification.get -> bool NGitLab.Mock.SystemHook.EnableSslVerification.set -> void -NGitLab.Mock.SystemHook.Id.get -> int +NGitLab.Mock.SystemHook.Id.get -> long NGitLab.Mock.SystemHook.MergeRequestsEvents.get -> bool NGitLab.Mock.SystemHook.MergeRequestsEvents.set -> void NGitLab.Mock.SystemHook.PushEvents.get -> bool @@ -1233,7 +1231,7 @@ NGitLab.Mock.User.CreatedAt.get -> System.DateTime NGitLab.Mock.User.CreatedAt.set -> void NGitLab.Mock.User.Email.get -> string NGitLab.Mock.User.Email.set -> void -NGitLab.Mock.User.Id.get -> int +NGitLab.Mock.User.Id.get -> long NGitLab.Mock.User.Id.set -> void NGitLab.Mock.User.Identities.get -> NGitLab.Models.Identity[] NGitLab.Mock.User.Identities.set -> void @@ -1252,12 +1250,12 @@ NGitLab.Mock.User.WebUrl.get -> string NGitLab.Mock.UserCollection NGitLab.Mock.UserCollection.Add(string userName) -> NGitLab.Mock.User NGitLab.Mock.UserCollection.AddNew(string name = null) -> NGitLab.Mock.User -NGitLab.Mock.UserCollection.GetById(int id) -> NGitLab.Mock.User +NGitLab.Mock.UserCollection.GetById(long id) -> NGitLab.Mock.User NGitLab.Mock.UserCollection.GetById(string id) -> NGitLab.Mock.User NGitLab.Mock.UserCollection.UserCollection(NGitLab.Mock.GitLabObject container) -> void NGitLab.Mock.UserRef NGitLab.Mock.UserRef.Email.get -> string -NGitLab.Mock.UserRef.Id.get -> int +NGitLab.Mock.UserRef.Id.get -> long NGitLab.Mock.UserRef.Name.get -> string NGitLab.Mock.UserRef.ToClientAssignee() -> NGitLab.Models.Assignee NGitLab.Mock.UserRef.ToClientAuthor() -> NGitLab.Models.Author @@ -1279,8 +1277,8 @@ override NGitLab.Mock.JobCollection.Add(NGitLab.Mock.Job job) -> void override NGitLab.Mock.LabelsCollection.Add(NGitLab.Mock.Label label) -> void override NGitLab.Mock.MergeRequestCollection.Add(NGitLab.Mock.MergeRequest mergeRequest) -> void override NGitLab.Mock.MergeRequestComment.NoteableType.get -> string -override NGitLab.Mock.MergeRequestComment.NoticableId.get -> int -override NGitLab.Mock.MergeRequestComment.NoticableIid.get -> int +override NGitLab.Mock.MergeRequestComment.NoticableId.get -> long +override NGitLab.Mock.MergeRequestComment.NoticableIid.get -> long override NGitLab.Mock.MilestoneCollection.Add(NGitLab.Mock.Milestone item) -> void override NGitLab.Mock.NonTextFile.Content.get -> byte[] override NGitLab.Mock.NoteCollection.Add(T item) -> void @@ -1289,8 +1287,8 @@ override NGitLab.Mock.PipelineScheduleCollection.Add(NGitLab.Mock.PipelineSchedu override NGitLab.Mock.ProjectCollection.Add(NGitLab.Mock.Project project) -> void override NGitLab.Mock.ProjectHookCollection.Add(NGitLab.Mock.ProjectHook item) -> void override NGitLab.Mock.ProjectIssueNote.NoteableType.get -> string -override NGitLab.Mock.ProjectIssueNote.NoticableId.get -> int -override NGitLab.Mock.ProjectIssueNote.NoticableIid.get -> int +override NGitLab.Mock.ProjectIssueNote.NoticableId.get -> long +override NGitLab.Mock.ProjectIssueNote.NoticableIid.get -> long override NGitLab.Mock.ProtectedBranchCollection.Add(NGitLab.Mock.ProtectedBranch branch) -> void override NGitLab.Mock.ReleaseCollection.Add(NGitLab.Mock.ReleaseInfo release) -> void override NGitLab.Mock.ResourceLabelEventCollection.Add(NGitLab.Mock.ResourceLabelEvent item) -> void @@ -1324,19 +1322,19 @@ static NGitLab.Mock.Config.GitLabHelpers.SetDefaultUser(this NGitLab.Mock.Config static NGitLab.Mock.Config.GitLabHelpers.SetDefaultVisibility(this NGitLab.Mock.Config.GitLabConfig config, NGitLab.Models.VisibilityLevel visibility) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.ToConfig(this NGitLab.Mock.GitLabServer server) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithApprover(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string approver) -> NGitLab.Mock.Config.GitLabMergeRequest -static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabIssue issue, string message = null, int id = 0, string author = null, bool system = false, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, string thread = null, bool resolvable = false, bool resolved = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabIssue +static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabIssue issue, string message = null, long id = 0, string author = null, bool system = false, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, string thread = null, bool resolvable = false, bool resolved = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabIssue static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabIssue issue, string message, System.Action configure) -> NGitLab.Mock.Config.GitLabIssue -static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string message = null, int id = 0, string author = null, bool system = false, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, string thread = null, bool resolvable = false, bool resolved = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabMergeRequest +static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string message = null, long id = 0, string author = null, bool system = false, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, string thread = null, bool resolvable = false, bool resolved = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabMergeRequest static NGitLab.Mock.Config.GitLabHelpers.WithComment(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string message, System.Action configure) -> NGitLab.Mock.Config.GitLabMergeRequest static NGitLab.Mock.Config.GitLabHelpers.WithCommit(this NGitLab.Mock.Config.GitLabProject project, string message = null, string user = null, string sourceBranch = null, string targetBranch = null, string fromBranch = null, System.Collections.Generic.IEnumerable tags = null, string alias = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithCommit(this NGitLab.Mock.Config.GitLabProject project, string message, string user, System.Action configure) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithFile(this NGitLab.Mock.Config.GitLabCommit commit, string relativePath, string content = "") -> NGitLab.Mock.Config.GitLabCommit -static NGitLab.Mock.Config.GitLabHelpers.WithGroup(this NGitLab.Mock.Config.GitLabConfig config, string name = null, int id = 0, string namespace = null, string description = null, NGitLab.Models.VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig +static NGitLab.Mock.Config.GitLabHelpers.WithGroup(this NGitLab.Mock.Config.GitLabConfig config, string name = null, long id = 0, string namespace = null, string description = null, NGitLab.Models.VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithGroup(this NGitLab.Mock.Config.GitLabConfig config, string name, System.Action configure) -> NGitLab.Mock.Config.GitLabConfig -static NGitLab.Mock.Config.GitLabHelpers.WithGroupOfFullPath(this NGitLab.Mock.Config.GitLabConfig config, string fullPath, string name = null, int id = 0, string description = null, NGitLab.Models.VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig +static NGitLab.Mock.Config.GitLabHelpers.WithGroupOfFullPath(this NGitLab.Mock.Config.GitLabConfig config, string fullPath, string name = null, long id = 0, string description = null, NGitLab.Models.VisibilityLevel? visibility = null, bool addDefaultUserAsMaintainer = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithGroupPermission(this NGitLab.Mock.Config.GitLabGroup grp, string groupName, NGitLab.Models.AccessLevel level) -> NGitLab.Mock.Config.GitLabGroup static NGitLab.Mock.Config.GitLabHelpers.WithGroupPermission(this NGitLab.Mock.Config.GitLabProject project, string groupName, NGitLab.Models.AccessLevel level) -> NGitLab.Mock.Config.GitLabProject -static NGitLab.Mock.Config.GitLabHelpers.WithIssue(this NGitLab.Mock.Config.GitLabProject project, string title = null, int id = 0, string description = null, string author = null, string assignee = null, string milestone = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Collections.Generic.IEnumerable labels = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject +static NGitLab.Mock.Config.GitLabHelpers.WithIssue(this NGitLab.Mock.Config.GitLabProject project, string title = null, long id = 0, string description = null, string author = null, string assignee = null, string milestone = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Collections.Generic.IEnumerable labels = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithIssue(this NGitLab.Mock.Config.GitLabProject project, string title, string author, System.Action configure) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithJob(this NGitLab.Mock.Config.GitLabPipeline pipeline, string name = null, string stage = null, NGitLab.JobStatus status = NGitLab.JobStatus.Unknown, System.DateTime? createdAt = null, System.DateTime? startedAt = null, System.DateTime? finishedAt = null, bool allowFailure = false, NGitLab.Mock.Config.GitLabPipeline downstreamPipeline = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabPipeline static NGitLab.Mock.Config.GitLabHelpers.WithLabel(this NGitLab.Mock.Config.GitLabGroup group, string name, string color = null, string description = null) -> NGitLab.Mock.Config.GitLabGroup @@ -1344,20 +1342,20 @@ static NGitLab.Mock.Config.GitLabHelpers.WithLabel(this NGitLab.Mock.Config.GitL static NGitLab.Mock.Config.GitLabHelpers.WithLabel(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string label) -> NGitLab.Mock.Config.GitLabMergeRequest static NGitLab.Mock.Config.GitLabHelpers.WithLabel(this NGitLab.Mock.Config.GitLabProject project, string name, string color = null, string description = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithMergeCommit(this NGitLab.Mock.Config.GitLabProject project, string sourceBranch, string targetBranch = null, string user = null, bool deleteSourceBranch = false, System.Collections.Generic.IEnumerable tags = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject -static NGitLab.Mock.Config.GitLabHelpers.WithMergeRequest(this NGitLab.Mock.Config.GitLabProject project, string sourceBranch = null, string title = null, int id = 0, string targetBranch = null, string description = null, string author = null, string assignee = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.DateTime? mergedAt = null, System.Collections.Generic.IEnumerable approvers = null, System.Collections.Generic.IEnumerable labels = null, string milestone = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject +static NGitLab.Mock.Config.GitLabHelpers.WithMergeRequest(this NGitLab.Mock.Config.GitLabProject project, string sourceBranch = null, string title = null, long id = 0, string targetBranch = null, string description = null, string author = null, string assignee = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.DateTime? mergedAt = null, System.Collections.Generic.IEnumerable approvers = null, System.Collections.Generic.IEnumerable labels = null, string milestone = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithMergeRequest(this NGitLab.Mock.Config.GitLabProject project, string sourceBranch, string title, string author, System.Action configure) -> NGitLab.Mock.Config.GitLabProject -static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabGroup group, string title, int id = 0, string description = null, System.DateTime? dueDate = null, System.DateTime? startDate = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabGroup +static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabGroup group, string title, long id = 0, string description = null, System.DateTime? dueDate = null, System.DateTime? startDate = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabGroup static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabGroup group, string title, System.Action configure) -> NGitLab.Mock.Config.GitLabGroup -static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabProject project, string title, int id = 0, string description = null, System.DateTime? dueDate = null, System.DateTime? startDate = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject +static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabProject project, string title, long id = 0, string description = null, System.DateTime? dueDate = null, System.DateTime? startDate = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null, System.DateTime? closedAt = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithMilestone(this NGitLab.Mock.Config.GitLabProject project, string title, System.Action configure) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithPipeline(this NGitLab.Mock.Config.GitLabProject project, string ref, System.Action configure) -> NGitLab.Mock.Config.GitLabProject -static NGitLab.Mock.Config.GitLabHelpers.WithProject(this NGitLab.Mock.Config.GitLabConfig config, string name = null, int id = 0, string namespace = null, string description = null, string defaultBranch = null, NGitLab.Models.VisibilityLevel visibility = NGitLab.Models.VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string clonePath = null, string cloneParameters = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig +static NGitLab.Mock.Config.GitLabHelpers.WithProject(this NGitLab.Mock.Config.GitLabConfig config, string name = null, long id = 0, string namespace = null, string description = null, string defaultBranch = null, NGitLab.Models.VisibilityLevel visibility = NGitLab.Models.VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string clonePath = null, string cloneParameters = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithProject(this NGitLab.Mock.Config.GitLabConfig config, string name, System.Action configure) -> NGitLab.Mock.Config.GitLabConfig -static NGitLab.Mock.Config.GitLabHelpers.WithProjectOfFullPath(this NGitLab.Mock.Config.GitLabConfig config, string fullPath, string name = null, int id = 0, string description = null, string defaultBranch = null, NGitLab.Models.VisibilityLevel visibility = NGitLab.Models.VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string clonePath = null, string cloneParameters = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig +static NGitLab.Mock.Config.GitLabHelpers.WithProjectOfFullPath(this NGitLab.Mock.Config.GitLabConfig config, string fullPath, string name = null, long id = 0, string description = null, string defaultBranch = null, NGitLab.Models.VisibilityLevel visibility = NGitLab.Models.VisibilityLevel.Internal, bool initialCommit = false, bool addDefaultUserAsMaintainer = false, string clonePath = null, string cloneParameters = null, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithRelease(this NGitLab.Mock.Config.GitLabProject project, string author, string tagName, System.DateTime? createdAt = null, System.DateTime? releasedAt = null) -> NGitLab.Mock.Config.GitLabProject static NGitLab.Mock.Config.GitLabHelpers.WithSubModule(this NGitLab.Mock.Config.GitLabCommit commit, string projectName) -> NGitLab.Mock.Config.GitLabCommit -static NGitLab.Mock.Config.GitLabHelpers.WithSystemComment(this NGitLab.Mock.Config.GitLabIssue issue, string message = null, string innerHtml = null, int id = 0, string author = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null) -> NGitLab.Mock.Config.GitLabIssue -static NGitLab.Mock.Config.GitLabHelpers.WithSystemComment(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string message = null, string innerHtml = null, int id = 0, string author = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null) -> NGitLab.Mock.Config.GitLabMergeRequest +static NGitLab.Mock.Config.GitLabHelpers.WithSystemComment(this NGitLab.Mock.Config.GitLabIssue issue, string message = null, string innerHtml = null, long id = 0, string author = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null) -> NGitLab.Mock.Config.GitLabIssue +static NGitLab.Mock.Config.GitLabHelpers.WithSystemComment(this NGitLab.Mock.Config.GitLabMergeRequest mergeRequest, string message = null, string innerHtml = null, long id = 0, string author = null, System.DateTime? createdAt = null, System.DateTime? updatedAt = null) -> NGitLab.Mock.Config.GitLabMergeRequest static NGitLab.Mock.Config.GitLabHelpers.WithTag(this NGitLab.Mock.Config.GitLabCommit commit, string name) -> NGitLab.Mock.Config.GitLabCommit static NGitLab.Mock.Config.GitLabHelpers.WithUser(this NGitLab.Mock.Config.GitLabConfig config, string username, string name = null, string email = null, string avatarUrl = null, bool isAdmin = false, bool isDefault = false, System.Action configure = null) -> NGitLab.Mock.Config.GitLabConfig static NGitLab.Mock.Config.GitLabHelpers.WithUser(this NGitLab.Mock.Config.GitLabConfig config, string username, System.Action configure) -> NGitLab.Mock.Config.GitLabConfig diff --git a/NGitLab.Mock/ResourceLabelEvent.cs b/NGitLab.Mock/ResourceLabelEvent.cs index fcd01e67..5ac5a9d4 100644 --- a/NGitLab.Mock/ResourceLabelEvent.cs +++ b/NGitLab.Mock/ResourceLabelEvent.cs @@ -5,13 +5,13 @@ namespace NGitLab.Mock; public sealed class ResourceLabelEvent : GitLabObject { - public int Id { get; set; } + public long Id { get; set; } public Author User { get; set; } public DateTime CreatedAt { get; set; } - public int ResourceId { get; set; } + public long ResourceId { get; set; } public string ResourceType { get; set; } diff --git a/NGitLab.Mock/ResourceLabelEventCollection.cs b/NGitLab.Mock/ResourceLabelEventCollection.cs index c6fe084d..2393c18d 100644 --- a/NGitLab.Mock/ResourceLabelEventCollection.cs +++ b/NGitLab.Mock/ResourceLabelEventCollection.cs @@ -25,7 +25,7 @@ public override void Add(ResourceLabelEvent item) base.Add(item); } - internal IEnumerable Get(int? resourceId) + internal IEnumerable Get(long? resourceId) { var resourceLabelEvents = this.AsQueryable(); @@ -37,12 +37,12 @@ internal IEnumerable Get(int? resourceId) return resourceLabelEvents; } - private int GetNewId() + private long GetNewId() { return this.Select(rle => rle.Id).DefaultIfEmpty().Max() + 1; } - internal void CreateResourceLabelEvents(User currentUser, string[] previousLabels, string[] newLabels, int resourceId, string resourceType) + internal void CreateResourceLabelEvents(User currentUser, string[] previousLabels, string[] newLabels, long resourceId, string resourceType) { foreach (var label in previousLabels) { diff --git a/NGitLab.Mock/ResourceMilestoneEvent.cs b/NGitLab.Mock/ResourceMilestoneEvent.cs index e5d6cd76..d909d389 100644 --- a/NGitLab.Mock/ResourceMilestoneEvent.cs +++ b/NGitLab.Mock/ResourceMilestoneEvent.cs @@ -5,13 +5,13 @@ namespace NGitLab.Mock; public sealed class ResourceMilestoneEvent : GitLabObject { - public int Id { get; set; } + public long Id { get; set; } public Author User { get; set; } public DateTime CreatedAt { get; set; } - public int ResourceId { get; set; } + public long ResourceId { get; set; } public string ResourceType { get; set; } diff --git a/NGitLab.Mock/ResourceMilestoneEventCollection.cs b/NGitLab.Mock/ResourceMilestoneEventCollection.cs index 9fe489d3..9270cdcd 100644 --- a/NGitLab.Mock/ResourceMilestoneEventCollection.cs +++ b/NGitLab.Mock/ResourceMilestoneEventCollection.cs @@ -25,7 +25,7 @@ public override void Add(ResourceMilestoneEvent item) base.Add(item); } - internal IEnumerable Get(int? resourceId) + internal IEnumerable Get(long? resourceId) { var resourceMilestoneEvents = this.AsQueryable(); @@ -37,12 +37,12 @@ internal IEnumerable Get(int? resourceId) return resourceMilestoneEvents; } - private int GetNewId() + private long GetNewId() { return this.Select(rle => rle.Id).DefaultIfEmpty().Max() + 1; } - internal void CreateResourceMilestoneEvents(User currentUser, int resourceId, Milestone previousMilestone, Milestone newMilestone, string resourceType) + internal void CreateResourceMilestoneEvents(User currentUser, long resourceId, Milestone previousMilestone, Milestone newMilestone, string resourceType) { if (previousMilestone is null) { @@ -59,7 +59,7 @@ internal void CreateResourceMilestoneEvents(User currentUser, int resourceId, Mi } } - internal void CreateResourceMilestoneEvent(User currentUser, int resourceId, Milestone milestone, ResourceMilestoneEventAction action, string resourceType) + internal void CreateResourceMilestoneEvent(User currentUser, long resourceId, Milestone milestone, ResourceMilestoneEventAction action, string resourceType) { Add(new ResourceMilestoneEvent() { diff --git a/NGitLab.Mock/ResourceStateEvent.cs b/NGitLab.Mock/ResourceStateEvent.cs index 7e86a639..29f8a99a 100644 --- a/NGitLab.Mock/ResourceStateEvent.cs +++ b/NGitLab.Mock/ResourceStateEvent.cs @@ -5,13 +5,13 @@ namespace NGitLab.Mock; public sealed class ResourceStateEvent : GitLabObject { - public int Id { get; set; } + public long Id { get; set; } public Author User { get; set; } public DateTime CreatedAt { get; set; } - public int ResourceId { get; set; } + public long ResourceId { get; set; } public string ResourceType { get; set; } diff --git a/NGitLab.Mock/ResourceStateEventCollection.cs b/NGitLab.Mock/ResourceStateEventCollection.cs index f3914349..f95af456 100644 --- a/NGitLab.Mock/ResourceStateEventCollection.cs +++ b/NGitLab.Mock/ResourceStateEventCollection.cs @@ -25,7 +25,7 @@ public override void Add(ResourceStateEvent item) base.Add(item); } - internal IEnumerable Get(int? resourceId) + internal IEnumerable Get(long? resourceId) { var resourceStateEvents = this.AsQueryable(); @@ -37,12 +37,12 @@ internal IEnumerable Get(int? resourceId) return resourceStateEvents; } - private int GetNewId() + private long GetNewId() { return this.Select(rle => rle.Id).DefaultIfEmpty().Max() + 1; } - internal void CreateResourceStateEvent(User currentUser, string state, int id, string resourceType) + internal void CreateResourceStateEvent(User currentUser, string state, long id, string resourceType) { Add(new ResourceStateEvent() { diff --git a/NGitLab.Mock/Runner.cs b/NGitLab.Mock/Runner.cs index 9fe775cd..77b90b36 100644 --- a/NGitLab.Mock/Runner.cs +++ b/NGitLab.Mock/Runner.cs @@ -7,14 +7,12 @@ public sealed class Runner : GitLabObject { public new Project Parent => (Project)base.Parent; - public int Id { get; set; } + public long Id { get; set; } public string Name { get; set; } public bool Paused { get; set; } - public bool Active { get; set; } - public bool? Online { get; set; } public string Status { get; set; } @@ -43,9 +41,7 @@ internal Models.Runner ToClientRunner(User currentUser) { Id = Id, Name = Name, -#pragma warning disable CS0618 // Type or member is obsolete - Active = Active, -#pragma warning restore CS0618 // Type or member is obsolete + Paused = Paused, Online = Online ?? false, Status = Status, Description = Description, diff --git a/NGitLab.Mock/RunnerCollection.cs b/NGitLab.Mock/RunnerCollection.cs index 8a6314b3..df48d9f9 100644 --- a/NGitLab.Mock/RunnerCollection.cs +++ b/NGitLab.Mock/RunnerCollection.cs @@ -28,7 +28,7 @@ public override void Add(Runner item) base.Add(item); } - public bool Remove(int id) + public bool Remove(long id) { var r = this.SingleOrDefault(r => r.Id == id); return Remove(r); diff --git a/NGitLab.Mock/RunnerRef.cs b/NGitLab.Mock/RunnerRef.cs index 81ddcba0..14ec96b0 100644 --- a/NGitLab.Mock/RunnerRef.cs +++ b/NGitLab.Mock/RunnerRef.cs @@ -7,7 +7,7 @@ public sealed class RunnerRef : GitLabObject { private readonly Runner _runner; - public int Id => _runner.Id; + public long Id => _runner.Id; public RunnerRef(Runner runner) { @@ -17,11 +17,11 @@ public RunnerRef(Runner runner) public override bool Equals(object obj) { return obj is RunnerRef @ref && - EqualityComparer.Default.Equals(Id, @ref.Id); + EqualityComparer.Default.Equals(Id, @ref.Id); } public override int GetHashCode() { - return -1771473357 + EqualityComparer.Default.GetHashCode(Id); + return -1771473357 + EqualityComparer.Default.GetHashCode(Id); } } diff --git a/NGitLab.Mock/RunnersExtensions.cs b/NGitLab.Mock/RunnersExtensions.cs index 7564cc94..5a8fe285 100644 --- a/NGitLab.Mock/RunnersExtensions.cs +++ b/NGitLab.Mock/RunnersExtensions.cs @@ -6,22 +6,16 @@ internal static class RunnersExtensions { public static bool? IsActive(this RunnerRegister runner) { -#pragma warning disable CS0618 // Type or member is obsolete - return runner.Active ?? !runner.Paused; -#pragma warning restore CS0618 // Type or member is obsolete + return !runner.Paused; } public static bool? IsActive(this RunnerUpdate runner) { -#pragma warning disable CS0618 // Type or member is obsolete - return runner.Active ?? !runner.Paused; -#pragma warning restore CS0618 // Type or member is obsolete + return !runner.Paused; } public static bool IsActive(this Runner runner) { -#pragma warning disable CS0618 // Type or member is obsolete - return runner.Active || !runner.Paused; -#pragma warning restore CS0618 // Type or member is obsolete + return !runner.Paused; } } diff --git a/NGitLab.Mock/SystemHook.cs b/NGitLab.Mock/SystemHook.cs index d877b29b..5946d405 100644 --- a/NGitLab.Mock/SystemHook.cs +++ b/NGitLab.Mock/SystemHook.cs @@ -4,7 +4,7 @@ namespace NGitLab.Mock; public sealed class SystemHook : GitLabObject { - public int Id { get; internal set; } + public long Id { get; internal set; } public Uri Url { get; set; } diff --git a/NGitLab.Mock/SystemHookCollection.cs b/NGitLab.Mock/SystemHookCollection.cs index 553a41cc..9111474e 100644 --- a/NGitLab.Mock/SystemHookCollection.cs +++ b/NGitLab.Mock/SystemHookCollection.cs @@ -23,7 +23,7 @@ public override void Add(SystemHook item) base.Add(item); } - private int GetNewId() + private long GetNewId() { return this.Select(hook => hook.Id).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/User.cs b/NGitLab.Mock/User.cs index ebc769ad..fd39b7c7 100644 --- a/NGitLab.Mock/User.cs +++ b/NGitLab.Mock/User.cs @@ -14,7 +14,7 @@ public User(string userName) State = UserState.active; } - public int Id { get; set; } + public long Id { get; set; } public string UserName { get; } diff --git a/NGitLab.Mock/UserCollection.cs b/NGitLab.Mock/UserCollection.cs index 4951837a..52d94ea3 100644 --- a/NGitLab.Mock/UserCollection.cs +++ b/NGitLab.Mock/UserCollection.cs @@ -20,7 +20,7 @@ public User GetById(string id) return this.FirstOrDefault(u => StringComparer.OrdinalIgnoreCase.Equals(u.UserName, id)); } - public User GetById(int id) => this.FirstOrDefault(user => user.Id == id); + public User GetById(long id) => this.FirstOrDefault(user => user.Id == id); public User AddNew(string name = null) { @@ -77,7 +77,7 @@ public override void Add(User user) base.Add(user); } - private int GetNewId() + private long GetNewId() { return this.Select(user => user.Id).DefaultIfEmpty().Max() + 1; } diff --git a/NGitLab.Mock/UserRef.cs b/NGitLab.Mock/UserRef.cs index 6c79307d..3f744032 100644 --- a/NGitLab.Mock/UserRef.cs +++ b/NGitLab.Mock/UserRef.cs @@ -12,7 +12,7 @@ public UserRef(User user) _user = user ?? throw new ArgumentNullException(nameof(user)); } - public int Id => _user.Id; + public long Id => _user.Id; public string Name => _user.Name; diff --git a/NGitLab.Tests/Docker/GitLabTestContext.cs b/NGitLab.Tests/Docker/GitLabTestContext.cs index d4769c7b..2bff749a 100644 --- a/NGitLab.Tests/Docker/GitLabTestContext.cs +++ b/NGitLab.Tests/Docker/GitLabTestContext.cs @@ -184,14 +184,14 @@ void AddSomeCommits() } } - public Project CreateProject(int parentGroupId, Action configure = null, bool initializeWithCommits = false) => + public Project CreateProject(long parentGroupId, Action configure = null, bool initializeWithCommits = false) => CreateProject(initializeWithCommits: initializeWithCommits, configure: p => { - p.NamespaceId = new GroupId(parentGroupId).ValueAsString(); + p.NamespaceId = parentGroupId; configure?.Invoke(p); }); - public Project CreateProject(int parentGroupId, string slug, string name = null, Action configure = null, bool initializeWithCommits = false) => + public Project CreateProject(long parentGroupId, string slug, string name = null, Action configure = null, bool initializeWithCommits = false) => CreateProject(parentGroupId, initializeWithCommits: initializeWithCommits, configure: p => { p.Path = slug; @@ -223,14 +223,14 @@ public Group CreateGroup(string slug, string name = null, Action co configure?.Invoke(g); }); - public Group CreateSubgroup(int parentGroupId, Action configure = null) => + public Group CreateSubgroup(long parentGroupId, Action configure = null) => CreateGroup(g => { g.ParentId = parentGroupId; configure?.Invoke(g); }); - public Group CreateSubgroup(int parentGroupId, string slug, string name = null, Action configure = null) => + public Group CreateSubgroup(long parentGroupId, string slug, string name = null, Action configure = null) => CreateSubgroup(parentGroupId, g => { g.Path = slug; @@ -334,7 +334,7 @@ internal static bool IsContinuousIntegration() string.Equals(Environment.GetEnvironmentVariable("GITLAB_CI"), "true", StringComparison.OrdinalIgnoreCase); } - public async Task StartRunnerForOneJobAsync(int projectId) + public async Task StartRunnerForOneJobAsync(long projectId) { // Download runner (windows / linux, GitLab version) await s_prepareRunnerLock.WaitAsync().ConfigureAwait(false); diff --git a/NGitLab.Tests/GroupsTests.cs b/NGitLab.Tests/GroupsTests.cs index 96b233cc..e14a7f58 100644 --- a/NGitLab.Tests/GroupsTests.cs +++ b/NGitLab.Tests/GroupsTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.Linq; using System.Net; using System.Threading.Tasks; @@ -30,7 +29,7 @@ public async Task Test_projects_are_set_in_a_group_by_id() using var context = await GitLabTestContext.CreateAsync(); var groupClient = context.Client.Groups; var group = context.CreateGroup(); - var project = context.Client.Projects.Create(new ProjectCreate { Name = "test", NamespaceId = group.Id.ToString(CultureInfo.InvariantCulture) }); + var project = context.Client.Projects.Create(new ProjectCreate { Name = "test", NamespaceId = group.Id }); group = groupClient[group.Id]; Assert.That(group, Is.Not.Null); @@ -85,7 +84,7 @@ public async Task Test_create_delete_group() await GitLabTestContext.RetryUntilAsync(() => TryGetGroup(groupClient, group.Id), group => group == null || group.MarkedForDeletionOn != null, TimeSpan.FromMinutes(2)); } - private static Group TryGetGroup(IGroupsClient groupClient, int groupId) + private static Group TryGetGroup(IGroupsClient groupClient, long groupId) { try { @@ -473,7 +472,7 @@ public async Task Test_group_projects_query_returns_searched_project() Search = project.Name, }).ToArray(); - Assert.That(projects.Select(p => p.Id), Is.EquivalentTo(new int[] { project.Id })); + Assert.That(projects.Select(p => p.Id), Is.EquivalentTo(new[] { project.Id })); } [Test] diff --git a/NGitLab.Tests/JsonTests.cs b/NGitLab.Tests/JsonTests.cs index f81e25dc..d9a1103a 100644 --- a/NGitLab.Tests/JsonTests.cs +++ b/NGitLab.Tests/JsonTests.cs @@ -67,6 +67,6 @@ public class TestContractV2 public string Title; [JsonPropertyName("id")] - public int Id; + public long Id; } } diff --git a/NGitLab.Tests/MembersClientTests.cs b/NGitLab.Tests/MembersClientTests.cs index 2bcc8286..8cedf642 100644 --- a/NGitLab.Tests/MembersClientTests.cs +++ b/NGitLab.Tests/MembersClientTests.cs @@ -170,7 +170,7 @@ public async Task AsyncMethodsBehaveAsExpected() var user1Id = user1.Id.ToString(); // Add the user to the top-level group as a Maintainer... - await client.Members.AddMemberToGroupAsync(group1, new() + await client.Members.AddMemberToGroupAsync(group1.Id, new() { AccessLevel = AccessLevel.Maintainer, UserId = user1Id, diff --git a/NGitLab.Tests/Milestone/MilestoneClientTests.cs b/NGitLab.Tests/Milestone/MilestoneClientTests.cs index 81ad19df..4870ef2e 100644 --- a/NGitLab.Tests/Milestone/MilestoneClientTests.cs +++ b/NGitLab.Tests/Milestone/MilestoneClientTests.cs @@ -86,7 +86,7 @@ public async Task Test_group_milestone_merge_requests() { using var context = await GitLabTestContext.CreateAsync(); var group = context.CreateGroup(); - var (project, mergeRequest) = context.CreateMergeRequest(configureProject: project => project.NamespaceId = group.Id.ToString()); + var (project, mergeRequest) = context.CreateMergeRequest(configureProject: project => project.NamespaceId = group.Id); var milestoneClient = context.Client.GetGroupMilestone(group.Id); var milestone = CreateMilestone(context, MilestoneScope.Groups, group.Id, "my-super-milestone"); @@ -98,7 +98,7 @@ public async Task Test_group_milestone_merge_requests() Assert.That(mergeRequests, Has.Length.EqualTo(1), "The query retrieved all merged requests that assigned to the milestone."); } - private static Models.Milestone CreateMilestone(GitLabTestContext context, MilestoneScope scope, int id, string title) + private static Models.Milestone CreateMilestone(GitLabTestContext context, MilestoneScope scope, long id, string title) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); var milestone = milestoneClient.Create(new MilestoneCreate @@ -120,7 +120,7 @@ private static Models.Milestone CreateMilestone(GitLabTestContext context, Miles return milestone; } - private static Models.Milestone UpdateMilestone(GitLabTestContext context, MilestoneScope scope, int id, Models.Milestone milestone) + private static Models.Milestone UpdateMilestone(GitLabTestContext context, MilestoneScope scope, long id, Models.Milestone milestone) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); var updatedMilestone = milestoneClient.Update(milestone.Id, new MilestoneUpdate @@ -143,7 +143,7 @@ private static Models.Milestone UpdateMilestone(GitLabTestContext context, Miles return updatedMilestone; } - private static Models.Milestone UpdatePartialMilestone(GitLabTestContext context, MilestoneScope scope, int id, Models.Milestone milestone) + private static Models.Milestone UpdatePartialMilestone(GitLabTestContext context, MilestoneScope scope, long id, Models.Milestone milestone) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); var updatedMilestone = milestoneClient.Update(milestone.Id, new MilestoneUpdate @@ -163,7 +163,7 @@ private static Models.Milestone UpdatePartialMilestone(GitLabTestContext context return updatedMilestone; } - private static Models.Milestone ActivateMilestone(GitLabTestContext context, MilestoneScope scope, int id, Models.Milestone milestone) + private static Models.Milestone ActivateMilestone(GitLabTestContext context, MilestoneScope scope, long id, Models.Milestone milestone) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); var activeMilestone = milestoneClient.Activate(milestone.Id); @@ -179,7 +179,7 @@ private static Models.Milestone ActivateMilestone(GitLabTestContext context, Mil return activeMilestone; } - private static Models.Milestone CloseMilestone(GitLabTestContext context, MilestoneScope scope, int id, Models.Milestone milestone) + private static Models.Milestone CloseMilestone(GitLabTestContext context, MilestoneScope scope, long id, Models.Milestone milestone) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); var closedMilestone = milestoneClient.Close(milestone.Id); @@ -195,7 +195,7 @@ private static Models.Milestone CloseMilestone(GitLabTestContext context, Milest return closedMilestone; } - private static void DeleteMilestone(GitLabTestContext context, MilestoneScope scope, int id, Models.Milestone milestone) + private static void DeleteMilestone(GitLabTestContext context, MilestoneScope scope, long id, Models.Milestone milestone) { var milestoneClient = scope == MilestoneScope.Projects ? context.Client.GetMilestone(id) : context.Client.GetGroupMilestone(id); milestoneClient.Delete(milestone.Id); diff --git a/NGitLab.Tests/ProjectsTests.cs b/NGitLab.Tests/ProjectsTests.cs index 50b0567d..fcfda9ad 100644 --- a/NGitLab.Tests/ProjectsTests.cs +++ b/NGitLab.Tests/ProjectsTests.cs @@ -751,7 +751,7 @@ public async Task Test_project_groups_query_returns_searched_group() Search = group.Name, }).ToArray(); - Assert.That(groups.Select(g => g.Id), Is.EquivalentTo(new int[] { group.Id })); + Assert.That(groups.Select(g => g.Id), Is.EquivalentTo(new[] { group.Id })); } [Test] @@ -766,6 +766,6 @@ public async Task Test_project_groups_query_returns_ancestor_groups() var groups = projectClient.GetGroupsAsync(project.Id, new ProjectGroupsQuery()).ToArray(); - Assert.That(groups.Select(g => g.Id), Is.EquivalentTo(new int[] { group.Id, subgroup.Id })); + Assert.That(groups.Select(g => g.Id), Is.EquivalentTo(new[] { group.Id, subgroup.Id })); } } diff --git a/NGitLab/DynamicEnum.cs b/NGitLab/DynamicEnum.cs index 36f94e75..c3568ca5 100644 --- a/NGitLab/DynamicEnum.cs +++ b/NGitLab/DynamicEnum.cs @@ -1,6 +1,4 @@ -#pragma warning disable IDE0250 // Make struct 'readonly', this would be a breaking change -#pragma warning disable MA0102 // Make member readonly, this would be a breaking change -using System; +using System; using System.Collections.Generic; namespace NGitLab; @@ -9,7 +7,7 @@ namespace NGitLab; /// Allows to expose enums without knowing all the possible values /// that can be serialized from the client. /// -public struct DynamicEnum : IEquatable>, IEquatable +public readonly struct DynamicEnum : IEquatable>, IEquatable where TEnum : struct, Enum { /// diff --git a/NGitLab/GitLabClient.cs b/NGitLab/GitLabClient.cs index 3a9f8955..4890e58e 100644 --- a/NGitLab/GitLabClient.cs +++ b/NGitLab/GitLabClient.cs @@ -1,5 +1,4 @@ -using System; -using NGitLab.Extensions; +using NGitLab.Extensions; using NGitLab.Impl; using NGitLab.Models; @@ -94,164 +93,87 @@ private GitLabClient(GitLabCredentials credentials, RequestOptions options) Lint = new LintClient(_api); } - [Obsolete("Use GitLabClient constructor instead")] - public static GitLabClient Connect(string hostUrl, string apiToken) - => new(hostUrl, apiToken); - - [Obsolete("Use GitLabClient constructor instead")] - public static GitLabClient Connect(string hostUrl, string username, string password) - => new(hostUrl, username, password); - public IEventClient GetEvents() => new EventClient(_api, "events"); - public IEventClient GetUserEvents(int userId) + public IEventClient GetUserEvents(long userId) => new EventClient(_api, $"users/{userId.ToStringInvariant()}/events"); - public IEventClient GetProjectEvents(int projectId) - => GetProjectEvents((long)projectId); - public IEventClient GetProjectEvents(ProjectId projectId) => new EventClient(_api, $"projects/{projectId.ValueAsUriParameter()}/events"); - public IRepositoryClient GetRepository(int projectId) - => GetRepository((long)projectId); - public IRepositoryClient GetRepository(ProjectId projectId) => new RepositoryClient(_api, projectId); - public ICommitClient GetCommits(int projectId) - => GetCommits((long)projectId); - public ICommitClient GetCommits(ProjectId projectId) => new CommitClient(_api, projectId); - public ICommitStatusClient GetCommitStatus(int projectId) - => GetCommitStatus((long)projectId); - public ICommitStatusClient GetCommitStatus(ProjectId projectId) => new CommitStatusClient(_api, projectId); - public IPipelineClient GetPipelines(int projectId) - => GetPipelines((long)projectId); - public IPipelineClient GetPipelines(ProjectId projectId) => new PipelineClient(_api, projectId); public IPipelineScheduleClient GetPipelineSchedules(ProjectId projectId) => new PipelineScheduleClient(_api, projectId); - public ITriggerClient GetTriggers(int projectId) - => GetTriggers((long)projectId); - public ITriggerClient GetTriggers(ProjectId projectId) => new TriggerClient(_api, projectId); - public IJobClient GetJobs(int projectId) - => GetJobs((long)projectId); - public IJobClient GetJobs(ProjectId projectId) => new JobClient(_api, projectId); - public IMergeRequestClient GetMergeRequest(int projectId) - => GetMergeRequest((long)projectId); - public IMergeRequestClient GetMergeRequest(ProjectId projectId) => new MergeRequestClient(_api, projectId); public IMergeRequestClient GetGroupMergeRequest(GroupId groupId) => new MergeRequestClient(_api, groupId); - public IMilestoneClient GetMilestone(int projectId) - => GetMilestone((long)projectId); - public IMilestoneClient GetMilestone(ProjectId projectId) => new MilestoneClient(_api, MilestoneScope.Projects, projectId); - public IMilestoneClient GetGroupMilestone(int groupId) - => GetGroupMilestone((long)groupId); - public IMilestoneClient GetGroupMilestone(GroupId groupId) => new MilestoneClient(_api, MilestoneScope.Groups, groupId); - public IReleaseClient GetReleases(int projectId) - => GetReleases((long)projectId); - public IReleaseClient GetReleases(ProjectId projectId) => new ReleaseClient(_api, projectId); - public IProjectIssueNoteClient GetProjectIssueNoteClient(int projectId) - => GetProjectIssueNoteClient((long)projectId); - public IProjectIssueNoteClient GetProjectIssueNoteClient(ProjectId projectId) => new ProjectIssueNoteClient(_api, projectId); - public IEnvironmentClient GetEnvironmentClient(int projectId) - => GetEnvironmentClient((long)projectId); - public IEnvironmentClient GetEnvironmentClient(ProjectId projectId) => new EnvironmentClient(_api, projectId); - public IClusterClient GetClusterClient(int projectId) - => GetClusterClient((long)projectId); - public IClusterClient GetClusterClient(ProjectId projectId) => new ClusterClient(_api, projectId); - public IWikiClient GetWikiClient(int projectId) - => GetWikiClient((long)projectId); - public IWikiClient GetWikiClient(ProjectId projectId) => new WikiClient(_api, projectId); - public IProjectBadgeClient GetProjectBadgeClient(int projectId) - => GetProjectBadgeClient((long)projectId); - public IProjectBadgeClient GetProjectBadgeClient(ProjectId projectId) => new ProjectBadgeClient(_api, projectId); - public IGroupBadgeClient GetGroupBadgeClient(int groupId) - => GetGroupBadgeClient((long)groupId); - public IGroupBadgeClient GetGroupBadgeClient(GroupId groupId) => new GroupBadgeClient(_api, groupId); - public IProjectVariableClient GetProjectVariableClient(int projectId) - => GetProjectVariableClient((long)projectId); - public IProjectVariableClient GetProjectVariableClient(ProjectId projectId) => new ProjectVariableClient(_api, projectId); - public IGroupVariableClient GetGroupVariableClient(int groupId) - => GetGroupVariableClient((long)groupId); - public IGroupVariableClient GetGroupVariableClient(GroupId groupId) => new GroupVariableClient(_api, groupId); - public IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(int projectId) - => GetProjectLevelApprovalRulesClient((long)projectId); - public IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(ProjectId projectId) => new ProjectLevelApprovalRulesClient(_api, projectId); - public IProtectedBranchClient GetProtectedBranchClient(int projectId) - => GetProtectedBranchClient((long)projectId); - public IProtectedBranchClient GetProtectedBranchClient(ProjectId projectId) => new ProtectedBranchClient(_api, projectId); public IProtectedTagClient GetProtectedTagClient(ProjectId projectId) => new ProtectedTagClient(_api, projectId); - public ISearchClient GetGroupSearchClient(int groupId) - => GetGroupSearchClient((long)groupId); - public ISearchClient GetGroupSearchClient(GroupId groupId) => new SearchClient(_api, $"/groups/{groupId.ValueAsUriParameter()}/search"); - public ISearchClient GetProjectSearchClient(int projectId) - => GetProjectSearchClient((long)projectId); - public ISearchClient GetProjectSearchClient(ProjectId projectId) => new SearchClient(_api, $"/projects/{projectId.ValueAsUriParameter()}/search"); diff --git a/NGitLab/IDeploymentClient.cs b/NGitLab/IDeploymentClient.cs index d888df9d..9e401638 100644 --- a/NGitLab/IDeploymentClient.cs +++ b/NGitLab/IDeploymentClient.cs @@ -11,7 +11,7 @@ public interface IDeploymentClient /// Project ID /// Filtering and ordering query /// - IEnumerable Get(int projectId, DeploymentQuery query); + IEnumerable Get(long projectId, DeploymentQuery query); /// /// Return a deployment's associated Merge Requests @@ -19,5 +19,5 @@ public interface IDeploymentClient /// Project ID /// Deployment ID /// - IEnumerable GetMergeRequests(int projectId, int deploymentId); + IEnumerable GetMergeRequests(long projectId, long deploymentId); } diff --git a/NGitLab/IEnvironmentClient.cs b/NGitLab/IEnvironmentClient.cs index e83bf1e3..1e99bd06 100644 --- a/NGitLab/IEnvironmentClient.cs +++ b/NGitLab/IEnvironmentClient.cs @@ -33,7 +33,7 @@ public interface IEnvironmentClient /// - Renaming an environment with the API removed in GitLab 16.0. /// [EditorBrowsable(EditorBrowsableState.Never)] - EnvironmentInfo Edit(int environmentId, string name, string externalUrl); + EnvironmentInfo Edit(long environmentId, string name, string externalUrl); /// /// Updates an existing environment's external_url. @@ -41,20 +41,20 @@ public interface IEnvironmentClient /// The ID of the environment /// The new external url /// The updated environment - EnvironmentInfo Edit(int environmentId, string externalUrl); + EnvironmentInfo Edit(long environmentId, string externalUrl); /// /// Delete an environment. /// /// The ID of the environment - void Delete(int environmentId); + void Delete(long environmentId); /// /// Stop an environment. /// /// The ID of the environment /// The stopped environment - EnvironmentInfo Stop(int environmentId); + EnvironmentInfo Stop(long environmentId); /// /// List environments of the project @@ -68,12 +68,12 @@ public interface IEnvironmentClient /// /// The ID of the environment /// The environment with the corresponding ID - EnvironmentInfo GetById(int environmentId); + EnvironmentInfo GetById(long environmentId); /// /// Get a specific environment /// /// The ID of the environment /// The environment with the corresponding ID - Task GetByIdAsync(int environmentId, CancellationToken cancellationToken = default); + Task GetByIdAsync(long environmentId, CancellationToken cancellationToken = default); } diff --git a/NGitLab/IEpicClient.cs b/NGitLab/IEpicClient.cs index 81c36b7b..7dda484a 100644 --- a/NGitLab/IEpicClient.cs +++ b/NGitLab/IEpicClient.cs @@ -11,7 +11,7 @@ public interface IEpicClient /// Group ID /// Filtering and ordering query /// - IEnumerable Get(int groupId, EpicQuery query); + IEnumerable Get(long groupId, EpicQuery query); /// /// Return a group epic @@ -19,14 +19,14 @@ public interface IEpicClient /// Group ID /// Epic ID /// - Epic Get(int groupId, int epicId); + Epic Get(long groupId, long epicId); /// /// Return all issues that are assigned to an epic /// /// Group ID /// Epic ID - GitLabCollectionResponse GetIssuesAsync(int groupId, int epicId); + GitLabCollectionResponse GetIssuesAsync(long groupId, long epicId); /// /// Create an epic @@ -34,7 +34,7 @@ public interface IEpicClient /// Group ID /// Epic to create /// - Epic Create(int groupId, EpicCreate epic); + Epic Create(long groupId, EpicCreate epic); /// /// Update an epic @@ -42,5 +42,5 @@ public interface IEpicClient /// Group ID /// New properties values /// - Epic Edit(int groupId, EpicEdit epicEdit); + Epic Edit(long groupId, EpicEdit epicEdit); } diff --git a/NGitLab/IGitLabClient.cs b/NGitLab/IGitLabClient.cs index b26d2e20..cba32e11 100644 --- a/NGitLab/IGitLabClient.cs +++ b/NGitLab/IGitLabClient.cs @@ -1,5 +1,4 @@ -using System.ComponentModel; -using NGitLab.Models; +using NGitLab.Models; namespace NGitLab; @@ -31,71 +30,35 @@ public interface IGitLabClient /// /// Returns the events done by the specified user. /// - IEventClient GetUserEvents(int userId); - - /// - /// Returns the events that occurred in the specified project. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - IEventClient GetProjectEvents(int projectId); + IEventClient GetUserEvents(long userId); /// /// Returns the events that occurred in the specified project. /// IEventClient GetProjectEvents(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IRepositoryClient GetRepository(int projectId); - IRepositoryClient GetRepository(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - ICommitClient GetCommits(int projectId); - ICommitClient GetCommits(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - ICommitStatusClient GetCommitStatus(int projectId); - ICommitStatusClient GetCommitStatus(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IPipelineClient GetPipelines(int projectId); - IPipelineClient GetPipelines(ProjectId projectId); IPipelineScheduleClient GetPipelineSchedules(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - ITriggerClient GetTriggers(int projectId); - ITriggerClient GetTriggers(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IJobClient GetJobs(int projectId); - IJobClient GetJobs(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IMergeRequestClient GetMergeRequest(int projectId); - IMergeRequestClient GetMergeRequest(ProjectId projectId); IMergeRequestClient GetGroupMergeRequest(GroupId groupId); - [EditorBrowsable(EditorBrowsableState.Never)] - IMilestoneClient GetMilestone(int projectId); - IMilestoneClient GetMilestone(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IMilestoneClient GetGroupMilestone(int groupId); - IMilestoneClient GetGroupMilestone(GroupId groupId); - [EditorBrowsable(EditorBrowsableState.Never)] - IReleaseClient GetReleases(int projectId); - IReleaseClient GetReleases(ProjectId projectId); IMembersClient Members { get; } @@ -116,66 +79,30 @@ public interface IGitLabClient ISearchClient AdvancedSearch { get; } - [EditorBrowsable(EditorBrowsableState.Never)] - IProjectIssueNoteClient GetProjectIssueNoteClient(int projectId); - IProjectIssueNoteClient GetProjectIssueNoteClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IEnvironmentClient GetEnvironmentClient(int projectId); - IEnvironmentClient GetEnvironmentClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IClusterClient GetClusterClient(int projectId); - IClusterClient GetClusterClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IWikiClient GetWikiClient(int projectId); - IWikiClient GetWikiClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IProjectBadgeClient GetProjectBadgeClient(int projectId); - IProjectBadgeClient GetProjectBadgeClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IGroupBadgeClient GetGroupBadgeClient(int groupId); - IGroupBadgeClient GetGroupBadgeClient(GroupId groupId); - [EditorBrowsable(EditorBrowsableState.Never)] - IProjectVariableClient GetProjectVariableClient(int projectId); - IProjectVariableClient GetProjectVariableClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IGroupVariableClient GetGroupVariableClient(int groupId); - IGroupVariableClient GetGroupVariableClient(GroupId groupId); - [EditorBrowsable(EditorBrowsableState.Never)] - IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(int projectId); - IProjectLevelApprovalRulesClient GetProjectLevelApprovalRulesClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - IProtectedBranchClient GetProtectedBranchClient(int projectId); - IProtectedBranchClient GetProtectedBranchClient(ProjectId projectId); IProtectedTagClient GetProtectedTagClient(ProjectId projectId); - [EditorBrowsable(EditorBrowsableState.Never)] - public ISearchClient GetGroupSearchClient(int groupId); - public ISearchClient GetGroupSearchClient(GroupId groupId); - [EditorBrowsable(EditorBrowsableState.Never)] - public ISearchClient GetProjectSearchClient(int projectId); - public ISearchClient GetProjectSearchClient(ProjectId projectId); public IGroupHooksClient GetGroupHooksClient(GroupId groupId); diff --git a/NGitLab/IGroupBadgeClient.cs b/NGitLab/IGroupBadgeClient.cs index 5f583867..1773dc0b 100644 --- a/NGitLab/IGroupBadgeClient.cs +++ b/NGitLab/IGroupBadgeClient.cs @@ -7,11 +7,11 @@ public interface IGroupBadgeClient { IEnumerable All { get; } - Badge this[int id] { get; } + Badge this[long id] { get; } Badge Create(BadgeCreate badge); - Badge Update(int id, BadgeUpdate badge); + Badge Update(long id, BadgeUpdate badge); - void Delete(int id); + void Delete(long id); } diff --git a/NGitLab/IGroupHooksClient.cs b/NGitLab/IGroupHooksClient.cs index 1bedf782..b5e6de6a 100644 --- a/NGitLab/IGroupHooksClient.cs +++ b/NGitLab/IGroupHooksClient.cs @@ -7,11 +7,11 @@ public interface IGroupHooksClient { IEnumerable All { get; } - GroupHook this[int hookId] { get; } + GroupHook this[long hookId] { get; } GroupHook Create(GroupHookUpsert hook); - GroupHook Update(int hookId, GroupHookUpsert hook); + GroupHook Update(long hookId, GroupHookUpsert hook); - void Delete(int hookId); + void Delete(long hookId); } diff --git a/NGitLab/IGroupsClient.cs b/NGitLab/IGroupsClient.cs index 2309ca95..42e5ef91 100644 --- a/NGitLab/IGroupsClient.cs +++ b/NGitLab/IGroupsClient.cs @@ -48,14 +48,14 @@ public interface IGroupsClient Task> PageAsync(PageQuery query, CancellationToken cancellationToken = default); /// - Group this[int id] { get; } + Group this[long id] { get; } /// Group this[string fullPath] { get; } /// /// The group's id - Task GetByIdAsync(int id, CancellationToken cancellationToken = default); + Task GetByIdAsync(long id, CancellationToken cancellationToken = default); /// /// The group's path @@ -76,7 +76,7 @@ public interface IGroupsClient /// /// The group's id - GitLabCollectionResponse GetSubgroupsByIdAsync(int id, SubgroupQuery query = null); + GitLabCollectionResponse GetSubgroupsByIdAsync(long id, SubgroupQuery query = null); /// /// The group's path @@ -126,11 +126,11 @@ public interface IGroupsClient /// The group's id. /// The search criteria. [Obsolete("Use SearchProjectsAsync instead")] - IEnumerable SearchProjects(int groupId, string search); + IEnumerable SearchProjects(long groupId, string search); /// /// The group's id. - GitLabCollectionResponse GetProjectsAsync(int groupId, GroupProjectsQuery query); + GitLabCollectionResponse GetProjectsAsync(long groupId, GroupProjectsQuery query); /// /// Gets a list of projects in this group. When accessed without authentication, only public projects are returned. @@ -156,7 +156,7 @@ public interface IGroupsClient Task> PageProjectsAsync(GroupId groupId, PageQuery query, CancellationToken cancellationToken = default); /// - void Delete(int id); + void Delete(long id); /// /// Removes a group. @@ -164,10 +164,10 @@ public interface IGroupsClient /// /// The group's id. /// The cancellation token. - Task DeleteAsync(int id, CancellationToken cancellationToken = default); + Task DeleteAsync(long id, CancellationToken cancellationToken = default); /// - Group Update(int id, GroupUpdate groupUpdate); + Group Update(long id, GroupUpdate groupUpdate); /// /// Updates an existing group. @@ -176,10 +176,10 @@ public interface IGroupsClient /// The group's id. /// The properties to update. /// The cancellation token. - Task UpdateAsync(int id, GroupUpdate groupUpdate, CancellationToken cancellationToken = default); + Task UpdateAsync(long id, GroupUpdate groupUpdate, CancellationToken cancellationToken = default); /// - void Restore(int id); + void Restore(long id); /// /// Restores a group marked for deletion. @@ -187,5 +187,5 @@ public interface IGroupsClient /// /// The group's id. /// The cancellation token. - Task RestoreAsync(int id, CancellationToken cancellationToken = default); + Task RestoreAsync(long id, CancellationToken cancellationToken = default); } diff --git a/NGitLab/IIssueClient.cs b/NGitLab/IIssueClient.cs index b842b796..5a643574 100644 --- a/NGitLab/IIssueClient.cs +++ b/NGitLab/IIssueClient.cs @@ -15,13 +15,13 @@ public interface IIssueClient /// /// Get a list of issues for the specified project. /// - IEnumerable ForProject(int projectId); + IEnumerable ForProject(long projectId); - GitLabCollectionResponse ForProjectAsync(int projectId); + GitLabCollectionResponse ForProjectAsync(long projectId); - GitLabCollectionResponse ForGroupsAsync(int groupId); + GitLabCollectionResponse ForGroupsAsync(long groupId); - GitLabCollectionResponse ForGroupsAsync(int groupId, IssueQuery query); + GitLabCollectionResponse ForGroupsAsync(long groupId, IssueQuery query); /// /// Return a single issue for a project given project. @@ -30,9 +30,9 @@ public interface IIssueClient /// /// /// The issue that corresponds to the project id and issue id - Issue Get(int projectId, int issueIid); + Issue Get(long projectId, long issueIid); - Task GetAsync(int projectId, int issueIid, CancellationToken cancellationToken = default); + Task GetAsync(long projectId, long issueIid, CancellationToken cancellationToken = default); /// /// Return issues for a given query. @@ -55,9 +55,9 @@ public interface IIssueClient /// /// /// the query's related issues - IEnumerable Get(int projectId, IssueQuery query); + IEnumerable Get(long projectId, IssueQuery query); - GitLabCollectionResponse GetAsync(int projectId, IssueQuery query); + GitLabCollectionResponse GetAsync(long projectId, IssueQuery query); /// /// Return a single issue, only for administrators. @@ -65,9 +65,9 @@ public interface IIssueClient /// /// /// The issue that corresponds to the issue id - Issue GetById(int issueId); + Issue GetById(long issueId); - Task GetByIdAsync(int issueId, CancellationToken cancellationToken = default); + Task GetByIdAsync(long issueId, CancellationToken cancellationToken = default); /// /// Add an issue witht he proposed title to the GitLab list for the selected proejct id. @@ -96,9 +96,9 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// A collection of the resource label events linked to this issue. - IEnumerable ResourceLabelEvents(int projectId, int issueIid); + IEnumerable ResourceLabelEvents(long projectId, long issueIid); - GitLabCollectionResponse ResourceLabelEventsAsync(int projectId, int issueIid); + GitLabCollectionResponse ResourceLabelEventsAsync(long projectId, long issueIid); /// /// Gets the resource milestone events. @@ -109,9 +109,9 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// A collection of the resource milestone events linked to this issue. - IEnumerable ResourceMilestoneEvents(int projectId, int issueIid); + IEnumerable ResourceMilestoneEvents(long projectId, long issueIid); - GitLabCollectionResponse ResourceMilestoneEventsAsync(int projectId, int issueIid); + GitLabCollectionResponse ResourceMilestoneEventsAsync(long projectId, long issueIid); /// /// Gets the resource state events. @@ -122,9 +122,9 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// A collection of the resource state events linked to this issue. - IEnumerable ResourceStateEvents(int projectId, int issueIid); + IEnumerable ResourceStateEvents(long projectId, long issueIid); - GitLabCollectionResponse ResourceStateEventsAsync(int projectId, int issueIid); + GitLabCollectionResponse ResourceStateEventsAsync(long projectId, long issueIid); /// /// Get all merge requests that are related to a particular issue. @@ -132,7 +132,7 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// The list of MR that are related this issue. - IEnumerable RelatedTo(int projectId, int issueIid); + IEnumerable RelatedTo(long projectId, long issueIid); /// /// Get all Issues that are linked to a particular issue of particular project. @@ -140,7 +140,7 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// The list of Issues linked to this issue. - GitLabCollectionResponse LinkedToAsync(int projectId, int issueId); + GitLabCollectionResponse LinkedToAsync(long projectId, long issueId); /// /// Create links between Issues. @@ -149,9 +149,9 @@ public interface IIssueClient /// The id of the issue in the project's scope. /// The target project id. /// The target id of the issue to link to. - bool CreateLinkBetweenIssues(int sourceProjectId, int sourceIssueId, int targetProjectId, int targetIssueId); + bool CreateLinkBetweenIssues(long sourceProjectId, long sourceIssueId, long targetProjectId, long targetIssueId); - GitLabCollectionResponse RelatedToAsync(int projectId, int issueIid); + GitLabCollectionResponse RelatedToAsync(long projectId, long issueIid); /// /// Get all merge requests that close a particular issue when merged. @@ -159,9 +159,9 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// The list of MR that closed this issue. - IEnumerable ClosedBy(int projectId, int issueIid); + IEnumerable ClosedBy(long projectId, long issueIid); - GitLabCollectionResponse ClosedByAsync(int projectId, int issueIid); + GitLabCollectionResponse ClosedByAsync(long projectId, long issueIid); /// /// Get time tracking statistics @@ -169,7 +169,7 @@ public interface IIssueClient /// The project id. /// The id of the issue in the project's scope. /// The time tracking statistics of the issue. - Task TimeStatsAsync(int projectId, int issueIid, CancellationToken cancellationToken = default); + Task TimeStatsAsync(long projectId, long issueIid, CancellationToken cancellationToken = default); /// /// Clone the issue to given project @@ -179,7 +179,7 @@ public interface IIssueClient /// Destination information /// /// - Task CloneAsync(int projectId, int issueIid, IssueClone issueClone, CancellationToken cancellationToken = default); + Task CloneAsync(long projectId, long issueIid, IssueClone issueClone, CancellationToken cancellationToken = default); /// /// Get Participants @@ -187,7 +187,7 @@ public interface IIssueClient /// The project id /// The id of the issue in the project's scope. /// The participants of the issue. - IEnumerable GetParticipants(ProjectId projectId, int issueIid); + IEnumerable GetParticipants(ProjectId projectId, long issueIid); /// /// Unsubscribe to the issue @@ -195,5 +195,5 @@ public interface IIssueClient /// The project id /// The id of the issue in the project's scope. /// The issue that corresponds to the project id and issue id - Issue Unsubscribe(ProjectId projectId, int issueIid); + Issue Unsubscribe(ProjectId projectId, long issueIid); } diff --git a/NGitLab/IJobClient.cs b/NGitLab/IJobClient.cs index a375b49e..93986509 100644 --- a/NGitLab/IJobClient.cs +++ b/NGitLab/IJobClient.cs @@ -13,21 +13,21 @@ public interface IJobClient GitLabCollectionResponse GetJobsAsync(JobQuery query); - Job RunAction(int jobId, JobAction action); + Job RunAction(long jobId, JobAction action); - Task RunActionAsync(int jobId, JobAction action, CancellationToken cancellationToken = default); + Task RunActionAsync(long jobId, JobAction action, CancellationToken cancellationToken = default); - Job Get(int jobId); + Job Get(long jobId); - Task GetAsync(int jobId, CancellationToken cancellationToken = default); + Task GetAsync(long jobId, CancellationToken cancellationToken = default); - byte[] GetJobArtifacts(int jobId); + byte[] GetJobArtifacts(long jobId); - byte[] GetJobArtifact(int jobId, string path); + byte[] GetJobArtifact(long jobId, string path); byte[] GetJobArtifact(JobArtifactQuery query); - string GetTrace(int jobId); + string GetTrace(long jobId); - Task GetTraceAsync(int jobId, CancellationToken cancellationToken = default); + Task GetTraceAsync(long jobId, CancellationToken cancellationToken = default); } diff --git a/NGitLab/ILabelClient.cs b/NGitLab/ILabelClient.cs index 9273e5dd..707ebda6 100644 --- a/NGitLab/ILabelClient.cs +++ b/NGitLab/ILabelClient.cs @@ -11,14 +11,14 @@ public interface ILabelClient /// /// /// - IEnumerable