From e2e7facad0edc9399816a2d6dedcc8f6d6e62798 Mon Sep 17 00:00:00 2001 From: Wojciech Figat Date: Wed, 18 Jan 2023 11:53:30 +0100 Subject: [PATCH] Fix using dependency module from nested referenced build in C# --- .../Flax.Build/Build/DotNet/Builder.DotNet.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs index 091c26741..8ae2b831a 100644 --- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs +++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs @@ -323,17 +323,11 @@ namespace Flax.Build // Reference module output binary fileReferences.Add(Path.Combine(outputPath, dependencyModule.BinaryModuleName + ".CSharp.dll")); } - foreach (var e in buildData.ReferenceBuilds) + var referencedBuild = buildData.FinReferenceBuildModule(dependencyModule.BinaryModuleName); + if (referencedBuild != null && !string.IsNullOrEmpty(referencedBuild.ManagedPath)) { - foreach (var q in e.Value.BuildInfo.BinaryModules) - { - if (q.Name == dependencyModule.BinaryModuleName && !string.IsNullOrEmpty(q.ManagedPath)) - { - // Reference binary module build build for referenced target - fileReferences.Add(q.ManagedPath); - break; - } - } + // Reference binary module build build for referenced target + fileReferences.Add(referencedBuild.ManagedPath); } } }