Skip to content

[workloads] Allow disabling most parallelization (#7857) #7867

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

Merged
mmitche merged 1 commit into from
Sep 9, 2021
Merged

[workloads] Allow disabling most parallelization (#7857) #7867

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
10 changes: 10 additions & 0 deletions src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateVisualStudioWorkload.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ public string SuppressIces
set;
}

/// <summary>
/// Generate msis in parallel.
/// </summary>
public bool RunInParallel
{
get;
set;
} = true;

/// <summary>
/// The paths of the generated .swixproj files.
/// </summary>
Expand Down Expand Up @@ -182,6 +191,7 @@ internal IEnumerable<ITaskItem> GenerateMsisFromManifests(ITaskItem[] workloadMa
IntermediateBaseOutputPath = this.IntermediateBaseOutputPath,
OutputPath = this.OutputPath,
PackagesPath = this.PackagesPath,
RunInParallel = this.RunInParallel,
ShortNames = this.ShortNames,
SuppressIces = this.SuppressIces,
WixToolsetPath = this.WixToolsetPath,
Expand Down
27 changes: 23 additions & 4 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 @@ -35,6 +35,15 @@ public string PackagesPath
set;
}

/// <summary>
/// Generate msis in parallel.
/// </summary>
public bool RunInParallel
{
get;
set;
} = true;

/// <summary>
/// Gets the set of missing workload packs.
/// </summary>
Expand Down Expand Up @@ -90,14 +99,24 @@ 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.
packsToGenerate.Add(new(sourcePackage, swixPackageId, OutputPath, pack.Kind, platforms));
if (RunInParallel)
{
packsToGenerate.Add(new(sourcePackage, swixPackageId, OutputPath, pack.Kind, platforms));
}
else
{
msis.AddRange(Generate(sourcePackage, swixPackageId, OutputPath, pack.Kind, platforms));
}
}
}

System.Threading.Tasks.Parallel.ForEach(packsToGenerate, p =>
if (RunInParallel)
{
msis.AddRange(Generate(p.sourcePackage, p.swixPackageId, p.outputPath, p.kind, p.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