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

@@ -89,7 +89,7 @@ namespace System.Runtime.DurableInstancing
{
Fx.Assert(value != Guid.Empty, "Cannot set an empty Id.");
Fx.Assert(this.id == Guid.Empty, "Cannot set Id more than once.");
Fx.Assert(!this.idIsSet, "idIsSet out of [....] with id.");
Fx.Assert(!this.idIsSet, "idIsSet out of sync with id.");
this.id = value;

View File

@@ -1596,7 +1596,7 @@ namespace System.Runtime.DurableInstancing
}
finally
{
Fx.AssertAndThrowFatal(this.context.Active, "Out-of-[....] between InstanceExecutionContext and ExecutionAsyncResult.");
Fx.AssertAndThrowFatal(this.context.Active, "Out-of-sync between InstanceExecutionContext and ExecutionAsyncResult.");
this.context.LastAsyncResult = null;
this.context.RootAsyncResult = null;