Do not sort object members by name (.NET 7 makes this declaration order)

xPaw · xPaw · commit e1ff45eb973e · 2026-04-05T12:20:00.000+03:00
Fixes #80
diff --git a/ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectSerializationTypedTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Binary/BinaryObjectSerializationTypedTestCase.cs
@@ -26,30 +26,30 @@ public void SerializesToBinaryStructure()
             {
                 0x00, // object: TestObject
                     0x54, 0x65, 0x73, 0x74, 0x4F, 0x62, 0x6A, 0x65, 0x63, 0x74, 0x00,
-                    0x03, // float32: flt = 1234.5678f
-                        0x66, 0x6C, 0x74, 0x00,
-                        0x2B, 0x52, 0x9A, 0x44,
-                    0x02, // int32, i16 = 32767
-                        0x69, 0x31, 0x36, 0x00,
-                        0xFF, 0x7F, 0x00, 0x00,
-                    0x0A, // int64, i64 = 0x0102030405070809
-                        0x69, 0x36, 0x34, 0x00,
-                        0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01,
-                    0x02, // int32: int = 0x10203040
-                        0x69, 0x6E, 0x74, 0x00,
-                        0x40, 0x30, 0x20, 0x10,
                     0x01, // string: key = value
                         0x6B, 0x65, 0x79, 0x00,
                         0x76, 0x61, 0x6C, 0x75, 0x65, 0x00,
-                    0x01, // string_utf8: key_utf8 = 邪恶的战
+                    0x01, // string: key_utf8 = 邪恶的战
                         0x6B, 0x65, 0x79, 0x5F, 0x75, 0x74, 0x66, 0x38, 0x00,
                         0xE9, 0x82, 0xAA, 0xE6, 0x81, 0xB6, 0xE7, 0x9A, 0x84, 0xE6, 0x88, 0x98, 0x00,
-                    0x07, // uint64: lng = 0x8877665544332211
-                        0x6C, 0x6E, 0x67, 0x00,
-                        0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+                    0x02, // int32: int = 0x10203040
+                        0x69, 0x6E, 0x74, 0x00,
+                        0x40, 0x30, 0x20, 0x10,
+                    0x03, // float32: flt = 1234.5678f
+                        0x66, 0x6C, 0x74, 0x00,
+                        0x2B, 0x52, 0x9A, 0x44,
                     0x04, // pointer: ptr = 0x12345678
                         0x70, 0x74, 0x72, 0x00,
                         0x78, 0x56, 0x34, 0x12,
+                    0x07, // uint64: lng = 0x8877665544332211
+                        0x6C, 0x6E, 0x67, 0x00,
+                        0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+                    0x0A, // int64: i64 = 0x0102030405060708
+                        0x69, 0x36, 0x34, 0x00,
+                        0x08, 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01,
+                    0x02, // int32: i16 = 32767
+                        0x69, 0x31, 0x36, 0x00,
+                        0xFF, 0x7F, 0x00, 0x00,
                     0x07, // uint64: u16 = 65535
                         0x75, 0x31, 0x36, 0x00,
                         0xFF, 0xFF, 0x00, 0x00,
diff --git a/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/non_circular_list.vdf b/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/non_circular_list.vdf
@@ -1,14 +1,14 @@
 "test"
 {
+	"Strings"
+	{
+		"0"	"test"
+		"1"	"test"
+	}
 	"Ints"
 	{
 		"0"	"1"
 		"1"	"2"
 		"2"	"1"
 	}
-	"Strings"
-	{
-		"0"	"test"
-		"1"	"test"
-	}
 }
diff --git a/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/object_serialization_expected.vdf b/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/object_serialization_expected.vdf
@@ -0,0 +1,16 @@
+"test data"
+{
+	"0"
+	{
+		"Name"	"Dota 2"
+		"Developer"	"Valve Software"
+		"description"	"Dota 2 is a complex game where you get sworn at
+in Russian all the time."
+	}
+	"1"
+	{
+		"Name"	"Team Fortress 2"
+		"Developer"	"Valve Software"
+		"description"	"Known as \"America's #1 war-themed hat simulator\", this game lets you wear stupid items while killing people."
+	}
+}
diff --git a/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/serialization_types_expected.vdf b/ValveKeyValue/ValveKeyValue.Test/Test Data/Text/serialization_types_expected.vdf
@@ -2,16 +2,16 @@
 {
 	"0"
 	{
-		"VByteEnum"	"255"
-		"VEnum"	"1337"
-		"VFlags"	"10"
-		"VFloat"	"1234.5677"
+		"VString"	"Test String"
 		"VInt"	"270544960"
 		"VLong"	"72623859790382856"
-		"VLongEnum"	"72623859790382856"
-		"VShortEnum"	"-1"
-		"VString"	"Test String"
 		"VULong"	"9833440827789222417"
+		"VFloat"	"1234.5677"
+		"VEnum"	"1337"
+		"VFlags"	"10"
+		"VByteEnum"	"255"
+		"VShortEnum"	"-1"
+		"VLongEnum"	"72623859790382856"
 		"VULongEnum"	"9833440827789222417"
 	}
 }
diff --git a/ValveKeyValue/ValveKeyValue.Test/Text/ObjectSerializationTestCase.cs b/ValveKeyValue/ValveKeyValue.Test/Text/ObjectSerializationTestCase.cs
@@ -33,7 +33,7 @@ public void CreatesTextDocument()
                 text = reader.ReadToEnd();
             }
 
