Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

[preview] #1900 Add workaround for missing repository properties #1954

Merged
merged 2 commits into from
Feb 24, 2024
Merged

[preview] #1900 Add workaround for missing repository properties #1954

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60ee181
#1900 Add workaround for missing repository properties when migrating…
tomfrenzel Feb 23, 2024
da4e378
Merge branch 'preview' into fix/#1900
MrHinsh Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/MigrationTools.Clients.AzureDevops.Rest/Processors/AzureDevOpsPipelineProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ private IEnumerable<TaskGroup> FilterOutIncompatibleTaskGroups(IEnumerable<TaskG
{
Log.LogWarning(
@"{DefinitionType} ""{DefinitionName}"" cannot be migrated because the Task(s) ""{MissingTaskNames}"" are not available. This usually happens if the extension for the task is not installed.",
typeof(TaskGroup).Name, g.Name ,string.Join(",", missingTasksNames));
typeof(TaskGroup).Name, g.Name, string.Join(",", missingTasksNames));
return false;
}
return true;
Expand Down Expand Up @@ -303,13 +303,15 @@ private async Task<IEnumerable<Mapping>> CreateBuildPipelinesAsync(IEnumerable<M
// Replace taskgroup and variablegroup sIds with tIds
foreach (var definitionToBeMigrated in definitionsToBeMigrated)
{
var sourceConnectedServiceId = definitionToBeMigrated.Repository.Properties.ConnectedServiceId;
var sourceConnectedServiceId = definitionToBeMigrated.Repository?.Properties?.ConnectedServiceId;
var targetConnectedServiceId = targetServiceConnections.FirstOrDefault(s => sourceServiceConnections
.FirstOrDefault(c => c.Id == sourceConnectedServiceId)?.Name == s.Name)?.Id;
definitionToBeMigrated.Repository.Properties.ConnectedServiceId = targetConnectedServiceId;


MapRepositoriesInBuidDefinition(sourceRepositories, targetRepositories, definitionToBeMigrated);
if (definitionToBeMigrated.Repository?.Properties != null)
{
definitionToBeMigrated.Repository.Properties.ConnectedServiceId = targetConnectedServiceId;
MapRepositoriesInBuidDefinition(sourceRepositories, targetRepositories, definitionToBeMigrated);
}

if (TaskGroupMapping is not null)
{
Expand Down
Loading