Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -839,7 +839,7 @@ namespace System.Activities.Core.Presentation {
}
/// <summary>
/// Looks up a localized string similar to ActivityDelegate arguments don&apos;t match. Check your activity configuration to make sure it is in [....] with the declared ActivityDelegate..
/// Looks up a localized string similar to ActivityDelegate arguments don&apos;t match. Check your activity configuration to make sure it is in sync with the declared ActivityDelegate..
/// </summary>
internal static string WrongNumberOfArgumentsForActivityDelegate {
get {

View File

@@ -55,7 +55,7 @@ namespace System.Activities.Core.Presentation
{
morphed.Expression = morphedExpression;
}
//[....]
//Microsoft
}
}

View File

@@ -560,7 +560,7 @@ namespace System.Activities.Presentation
}
else
{
//[....]
//Microsoft
entry.Expression = null;
}