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

Generate packs in parallel #7764

Merged
merged 1 commit into from
Aug 18, 2021
Merged

Generate packs in parallel #7764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateMsiBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
File.Copy(sourcePackage, Path.Combine(packageContentsDirectory, Path.GetFileName(sourcePackage)));
}

foreach (string platform in platforms)
System.Threading.Tasks.Parallel.ForEach(platforms, platform =>
{
// Extract the MSI template and add it to the list of source files.
List<string> sourceFiles = new();
Expand Down Expand Up @@ -296,7 +296,7 @@ protected IEnumerable<ITaskItem> Generate(string sourcePackage, string swixPacka
msi.SetMetadata(Metadata.PackageProject, GeneratePackageProject(msi.ItemSpec, msiJsonPath, platform, nupkg));

msis.Add(msi);
}
});

return msis;
}
Expand Down
10 changes: 8 additions & 2 deletions src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateWorkloadMsis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public override bool Execute()
IEnumerable<WorkloadPack> workloadPacks = GetWorkloadPacks();
List<string> missingPackIds = new(workloadPacks.Select(p => $"{p.Id}"));

List<(string sourcePackage, string swixPackageId, string outputPath, WorkloadPackKind kind, string[] platforms)> packsToGenerate = new();

foreach (WorkloadPack pack in workloadPacks)
{
Log.LogMessage($"Processing workload pack: {pack.Id}, Version: {pack.Version}");
Expand All @@ -88,11 +90,15 @@ public override bool Execute()
string swixPackageId = $"{pack.Id.ToString().Replace(ShortNames)}.{pack.Version}";

// Always select the pack ID for the VS MSI package, even when aliased.
msis.AddRange(Generate(sourcePackage, swixPackageId,
OutputPath, pack.Kind, platforms));
packsToGenerate.Add(new(sourcePackage, swixPackageId, OutputPath, pack.Kind, platforms));
}
}

System.Threading.Tasks.Parallel.ForEach(packsToGenerate, p =>
{
msis.AddRange(Generate(p.sourcePackage, p.swixPackageId, p.outputPath, p.kind, p.platforms));
});

Msis = msis.ToArray();
MissingPacks = missingPacks.ToArray();
}
Expand Down