-            var expected = TestDataHelper.ReadTextResource("Text.serialization_expected.vdf");
+            var expected = TestDataHelper.ReadTextResource("Text.object_serialization_expected.vdf");
             Assert.That(text, Is.EqualTo(expected));
         }
 
diff --git a/ValveKeyValue/ValveKeyValue/ObjectCopier.cs b/ValveKeyValue/ValveKeyValue/ObjectCopier.cs
@@ -125,7 +125,7 @@ static KVObject ConvertObjectToValue(
             }
             else
             {
-                foreach (var member in reflector.GetMembers(objectType, managedObject).OrderBy(p => p.Name, StringComparer.InvariantCulture))
+                foreach (var member in reflector.GetMembers(objectType, managedObject))
                 {
                     if (member.Value is null)
                     {

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`"test"`
`2`	`2`	`{`
	`3`	`+ "Strings"`
	`4`	`+ {`
	`5`	`+ "0" "test"`
	`6`	`+ "1" "test"`
	`7`	`+ }`
`3`	`8`	`"Ints"`
`4`	`9`	`{`
`5`	`10`	`"0" "1"`
`6`	`11`	`"1" "2"`
`7`	`12`	`"2" "1"`
`8`	`13`	`}`
`9`		`- "Strings"`
`10`		`- {`
`11`		`- "0" "test"`
`12`		`- "1" "test"`
`13`		`- }`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,16 +2,16 @@`
`2`	`2`	`{`
`3`	`3`	`"0"`
`4`	`4`	`{`
`5`		`- "VByteEnum" "255"`
`6`		`- "VEnum" "1337"`
`7`		`- "VFlags" "10"`
`8`		`- "VFloat" "1234.5677"`
	`5`	`+ "VString" "Test String"`
`9`	`6`	`"VInt" "270544960"`
`10`	`7`	`"VLong" "72623859790382856"`
`11`		`- "VLongEnum" "72623859790382856"`
`12`		`- "VShortEnum" "-1"`
`13`		`- "VString" "Test String"`
`14`	`8`	`"VULong" "9833440827789222417"`
	`9`	`+ "VFloat" "1234.5677"`
	`10`	`+ "VEnum" "1337"`
	`11`	`+ "VFlags" "10"`
	`12`	`+ "VByteEnum" "255"`
	`13`	`+ "VShortEnum" "-1"`
	`14`	`+ "VLongEnum" "72623859790382856"`
`15`	`15`	`"VULongEnum" "9833440827789222417"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void CreatesTextDocument()`
`33`	`33`	`text = reader.ReadToEnd();`
`34`	`34`	`}`
`35`	`35`
`36`		`- var expected = TestDataHelper.ReadTextResource("Text.serialization_expected.vdf");`
	`36`	`+ var expected = TestDataHelper.ReadTextResource("Text.object_serialization_expected.vdf");`
`37`	`37`	`Assert.That(text, Is.EqualTo(expected));`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ static KVObject ConvertObjectToValue(`
`125`	`125`	`}`
`126`	`126`	`else`
`127`	`127`	`{`
`128`		`- foreach (var member in reflector.GetMembers(objectType, managedObject).OrderBy(p => p.Name, StringComparer.InvariantCulture))`
	`128`	`+ foreach (var member in reflector.GetMembers(objectType, managedObject))`
`129`	`129`	`{`
`130`	`130`	`if (member.Value is null)`
`131`	`131`	`{`