Skip to content
Merged
Changes from all commits
Commits
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
21 changes: 6 additions & 15 deletions src/ScriptBuilder/ScriptGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,33 +158,24 @@ void Promote(string replicationPath)
static IEnumerable<string> CollectAssemblyFiles(string assemblyFolderPath, IReadOnlyList<string>? referencePaths)
{
var seen = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var file in Directory.GetFiles(RuntimeEnvironment.GetRuntimeDirectory(), "*.dll"))
foreach (var file in Directory.GetFiles(RuntimeEnvironment.GetRuntimeDirectory(), "*.dll").Where(f => seen.Add(Path.GetFileName(f))))
{
if (seen.Add(Path.GetFileName(file)))
{
yield return file;
}
yield return file;
}

foreach (var file in Directory.EnumerateFiles(assemblyFolderPath, "*.dll", SearchOption.AllDirectories))
foreach (var file in Directory.EnumerateFiles(assemblyFolderPath, "*.dll", SearchOption.AllDirectories).Where(f => seen.Add(Path.GetFileName(f))))
{
if (seen.Add(Path.GetFileName(file)))
{
yield return file;
}
yield return file;
}

if (referencePaths is null)
{
yield break;
}

foreach (var referencePath in referencePaths)
foreach (var referencePath in referencePaths.Where(rp => File.Exists(rp) && seen.Add(Path.GetFileName(rp))))
{
if (File.Exists(referencePath) && seen.Add(Path.GetFileName(referencePath)))
{
yield return referencePath;
}
yield return referencePath;
}
}
}