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

Support .exe and .winmd assembly extensions #735

Merged
merged 1 commit into from
Feb 23, 2021
Merged

Support .exe and .winmd assembly extensions #735

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
28 changes: 25 additions & 3 deletions ...osoft.CodeAnalysis.Testing/Microsoft.CodeAnalysis.Analyzer.Testing/ReferenceAssemblies.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,9 @@ await PackageExtractor.ExtractPackageAsync(
var nearestRefItems = refItems.Single(x => x.TargetFramework == nearestRef);
foreach (var item in nearestRefItems.Items)
{
if (!string.Equals(Path.GetExtension(item), ".dll", StringComparison.OrdinalIgnoreCase))
if (!string.Equals(Path.GetExtension(item), ".dll", StringComparison.OrdinalIgnoreCase)
&& !string.Equals(Path.GetExtension(item), ".exe", StringComparison.OrdinalIgnoreCase)
&& !string.Equals(Path.GetExtension(item), ".winmd", StringComparison.OrdinalIgnoreCase))
{
continue;
}
Expand All @@ -377,7 +379,9 @@ await PackageExtractor.ExtractPackageAsync(
var nearestLibItems = libItems.Single(x => x.TargetFramework == nearestLib);
foreach (var item in nearestLibItems.Items)
{
if (!string.Equals(Path.GetExtension(item), ".dll", StringComparison.OrdinalIgnoreCase))
if (!string.Equals(Path.GetExtension(item), ".dll", StringComparison.OrdinalIgnoreCase)
&& !string.Equals(Path.GetExtension(item), ".exe", StringComparison.OrdinalIgnoreCase)
&& !string.Equals(Path.GetExtension(item), ".winmd", StringComparison.OrdinalIgnoreCase))
{
continue;
}
Expand Down Expand Up @@ -411,6 +415,14 @@ await PackageExtractor.ExtractPackageAsync(
{
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".dll")));
}
else if (File.Exists(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".exe")))
{
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".exe")));
}
else if (File.Exists(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".winmd")))
{
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".winmd")));
}
}

// Prefer assemblies from the reference assembly package to ones otherwise provided
Expand All @@ -429,7 +441,7 @@ await PackageExtractor.ExtractPackageAsync(
var facadesPath = Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, "Facades");
if (Directory.Exists(facadesPath))
{
foreach (var path in Directory.GetFiles(facadesPath, "*.dll"))
foreach (var path in Directory.GetFiles(facadesPath, "*.dll").Concat(Directory.GetFiles(facadesPath, "*.exe")).Concat(Directory.GetFiles(facadesPath, "*.winmd")))
{
resolvedAssemblies.RemoveWhere(existingAssembly => Path.GetFileNameWithoutExtension(existingAssembly) == Path.GetFileNameWithoutExtension(path));
resolvedAssemblies.Add(Path.GetFullPath(path));
Expand All @@ -443,6 +455,16 @@ await PackageExtractor.ExtractPackageAsync(
resolvedAssemblies.RemoveWhere(existingAssembly => Path.GetFileNameWithoutExtension(existingAssembly) == assembly);
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".dll")));
}
else if (File.Exists(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".exe")))
{
resolvedAssemblies.RemoveWhere(existingAssembly => Path.GetFileNameWithoutExtension(existingAssembly) == assembly);
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".exe")));
}
else if (File.Exists(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".winmd")))
{
resolvedAssemblies.RemoveWhere(existingAssembly => Path.GetFileNameWithoutExtension(existingAssembly) == assembly);
resolvedAssemblies.Add(Path.GetFullPath(Path.Combine(referenceAssemblyInstalledPath!, ReferenceAssemblyPath!, assembly + ".winmd")));
}
}
}
else
Expand Down