Skip to content

Commit

Permalink
Merge pull request #4144 from unoplatform/dev/jela/net5-nullablefix
Browse files Browse the repository at this point in the history
fix(net5): Fix for net5 source generation nullable references support
  • Loading branch information
jeromelaban authored Sep 25, 2020
2 parents 67c4514 + 671947f commit d3c572b
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3958,13 +3958,13 @@ string Inner()
.GetMethods()
.Any(m =>
m.Name == "op_Implicit"
&& m.Parameters.FirstOrDefault().SelectOrDefault(p => p.Type.ToDisplayString() == "string")
&& m.Parameters.FirstOrDefault().SelectOrDefault(p => Equals(p.Type, _stringSymbol))
);

if (hasImplictToString

// Can be an object (e.g. in case of Binding.ConverterParameter).
|| propertyType.ToDisplayString() == "object"
|| Equals(propertyType, _objectSymbol)
)
{
return "@\"" + memberValue.ToString() + "\"";
Expand Down

0 comments on commit d3c572b

Please sign in to comment.