Skip to content

Clarify defaultRefAssemblies list capacity in AddType.cs #12520

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
5 commits merged into from
May 27, 2020
Merged

Clarify defaultRefAssemblies list capacity in AddType.cs #12520

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3528365
Expand defaultRefAssemblies list capacity
xtqqczze Apr 29, 2020
9137115
Restate list initial capacity
xtqqczze May 1, 2020
d2ce5fb
Fix CodeFactor issues
xtqqczze May 1, 2020
c1a2211
Use System.Management.Automation.Diagnostics.Assert
xtqqczze May 2, 2020
e1bc8d1
Define a const for capacity, etc
xtqqczze May 4, 2020
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
16 changes: 14 additions & 2 deletions src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,14 +668,26 @@ private void LoadAssemblies(IEnumerable<string> assemblies)
/// </summary>
private static IEnumerable<PortableExecutableReference> InitDefaultRefAssemblies()
{
// netcoreapp3.0 currently comes with 148 reference assemblies (maybe more in future), so we use a capacity of '150'.
var defaultRefAssemblies = new List<PortableExecutableReference>(150);
// Define number of reference assemblies distributed with PowerShell.
// This number is accurate as of PowerShell v7.1.0-preview.1 built with .NET v5.0.100-preview.1.20155.7
const int numberOfPowershellRefAssemblies = 151;

const int capacity = numberOfPowershellRefAssemblies + 1;
var defaultRefAssemblies = new List<PortableExecutableReference>(capacity);

foreach (string file in Directory.EnumerateFiles(s_netcoreAppRefFolder, "*.dll", SearchOption.TopDirectoryOnly))
{
defaultRefAssemblies.Add(MetadataReference.CreateFromFile(file));
}

// Add System.Management.Automation.dll
defaultRefAssemblies.Add(MetadataReference.CreateFromFile(typeof(PSObject).Assembly.Location));

// We want to avoid reallocating the internal array, so we assert if the list capacity has increased.
Diagnostics.Assert(
defaultRefAssemblies.Capacity <= capacity,
$"defaultRefAssemblies was resized because of insufficient initial capacity! A capacity of {defaultRefAssemblies.Count} is required.");

return defaultRefAssemblies;
}

Expand Down