Skip to content

Commit bfbd6dc

Browse files
committed
Merge branch 'fix-orderablestring-resolving' into 'main'
Fix OrderableString resolving See merge request Sharpmake/sharpmake!621
2 parents a4af945 + f2eee25 commit bfbd6dc

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

Sharpmake/Resolver.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -812,6 +812,24 @@ private void ResolveMember(string objectPath, object obj, MemberInfo memberInfo,
812812
SetResolved(memberPath);
813813
}
814814
}
815+
else if (fieldValue is OrderableStrings)
816+
{
817+
if (CanWriteFieldValue(fieldInfo))
818+
{
819+
SetResolving(memberPath);
820+
OrderableStrings values = fieldValue as OrderableStrings;
821+
822+
for (int i = 0; i < values.Count; ++i)
823+
{
824+
bool wasChanged;
825+
string value = Resolve(values[i], fallbackValue, out wasChanged);
826+
if (wasChanged)
827+
i = values.SetOrRemoveAtIndex(i, value);
828+
}
829+
830+
SetResolved(memberPath);
831+
}
832+
}
815833
else if (fieldValue is IList<string>)
816834
{
817835
if (CanWriteFieldValue(fieldInfo))

0 commit comments

Comments
 (0)