Skip to content

Commit

Permalink
Suppressed message
Browse files Browse the repository at this point in the history
  • Loading branch information
@credfeto
credfeto committed Jan 24, 2024
1 parent d0cd2ba commit 9e0912a
Showing 1 changed file with 11 additions and 35 deletions.
46 changes: 11 additions & 35 deletions src/Credfeto.DotNet.Repo.Tools.TemplateUpdate/Services/BulkTemplateUpdater.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,7 @@ public sealed class BulkTemplateUpdater : IBulkTemplateUpdater

IReadOnlyList<PackageUpdate> packages = await this._bulkPackageConfigLoader.LoadAsync(path: packagesFileName, cancellationToken: cancellationToken);

using (IGitRepository templateRepo =
await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: workFolder, repoUrl: templateRepository, cancellationToken: cancellationToken))
using (IGitRepository templateRepo = await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: workFolder, repoUrl: templateRepository, cancellationToken: cancellationToken))
{
TemplateUpdateContext updateContext = await this.BuildUpdateContextAsync(templateRepo: templateRepo,
workFolder: workFolder,
Expand All @@ -97,10 +96,7 @@ await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: workFolder, repoUrl:
}
}

private async ValueTask UpdateRepositoriesAsync(TemplateUpdateContext updateContext,
IReadOnlyList<string> repositories,
IReadOnlyList<PackageUpdate> packages,
CancellationToken cancellationToken)
private async ValueTask UpdateRepositoriesAsync(TemplateUpdateContext updateContext, IReadOnlyList<string> repositories, IReadOnlyList<PackageUpdate> packages, CancellationToken cancellationToken)
{
try
{
Expand Down Expand Up @@ -138,8 +134,7 @@ private async ValueTask UpdateRepositoryAsync(TemplateUpdateContext updateContex
{
this._logger.LogProcessingRepo(repo);

using (IGitRepository repository =
await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: updateContext.WorkFolder, repoUrl: repo, cancellationToken: cancellationToken))
using (IGitRepository repository = await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: updateContext.WorkFolder, repoUrl: repo, cancellationToken: cancellationToken))
{
if (!ChangeLogDetector.TryFindChangeLog(repository: repository.Active, out string? changeLogFileName))
{
Expand All @@ -158,10 +153,7 @@ await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: updateContext.WorkFol
}
}

private async ValueTask ProcessRepoUpdatesAsync(TemplateUpdateContext updateContext,
RepoContext repoContext,
IReadOnlyList<PackageUpdate> packages,
CancellationToken cancellationToken)
private async ValueTask ProcessRepoUpdatesAsync(TemplateUpdateContext updateContext, RepoContext repoContext, IReadOnlyList<PackageUpdate> packages, CancellationToken cancellationToken)
{
string? lastKnownGoodBuild = this._trackingCache.Get(repoContext.ClonePath);

Expand All @@ -182,10 +174,7 @@ await this._gitRepositoryFactory.OpenOrCloneAsync(workDir: updateContext.WorkFol
else
{
this._logger.LogNoDotNetFilesFound();
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext,
updateContext: updateContext,
value: repoContext.Repository.HeadRev,
cancellationToken: cancellationToken);
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext, updateContext: updateContext, value: repoContext.Repository.HeadRev, cancellationToken: cancellationToken);
}
}

Expand Down Expand Up @@ -305,6 +294,7 @@ private static IEnumerable<CopyInstruction> IncludeFilesInSource(FileContext fil
return [];
}

[SuppressMessage(category: "Meziantou.Analyzer", checkId: "MA0051: Method is too long", Justification = "Debug logging")]
private async ValueTask UpdateDotNetAsync(TemplateUpdateContext updateContext,
RepoContext repoContext,
IReadOnlyList<PackageUpdate> packages,
Expand All @@ -323,17 +313,13 @@ private static IEnumerable<CopyInstruction> IncludeFilesInSource(FileContext fil

if (File.Exists(repoGlobalJson))
{
DotNetVersionSettings repoDotNetSettings =
await this._globalJson.LoadGlobalJsonAsync(baseFolder: repoContext.WorkingDirectory, cancellationToken: cancellationToken);
DotNetVersionSettings repoDotNetSettings = await this._globalJson.LoadGlobalJsonAsync(baseFolder: repoContext.WorkingDirectory, cancellationToken: cancellationToken);
await this._dotNetSolutionCheck.PreCheckAsync(solutions: solutions, dotNetSettings: repoDotNetSettings, cancellationToken: cancellationToken);

await this._dotNetBuild.BuildAsync(basePath: sourceDirectory, buildSettings: buildSettings, cancellationToken: cancellationToken);

lastKnownGoodBuild = repoContext.Repository.HeadRev;
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext,
updateContext: updateContext,
value: lastKnownGoodBuild,
cancellationToken: cancellationToken);
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext, updateContext: updateContext, value: lastKnownGoodBuild, cancellationToken: cancellationToken);
}
}

Expand Down Expand Up @@ -378,10 +364,7 @@ private static IEnumerable<CopyInstruction> IncludeFilesInSource(FileContext fil
}
}

private async Task<int> UpdateResharperSettingsAsync(RepoContext repoContext,
TemplateUpdateContext updateContext,
IReadOnlyList<string> solutions,
CancellationToken cancellationToken)
private async Task<int> UpdateResharperSettingsAsync(RepoContext repoContext, TemplateUpdateContext updateContext, IReadOnlyList<string> solutions, CancellationToken cancellationToken)
{
const string dotSettingsExtension = ".DotSettings";

Expand Down Expand Up @@ -456,10 +439,7 @@ private static IEnumerable<CopyInstruction> IncludeFilesInSource(FileContext fil
}

string lastKnownGoodBuild = repoContext.Repository.HeadRev;
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext,
updateContext: updateContext,
value: lastKnownGoodBuild,
cancellationToken: cancellationToken);
await this._trackingCache.UpdateTrackingAsync(repoContext: repoContext, updateContext: updateContext, value: lastKnownGoodBuild, cancellationToken: cancellationToken);

await repoContext.Repository.RemoveBranchesForPrefixAsync(branchForUpdate: branchName,
branchPrefix: branchPrefix,
Expand Down Expand Up @@ -605,11 +585,7 @@ bool AlreadyUpToDate()

ReleaseConfig releaseConfig = await this._releaseConfigLoader.LoadAsync(path: releaseConfigFileName, cancellationToken: cancellationToken);

return new(WorkFolder: workFolder,
TemplateFolder: templateRepo.WorkingDirectory,
TrackingFileName: trackingFileName,
DotNetSettings: dotNetSettings,
ReleaseConfig: releaseConfig);
return new(WorkFolder: workFolder, TemplateFolder: templateRepo.WorkingDirectory, TrackingFileName: trackingFileName, DotNetSettings: dotNetSettings, ReleaseConfig: releaseConfig);
}

private ValueTask LoadTrackingCacheAsync(string? trackingFile, in CancellationToken cancellationToken)
Expand Down

0 comments on commit 9e0912a

Please sign in to comment.