Skip to content

Commit fa13df0

Browse files
committed
formatted the code
1 parent a2fe900 commit fa13df0

File tree

10 files changed

+38
-40
lines changed

10 files changed

+38
-40
lines changed

src/GitReleaseManager.Core.Tests/Provider/GitHubProviderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using NotFoundException = GitReleaseManager.Core.Exceptions.NotFoundException;
2121
using RateLimit = GitReleaseManager.Core.Model.RateLimit;
2222
using Release = GitReleaseManager.Core.Model.Release;
23-
using ReleaseAsset= GitReleaseManager.Core.Model.ReleaseAsset;
23+
using ReleaseAsset = GitReleaseManager.Core.Model.ReleaseAsset;
2424
using ReleaseAssetUpload = GitReleaseManager.Core.Model.ReleaseAssetUpload;
2525

2626
namespace GitReleaseManager.Core.Tests.Provider

src/GitReleaseManager.Core.Tests/VcsServiceTests.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@ public async Task Should_Create_Release_From_Milestone_With_Assets()
350350
null,
351351
_assets,
352352
false,
353-
null
354-
).ConfigureAwait(false);
353+
null).ConfigureAwait(false);
355354
result.ShouldBeSameAs(release);
356355

357356
await _releaseNotesBuilder.Received(1).BuildReleaseNotesAsync(OWNER, REPOSITORY, MILESTONE_TITLE, ReleaseTemplates.DEFAULT_NAME).ConfigureAwait(false);

src/GitReleaseManager.Core/Exceptions/InvalidIssuesException.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ protected InvalidIssuesException(
3737
{
3838
}
3939
}
40-
}
40+
}

src/GitReleaseManager.Core/MappingProfiles/GitLabProfile.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ public GitLabProfile()
4545
.ReverseMap();
4646
}
4747
}
48-
}
48+
}

src/GitReleaseManager.Core/Model/VcsProvider.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ public enum VcsProvider
55
GitHub = 0,
66
GitLab = 1,
77
}
8-
}
8+
}

