fix für key-copy in dictionary

Author: greuelpirat

DeepCopy.Fody/CopyDictionary.cs

@@ -24,12 +24,14 @@ private IEnumerable<Instruction> CopyDictionary(TypeReference type, ValueSource
                     var sourceKey = ValueSource.New().Variable(forEach.Current).Method(ImportMethod(typeKeyValuePair, "get_Key", typesOfArguments));
                     var sourceValue = ValueSource.New().Variable(forEach.Current).Method(ImportMethod(typeKeyValuePair, "get_Value", typesOfArguments));
 
-                    var valueTarget = NewVariable(typesOfArguments[1]);
-                    list.AddRange(Copy(typesOfArguments[1], sourceValue, ValueTarget.New().Variable(valueTarget)));
+                    var targetKey = NewVariable(typesOfArguments[0]);
+                    list.AddRange(Copy(typesOfArguments[0], sourceKey, ValueTarget.New().Variable(targetKey)));
+                    var targetValue = NewVariable(typesOfArguments[1]);
+                    list.AddRange(Copy(typesOfArguments[1], sourceValue, ValueTarget.New().Variable(targetValue)));
 
                     list.Add(variable?.CreateLoadInstruction() ?? Instruction.Create(OpCodes.Ldarg_0));
-                    list.AddRange(sourceKey);
-                    list.Add(valueTarget.CreateLoadInstruction());
+                    list.Add(targetKey.CreateLoadInstruction());
+                    list.Add(targetValue.CreateLoadInstruction());
                     list.Add(Instruction.Create(OpCodes.Callvirt, ImportMethod(type.Resolve(), "set_Item", typesOfArguments)));
                 }
 

DeepCopy.Fody/Utils/ForEach.cs

@@ -44,7 +44,7 @@ public ForEach(ModuleWeaver moduleWeaver, List<Instruction> instructions, TypeRe
 
             // try
             _startCondition = Instruction.Create(OpCodes.Ldloc, _enumerator);
-            _startTry = Instruction.Create(OpCodes.Br_S, _startCondition);
+            _startTry = Instruction.Create(OpCodes.Br, _startCondition);
             _instructions.Add(_startTry);
 
             _startLoop = Instruction.Create(OpCodes.Ldloc, _enumerator);
@@ -57,7 +57,7 @@ public void Dispose()
         {
             _instructions.Add(_startCondition);
             _instructions.Add(Instruction.Create(OpCodes.Callvirt, _moduleWeaver.ImportMethod(_typeEnumerator, nameof(IEnumerator.MoveNext))));
-            _instructions.Add(Instruction.Create(OpCodes.Brtrue_S, _startLoop));
+            _instructions.Add(Instruction.Create(OpCodes.Brtrue, _startLoop));
 
             // end try
             var end = Instruction.Create(OpCodes.Nop);

Tests/CopyDictionaryTests.cs

@@ -79,6 +79,11 @@ public void TestClassWithDictionaryObject()
             Assert.NotSame(instance.Dictionary, copy.Dictionary);
             Assert.NotSame(instance.Dictionary[someKey1], copy.Dictionary[someKey1]);
             Assert.NotSame(instance.Dictionary[someKey2], copy.Dictionary[someKey2]);
+
+            var instanceKey1 = System.Linq.Enumerable.First(instance.Dictionary.Keys);
+            var copyKey1 = System.Linq.Enumerable.First(copy.Dictionary.Keys);
+            Assert.Equal(instanceKey1, copyKey1);
+            Assert.NotSame(instanceKey1, copyKey1);
         }
 
         [Fact]