Skip to content

Commit

Permalink
[Build] Fix native library loading picking up invalid files (fixes #1750
Browse files Browse the repository at this point in the history
)
  • Loading branch information
Basewq committed Oct 28, 2023
1 parent bbd23c9 commit ac63986
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions sources/shared/Stride.NuGetResolver/RestoreHelper.cs
Expand Up @@ -93,13 +93,29 @@ public static List<string> ListNativeLibs(LockFile lockFile)
{
foreach (var n in lib.NativeLibraries)
{
if (!IsValidNativeLibraryFile(n.Path))
{
continue;
}
var assemblyFile = Path.Combine(libPath, n.Path.Replace('/', Path.DirectorySeparatorChar));
libs.Add(assemblyFile);
}
}
}

return libs;

static bool IsValidNativeLibraryFile(string path)
{
if (path.EndsWith(".pdb", StringComparison.OrdinalIgnoreCase)
|| path.EndsWith(".manifest", StringComparison.OrdinalIgnoreCase)
|| path.EndsWith(".txt", StringComparison.OrdinalIgnoreCase)
|| path.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
{
return false;
}
return true;
}
}

private static Dictionary<(string, NuGetVersion), string> GetLibPaths(LockFile lockFile)
Expand Down

0 comments on commit ac63986

Please sign in to comment.