Merge branch '6.0'

alex-kulakov · alex-kulakov · commit d5111a9e9279 · 2020-10-29T17:47:41.000+05:00
diff --git a/Orm/Xtensive.Orm/Orm/Persistent.cs b/Orm/Xtensive.Orm/Orm/Persistent.cs
@@ -307,7 +307,7 @@ protected internal void SetReferenceKey(FieldInfo field, Key value)
           throw new InvalidOperationException(string.Format("Key of {0} type is not assignable to field of {1} type", value.TypeInfo.Name, field.ValueType.Name));
         }
 
-        if (value == oldValue) {
+        if (value == oldValue && !isPersisting) {
           return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ protected internal void SetReferenceKey(FieldInfo field, Key value)`
`307`	`307`	`throw new InvalidOperationException(string.Format("Key of {0} type is not assignable to field of {1} type", value.TypeInfo.Name, field.ValueType.Name));`
`308`	`308`	`}`
`309`	`309`
`310`		`- if (value == oldValue) {`
	`310`	`+ if (value == oldValue && !isPersisting) {`
`311`	`311`	`return;`
`312`	`312`	`}`
`313`	`313`