Skip to content

Commit fbebe2f

Browse files
committed
ignore resource dlls in non-analyzer packages
1 parent 9e677d1 commit fbebe2f

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

src/UnityNuGet/RegistryCache.cs

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -564,14 +564,14 @@ RegistryEntry packageEntry
564564

565565
var collectedItems = new Dictionary<FrameworkSpecificGroup, HashSet<RegistryTargetFramework>>();
566566

567-
foreach (var closestVersion in closestVersions)
567+
foreach (var (item, targetFramework) in closestVersions)
568568
{
569-
if (!collectedItems.TryGetValue(closestVersion.Item1, out var frameworksPerGroup))
569+
if (!collectedItems.TryGetValue(item, out var frameworksPerGroup))
570570
{
571571
frameworksPerGroup = new HashSet<RegistryTargetFramework>();
572-
collectedItems.Add(closestVersion.Item1, frameworksPerGroup);
572+
collectedItems.Add(item, frameworksPerGroup);
573573
}
574-
frameworksPerGroup.Add(closestVersion.Item2);
574+
frameworksPerGroup.Add(targetFramework);
575575
}
576576

577577
if (!packageEntry.Analyzer && collectedItems.Count == 0)
@@ -662,14 +662,17 @@ RegistryEntry packageEntry
662662
}
663663
}
664664

665-
foreach (var groupToFrameworks in collectedItems)
665+
foreach (var (item, frameworks) in collectedItems)
666666
{
667-
var item = groupToFrameworks.Key;
668-
var frameworks = groupToFrameworks.Value;
669-
670667
var folderPrefix = hasMultiNetStandard ? $"{frameworks.First().Name}/" : "";
671668
foreach (var file in item.Items)
672669
{
670+
// reject resource dlls since Unity can't use them and we're not handling paths
671+
if (file.EndsWith(".resources.dll", StringComparison.OrdinalIgnoreCase))
672+
{
673+
continue;
674+
}
675+
673676
var fileInUnityPackage = $"{folderPrefix}{Path.GetFileName(file)}";
674677
string? meta;
675678

0 commit comments

Comments
 (0)