public async Task CommitUpdatesAsync(
string repoUri,
string branch,
List <DependencyDetail> itemsToUpdate,
string message)
{
CheckForValidGitClient();
GitFileContentContainer fileContainer =
await _fileManager.UpdateDependencyFiles(itemsToUpdate, repoUri, branch);
List <GitFile> filesToCommit = fileContainer.GetFilesToCommit();
// If we are updating the arcade sdk we need to update the eng/common files as well
DependencyDetail arcadeItem = itemsToUpdate.FirstOrDefault(
i => string.Equals(i.Name, "Microsoft.DotNet.Arcade.Sdk", StringComparison.OrdinalIgnoreCase));
if (arcadeItem != null && repoUri != arcadeItem.RepoUri)
{
// Files in arcade repository
List <GitFile> engCommonFiles = await GetCommonScriptFilesAsync(arcadeItem.RepoUri, arcadeItem.Commit);
filesToCommit.AddRange(engCommonFiles);
// Files in the target repo
string latestCommit = await _gitClient.GetLastCommitShaAsync(_gitClient.GetOwnerAndRepoFromRepoUri(repoUri), branch);
List <GitFile> targetEngCommonFiles = await GetCommonScriptFilesAsync(repoUri, latestCommit);
foreach (GitFile file in targetEngCommonFiles)
{
if (!engCommonFiles.Where(f => f.FilePath == file.FilePath).Any())
{
file.Operation = GitFileOperation.Delete;
filesToCommit.Add(file);
}
}
}
await _gitClient.PushFilesAsync(filesToCommit, repoUri, branch, message);
}
public async Task CommitUpdatesAsync(
string repoUri,
string branch,
List <DependencyDetail> itemsToUpdate,
string message)
{
CheckForValidGitClient();
GitFileContentContainer fileContainer =
await _fileManager.UpdateDependencyFiles(itemsToUpdate, repoUri, branch);
List <GitFile> filesToCommit = new List <GitFile>();
// If we are updating the arcade sdk we need to update the eng/common files and the dotnet versions as well
DependencyDetail arcadeItem = itemsToUpdate.FirstOrDefault(
i => string.Equals(i.Name, "Microsoft.DotNet.Arcade.Sdk", StringComparison.OrdinalIgnoreCase));
if (arcadeItem != null && repoUri != arcadeItem.RepoUri)
{
// Files in arcade repository. All Arcade items have a GitHub repo URI by default so we need to change the
// URI from we are getting the eng/common files. If in an AzDO context we change the URI to that of
// dotnet-arcade in dnceng
string arcadeRepoUri = arcadeItem.RepoUri;
if (Uri.TryCreate(repoUri, UriKind.Absolute, out Uri parsedUri))
{
if (parsedUri.Host == "dev.azure.com" || parsedUri.Host.EndsWith("visualstudio.com"))
{
arcadeRepoUri = "https://dev.azure.com/dnceng/internal/_git/dotnet-arcade";
}
}
SemanticVersion arcadeDotnetVersion = await GetToolsDotnetVersionAsync(arcadeRepoUri, arcadeItem.Commit);
if (arcadeDotnetVersion != null)
{
fileContainer.GlobalJson = UpdateDotnetVersionGlobalJson(arcadeDotnetVersion, fileContainer.GlobalJson);
}
List <GitFile> engCommonFiles = await GetCommonScriptFilesAsync(arcadeRepoUri, arcadeItem.Commit);
filesToCommit.AddRange(engCommonFiles);
// Files in the target repo
string latestCommit = await _gitClient.GetLastCommitShaAsync(repoUri, branch);
List <GitFile> targetEngCommonFiles = await GetCommonScriptFilesAsync(repoUri, latestCommit);
foreach (GitFile file in targetEngCommonFiles)
{
if (!engCommonFiles.Where(f => f.FilePath == file.FilePath).Any())
{
file.Operation = GitFileOperation.Delete;
filesToCommit.Add(file);
}
}
}
filesToCommit.AddRange(fileContainer.GetFilesToCommit());
await _gitClient.CommitFilesAsync(filesToCommit, repoUri, branch, message);
}