src/GitReleaseManager.Core/Options/BaseSubOptions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ protected BaseSubOptions()
99
{
1010
var ciEnvironmentVariable = Environment.GetEnvironmentVariable("CI");
1111

12-
bool isCiSystem;
13-
if (!string.IsNullOrEmpty(ciEnvironmentVariable) && bool.TryParse(ciEnvironmentVariable, out isCiSystem))
12+
if (!string.IsNullOrEmpty(ciEnvironmentVariable) && bool.TryParse(ciEnvironmentVariable, out bool isCiSystem))
1413
{
1514
IsCISystem = isCiSystem;
1615
}

src/GitReleaseManager.Core/Provider/GitHubProvider.cs

+26-26
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ public GitHubProvider(IGitHubClient gitHubClient, IMapper mapper)
3737

3838
public Task DeleteAssetAsync(string owner, string repository, ReleaseAsset asset)
3939
{
40-
return ExecuteAsync(async () =>
40+
return GitHubProvider.ExecuteAsync(async () =>
4141
{
4242
await _gitHubClient.Repository.Release.DeleteAsset(owner, repository, asset.Id).ConfigureAwait(false);
4343
});
4444
}
4545

4646
public Task UploadAssetAsync(Release release, ReleaseAssetUpload releaseAssetUpload)
4747
{
48-
return ExecuteAsync(async () =>
48+
return GitHubProvider.ExecuteAsync(async () =>
4949
{
5050
var octokitRelease = _mapper.Map<Octokit.Release>(release);
5151
var octokitReleaseAssetUpload = _mapper.Map<Octokit.ReleaseAssetUpload>(releaseAssetUpload);
@@ -56,7 +56,7 @@ public Task UploadAssetAsync(Release release, ReleaseAssetUpload releaseAssetUpl
5656

5757
public Task<int> GetCommitsCountAsync(string owner, string repository, string @base, string head)
5858
{
59-
return ExecuteAsync(async () =>
59+
return GitHubProvider.ExecuteAsync(async () =>
6060
{
6161
try
6262
{
@@ -87,15 +87,15 @@ public string GetCommitsUrl(string owner, string repository, string head, string
8787

8888
public Task CreateIssueCommentAsync(string owner, string repository, Issue issue, string comment)
8989
{
90-
return ExecuteAsync(async () =>
90+
return GitHubProvider.ExecuteAsync(async () =>
9191
{
9292
await _gitHubClient.Issue.Comment.Create(owner, repository, issue.PublicNumber, comment).ConfigureAwait(false);
9393
});
9494
}
9595

9696
public Task<IEnumerable<Issue>> GetIssuesAsync(string owner, string repository, Milestone milestone, ItemStateFilter itemStateFilter = ItemStateFilter.All)
9797
{
98-
return ExecuteAsync(async () =>
98+
return GitHubProvider.ExecuteAsync(async () =>
9999
{
100100
var openIssueRequest = new RepositoryIssueRequest
101101
{
@@ -109,7 +109,7 @@ public Task<IEnumerable<Issue>> GetIssuesAsync(string owner, string repository,
109109

110110
do
111111
{
112-
var options = GetApiOptions(startPage);
112+
var options = GitHubProvider.GetApiOptions(startPage);
113113
results = await _gitHubClient.Issue.GetAllForRepository(owner, repository, openIssueRequest, options).ConfigureAwait(false);
114114

115115
issues.AddRange(results);
@@ -123,15 +123,15 @@ public Task<IEnumerable<Issue>> GetIssuesAsync(string owner, string repository,
123123

124124
public Task<IEnumerable<IssueComment>> GetIssueCommentsAsync(string owner, string repository, Issue issue)
125125
{
126-
return ExecuteAsync(async () =>
126+
return GitHubProvider.ExecuteAsync(async () =>
127127
{
128128
var startPage = 1;
129129
var comments = new List<Octokit.IssueComment>();
130130
IReadOnlyList<Octokit.IssueComment> results;
131131

132132
do
133133
{
134-
var options = GetApiOptions(startPage);
134+
var options = GitHubProvider.GetApiOptions(startPage);
135135
results = await _gitHubClient.Issue.Comment.GetAllForIssue(owner, repository, issue.PublicNumber, options).ConfigureAwait(false);
136136

137137
comments.AddRange(results);
@@ -145,7 +145,7 @@ public Task<IEnumerable<IssueComment>> GetIssueCommentsAsync(string owner, strin
145145

146146
public Task CreateLabelAsync(string owner, string repository, Label label)
147147
{
148-
return ExecuteAsync(async () =>
148+
return GitHubProvider.ExecuteAsync(async () =>
149149
{
150150
var newLabel = _mapper.Map<NewLabel>(label);
151151

@@ -155,23 +155,23 @@ public Task CreateLabelAsync(string owner, string repository, Label label)
155155

156156
public Task DeleteLabelAsync(string owner, string repository, Label label)
157157
{
158-
return ExecuteAsync(async () =>
158+
return GitHubProvider.ExecuteAsync(async () =>
159159
{
160160
await _gitHubClient.Issue.Labels.Delete(owner, repository, label.Name).ConfigureAwait(false);
161161
});
162162
}
163163

164164
public Task<IEnumerable<Label>> GetLabelsAsync(string owner, string repository)
165165
{
166-
return ExecuteAsync(async () =>
166+
return GitHubProvider.ExecuteAsync(async () =>
167167
{
168168
var startPage = 1;
169169
var labels = new List<Octokit.Label>();
170170
IReadOnlyList<Octokit.Label> results;
171171

172172
do
173173
{
174-
var options = GetApiOptions(startPage);
174+
var options = GitHubProvider.GetApiOptions(startPage);
175175
results = await _gitHubClient.Issue.Labels.GetAllForRepository(owner, repository, options).ConfigureAwait(false);
176176

177177
labels.AddRange(results);
@@ -185,7 +185,7 @@ public Task<IEnumerable<Label>> GetLabelsAsync(string owner, string repository)
185185

186186
public Task<Milestone> GetMilestoneAsync(string owner, string repository, string milestoneTitle, ItemStateFilter itemStateFilter = ItemStateFilter.All)
187187
{
188-
return ExecuteAsync(async () =>
188+
return GitHubProvider.ExecuteAsync(async () =>
189189
{
190190
var milestones = await GetMilestonesAsync(owner, repository, itemStateFilter).ConfigureAwait(false);
191191
var foundMilestone = milestones.FirstOrDefault(m => m.Title == milestoneTitle);
@@ -201,7 +201,7 @@ public Task<Milestone> GetMilestoneAsync(string owner, string repository, string
201201

202202
public Task<IEnumerable<Milestone>> GetMilestonesAsync(string owner, string repository, ItemStateFilter itemStateFilter = ItemStateFilter.All)
203203
{
204-
return ExecuteAsync(async () =>
204+
return GitHubProvider.ExecuteAsync(async () =>
205205
{
206206
var request = new MilestoneRequest { State = (Octokit.ItemStateFilter)itemStateFilter };
207207

@@ -211,7 +211,7 @@ public Task<IEnumerable<Milestone>> GetMilestonesAsync(string owner, string repo
211211

212212
do
213213
{
214-
var options = GetApiOptions(startPage);
214+
var options = GitHubProvider.GetApiOptions(startPage);
215215
results = await _gitHubClient.Issue.Milestone.GetAllForRepository(owner, repository, request, options).ConfigureAwait(false);
216216

217217
milestones.AddRange(results);
@@ -225,7 +225,7 @@ public Task<IEnumerable<Milestone>> GetMilestonesAsync(string owner, string repo
225225

226226
public Task SetMilestoneStateAsync(string owner, string repository, Milestone milestone, ItemState itemState)
227227
{
228-
return ExecuteAsync(async () =>
228+
return GitHubProvider.ExecuteAsync(async () =>
229229
{
230230
var update = new MilestoneUpdate { State = (Octokit.ItemState)itemState };
231231
await _gitHubClient.Issue.Milestone.Update(owner, repository, milestone.PublicNumber, update).ConfigureAwait(false);
@@ -234,7 +234,7 @@ public Task SetMilestoneStateAsync(string owner, string repository, Milestone mi
234234

235235
public Task<Release> CreateReleaseAsync(string owner, string repository, Release release)
236236
{
237-
return ExecuteAsync(async () =>
237+
return GitHubProvider.ExecuteAsync(async () =>
238238
{
239239
var newRelease = _mapper.Map<NewRelease>(release);
240240
var octokitRelease = await _gitHubClient.Repository.Release.Create(owner, repository, newRelease).ConfigureAwait(false);
@@ -245,15 +245,15 @@ public Task<Release> CreateReleaseAsync(string owner, string repository, Release
245245

246246
public Task DeleteReleaseAsync(string owner, string repository, Release release)
247247
{
248-
return ExecuteAsync(async () =>
248+
return GitHubProvider.ExecuteAsync(async () =>
249249
{
250250
await _gitHubClient.Repository.Release.Delete(owner, repository, release.Id).ConfigureAwait(false);
251251
});
252252
}
253253

254254
public Task<Release> GetReleaseAsync(string owner, string repository, string tagName)
255255
{
256-
return ExecuteAsync(async () =>
256+
return GitHubProvider.ExecuteAsync(async () =>
257257
{
258258
// This method wants to return a single Release, that has the tagName that is requested.
259259
// The obvious thing to do here would be to use Repository.Release.Get, however, this doesn't
@@ -270,15 +270,15 @@ public Task<Release> GetReleaseAsync(string owner, string repository, string tag
270270

271271
public Task<IEnumerable<Release>> GetReleasesAsync(string owner, string repository, bool skipPrereleases)
272272
{
273-
return ExecuteAsync(async () =>
273+
return GitHubProvider.ExecuteAsync(async () =>
274274
{
275275
var startPage = 1;
276276
var releases = new List<Octokit.Release>();
277277
IReadOnlyList<Octokit.Release> results;
278278

279279
do
280280
{
281-
var options = GetApiOptions(startPage);
281+
var options = GitHubProvider.GetApiOptions(startPage);
282282
results = await _gitHubClient.Repository.Release.GetAll(owner, repository, options).ConfigureAwait(false);
283283

284284
if (skipPrereleases)
@@ -302,7 +302,7 @@ public Task<IEnumerable<Release>> GetReleasesAsync(string owner, string reposito
302302

303303
public Task PublishReleaseAsync(string owner, string repository, string tagName, Release release)
304304
{
305-
return ExecuteAsync(async () =>
305+
return GitHubProvider.ExecuteAsync(async () =>
306306
{
307307
var update = new ReleaseUpdate
308308
{
@@ -316,7 +316,7 @@ public Task PublishReleaseAsync(string owner, string repository, string tagName,
316316

317317
public Task UpdateReleaseAsync(string owner, string repository, Release release)
318318
{
319-
return ExecuteAsync(async () =>
319+
return GitHubProvider.ExecuteAsync(async () =>
320320
{
321321
var update = new ReleaseUpdate
322322
{
@@ -356,7 +356,7 @@ public string GetIssueType(Issue issue)
356356
return issue.IsPullRequest ? "Pull Request" : "Issue";
357357
}
358358

359-
private async Task ExecuteAsync(Func<Task> action)
359+
private static async Task ExecuteAsync(Func<Task> action)
360360
{
361361
try
362362
{
@@ -376,7 +376,7 @@ private async Task ExecuteAsync(Func<Task> action)
376376
}
377377
}
378378

379-
private async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
379+
private static async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
380380
{
381381
try
382382
{
@@ -396,7 +396,7 @@ private async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
396396
}
397397
}
398398

399-
private ApiOptions GetApiOptions(int startPage = 1, int pageSize = 100, int pageCount = 1)
399+
private static ApiOptions GetApiOptions(int startPage = 1, int pageSize = 100, int pageCount = 1)
400400
{
401401
return new ApiOptions
402402
{

src/GitReleaseManager.Core/Provider/GitLabProvider.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ private long GetGitLabProjectId(string owner, string repository)
405405
return _projectId.Value;
406406
}
407407

408-
private async Task ExecuteAsync(Func<Task> action)
408+
private static async Task ExecuteAsync(Func<Task> action)
409409
{
410410
try
411411
{
@@ -421,7 +421,7 @@ private async Task ExecuteAsync(Func<Task> action)
421421
}
422422
}
423423

424-
private async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
424+
private static async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
425425
{
426426
try
427427
{
@@ -437,4 +437,4 @@ private async Task<T> ExecuteAsync<T>(Func<Task<T>> action)
437437
}
438438
}
439439
}
440-
}
440+
}

src/GitReleaseManager.Core/ReleaseNotes/ReleaseNotesBuilder.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ private string GetValidLabel(string label, int issuesCount)
143143

144144
foreach (var issueLabel in issue.Labels)
145145
{
146-
includedIssuesCount += _configuration.IssueLabelsInclude.Count(issueToInclude => issueLabel.Name.ToUpperInvariant() == issueToInclude.ToUpperInvariant());
146+
includedIssuesCount += _configuration.IssueLabelsInclude.Count(issueToInclude => string.Equals(issueLabel.Name, issueToInclude, StringComparison.InvariantCultureIgnoreCase));
147147

148-
isExcluded = isExcluded || _configuration.IssueLabelsExclude.Any(issueToExclude => issueLabel.Name.ToUpperInvariant() == issueToExclude.ToUpperInvariant());
148+
isExcluded = isExcluded || _configuration.IssueLabelsExclude.Any(issueToExclude => string.Equals(issueLabel.Name, issueToExclude, StringComparison.InvariantCultureIgnoreCase));
149149
}
150150

151151
if (isExcluded)

src/GitReleaseManager.IntegrationTests/GitLabProviderIntegrationTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ public async Task Should_Get_Commits_Count()
108108
// result.ShouldBeGreaterThan(0);
109109
}
110110
}
111-
}
111+
}

0 commit comments

Comments
 (0)