Browse Source

code cleanup

vpenades 7 tháng trước cách đây
mục cha
commit
8ef6ca1e5c
51 tập tin đã thay đổi với 249 bổ sung233 xóa
  1. 12 3
      build/SharpGLTF.CodeGen.Core/CodeGen/EmitCSharp.cs
  2. 3 3
      build/SharpGLTF.CodeGen.Core/SchemaDownload.cs
  3. 1 1
      build/SharpGLTF.CodeGen/Program.cs
  4. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.AnimPointer.g.cs
  5. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Anisotropy.g.cs
  6. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.ClearCoat.g.cs
  7. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.DiffuseTransmission.g.cs
  8. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Dispersion.g.cs
  9. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Ior.g.cs
  10. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Iridescence.g.cs
  11. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.MSFT.TextureDDS.g.cs
  12. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.MaterialsEmissiveStrength.g.cs
  13. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.MaterialsVolume.g.cs
  14. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.MeshGpuInstancing.g.cs
  15. 3 3
      src/SharpGLTF.Core/Schema2/Generated/ext.ModelLightsPunctual.g.cs
  16. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.NodeLightsPunctual.g.cs
  17. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Sheen.g.cs
  18. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.TextureKTX2.g.cs
  19. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.TextureTransform.g.cs
  20. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.TextureWEBP.g.cs
  21. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Transmission.g.cs
  22. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.Unlit.g.cs
  23. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.XmpJsonLinkedData.Prop.g.cs
  24. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.XmpJsonLinkedData.Root.g.cs
  25. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.pbrSpecular.g.cs
  26. 1 1
      src/SharpGLTF.Core/Schema2/Generated/ext.pbrSpecularGlossiness.g.cs
  27. 29 29
      src/SharpGLTF.Core/Schema2/Generated/gltf.g.cs
  28. 3 1
      src/SharpGLTF.Core/Schema2/gltf.ExtraProperties.cs
  29. 2 2
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_instance_features.g.cs
  30. 3 3
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_mesh_features.g.cs
  31. 1 1
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_primitive.g.cs
  32. 12 12
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_root.g.cs
  33. 1 1
      src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_primitive_outline.g.cs
  34. 1 1
      src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiNodeArticulations.g.cs
  35. 1 1
      src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiNodeStkMetadata.g.cs
  36. 3 3
      src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiRootArticulations.g.cs
  37. 2 2
      src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiRootStkMetadata.g.cs
  38. 2 2
      tests/SharpGLTF.Core.Tests/AssemblyAPITests.cs
  39. 1 1
      tests/SharpGLTF.Core.Tests/IO/JsonContentTests.cs
  40. 10 5
      tests/SharpGLTF.Core.Tests/Schema2/Authoring/BasicSceneCreationTests.cs
  41. 3 3
      tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadGeneratedTests.cs
  42. 8 8
      tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadSampleTests.cs
  43. 1 1
      tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadSpecialModelsTest.cs
  44. 3 3
      tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/RegressionTests.cs
  45. 3 3
      tests/SharpGLTF.Core.Tests/Transforms/AffineTransformMatrixTests.cs
  46. 4 4
      tests/SharpGLTF.Core.Tests/Validation/InvalidFilesTests.cs
  47. 3 3
      tests/SharpGLTF.Ext.3DTiles.Tests/GenericTests.cs
  48. 1 1
      tests/SharpGLTF.NUnit/NUnitGltfUtils.cs
  49. 2 2
      tests/SharpGLTF.ThirdParty.Tests/SandboxTests.cs
  50. 108 108
      tests/SharpGLTF.Toolkit.Tests/Collections/VertexListTests.cs
  51. 1 1
      tests/SharpGLTF.Toolkit.Tests/Scenes/SceneBuilderTests.cs

+ 12 - 3
build/SharpGLTF.CodeGen.Core/CodeGen/EmitCSharp.cs

@@ -680,7 +680,7 @@ namespace SharpGLTF.CodeGen
                 // fix boolean value            
                 if (vconst is Boolean bconst) vconst = bconst ? "true" : "false";                
 
-                getter += FormattableString.Invariant($" ?? {vconst}");
+                getter += Invariant($" ?? {vconst}");
             }
 
             // _FieldsReflection.Add($"yield return FIELDINFO.From(\"{finfo.PersistentName}\",this, {getter});");
@@ -768,9 +768,18 @@ namespace SharpGLTF.CodeGen
             yield return "#region reflection".Indent(1);
             yield return string.Empty;
 
-            yield return $"public const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
+            if (this.HasBaseClass)
+            {
+                yield return $"public new const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
+            }
+            else
+            {
+                yield return $"public const string SCHEMANAME = \"{SchemaName}\";".Indent(1);
+            }
+
+
 
-            var pointerPathModifier = HasBaseClass ? "override" : "virtual";
+                var pointerPathModifier = HasBaseClass ? "override" : "virtual";
             yield return $"protected {pointerPathModifier} string GetSchemaName() => SCHEMANAME;".Indent(1);            
 
             yield return string.Empty;

+ 3 - 3
build/SharpGLTF.CodeGen.Core/SchemaDownload.cs

@@ -13,11 +13,11 @@ namespace SharpGLTF
         {
             if (LibGit2Sharp.Repository.Discover(localDirectory) == null)
             {
-                Console.WriteLine($"Cloning {remoteUrl} can take several minutes; Please wait...");
+                Console.Out.WriteLine($"Cloning {remoteUrl} can take several minutes; Please wait...");
 
                 LibGit2Sharp.Repository.Clone(remoteUrl, localDirectory);
 
-                Console.WriteLine($"... Clone Completed");
+                Console.Out.WriteLine($"... Clone Completed");
 
                 return;
             }
@@ -31,7 +31,7 @@ namespace SharpGLTF
 
                 var r = LibGit2Sharp.Commands.Pull(repo, new LibGit2Sharp.Signature("Anonymous", "[email protected]", new DateTimeOffset(DateTime.Now)), options);
 
-                Console.WriteLine($"{remoteUrl} is {r.Status}");
+                Console.Out.WriteLine($"{remoteUrl} is {r.Status}");
             }
         }
     }

+ 1 - 1
build/SharpGLTF.CodeGen/Program.cs

@@ -38,7 +38,7 @@ namespace SharpGLTF
             {
                 foreach (var (targetFileName, schema) in processor.ReadSchema())
                 {
-                    System.Console.WriteLine($"Emitting {targetFileName}...");
+                    System.Console.Out.WriteLine($"Emitting {targetFileName}...");
 
                     SchemaProcessing.EmitCodeFromSchema(processor.GetTargetProject(), targetFileName, schema, processors);
                 }

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.AnimPointer.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_animation_pointer";
+		public new const string SCHEMANAME = "KHR_animation_pointer";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Anisotropy.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_anisotropy";
+		public new const string SCHEMANAME = "KHR_materials_anisotropy";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.ClearCoat.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_clearcoat";
+		public new const string SCHEMANAME = "KHR_materials_clearcoat";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.DiffuseTransmission.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_diffuse_transmission";
+		public new const string SCHEMANAME = "KHR_materials_diffuse_transmission";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Dispersion.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_dispersion";
+		public new const string SCHEMANAME = "KHR_materials_dispersion";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Ior.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_ior";
+		public new const string SCHEMANAME = "KHR_materials_ior";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Iridescence.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_iridescence";
+		public new const string SCHEMANAME = "KHR_materials_iridescence";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.MSFT.TextureDDS.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "MSFT_texture_dds";
+		public new const string SCHEMANAME = "MSFT_texture_dds";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.MaterialsEmissiveStrength.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_emissive_strength";
+		public new const string SCHEMANAME = "KHR_materials_emissive_strength";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.MaterialsVolume.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_volume";
+		public new const string SCHEMANAME = "KHR_materials_volume";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.MeshGpuInstancing.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_mesh_gpu_instancing";
+		public new const string SCHEMANAME = "EXT_mesh_gpu_instancing";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 3 - 3
src/SharpGLTF.Core/Schema2/Generated/ext.ModelLightsPunctual.g.cs

@@ -41,7 +41,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "spot";
+		public new const string SCHEMANAME = "spot";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -111,7 +111,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "light";
+		public new const string SCHEMANAME = "light";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -194,7 +194,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_lights_punctual";
+		public new const string SCHEMANAME = "KHR_lights_punctual";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.NodeLightsPunctual.g.cs

@@ -41,7 +41,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_lights_punctual";
+		public new const string SCHEMANAME = "KHR_lights_punctual";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Sheen.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_sheen";
+		public new const string SCHEMANAME = "KHR_materials_sheen";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.TextureKTX2.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_texture_basisu";
+		public new const string SCHEMANAME = "KHR_texture_basisu";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.TextureTransform.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_texture_transform";
+		public new const string SCHEMANAME = "KHR_texture_transform";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.TextureWEBP.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_texture_webp";
+		public new const string SCHEMANAME = "EXT_texture_webp";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Transmission.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_transmission";
+		public new const string SCHEMANAME = "KHR_materials_transmission";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.Unlit.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_unlit";
+		public new const string SCHEMANAME = "KHR_materials_unlit";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.XmpJsonLinkedData.Prop.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_xmp_json_ld";
+		public new const string SCHEMANAME = "KHR_xmp_json_ld";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.XmpJsonLinkedData.Root.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_xmp_json_ld";
+		public new const string SCHEMANAME = "KHR_xmp_json_ld";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.pbrSpecular.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_specular";
+		public new const string SCHEMANAME = "KHR_materials_specular";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Core/Schema2/Generated/ext.pbrSpecularGlossiness.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "KHR_materials_pbrSpecularGlossiness";
+		public new const string SCHEMANAME = "KHR_materials_pbrSpecularGlossiness";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 29 - 29
src/SharpGLTF.Core/Schema2/Generated/gltf.g.cs

@@ -189,7 +189,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "glTFChildOfRootProperty";
+		public new const string SCHEMANAME = "glTFChildOfRootProperty";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -247,7 +247,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "indices";
+		public new const string SCHEMANAME = "indices";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -319,7 +319,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "values";
+		public new const string SCHEMANAME = "values";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -385,7 +385,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "sparse";
+		public new const string SCHEMANAME = "sparse";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -456,7 +456,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "accessor";
+		public new const string SCHEMANAME = "accessor";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -570,7 +570,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "target";
+		public new const string SCHEMANAME = "target";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -634,7 +634,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "channel";
+		public new const string SCHEMANAME = "channel";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -698,7 +698,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "sampler";
+		public new const string SCHEMANAME = "sampler";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -769,7 +769,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "animation";
+		public new const string SCHEMANAME = "animation";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -835,7 +835,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "asset";
+		public new const string SCHEMANAME = "asset";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -911,7 +911,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "buffer";
+		public new const string SCHEMANAME = "buffer";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -976,7 +976,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "bufferView";
+		public new const string SCHEMANAME = "bufferView";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1063,7 +1063,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "orthographic";
+		public new const string SCHEMANAME = "orthographic";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1141,7 +1141,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "perspective";
+		public new const string SCHEMANAME = "perspective";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1222,7 +1222,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "camera";
+		public new const string SCHEMANAME = "camera";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1292,7 +1292,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "textureInfo";
+		public new const string SCHEMANAME = "textureInfo";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1358,7 +1358,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "pbrMetallicRoughness";
+		public new const string SCHEMANAME = "pbrMetallicRoughness";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1444,7 +1444,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "normalTextureInfo";
+		public new const string SCHEMANAME = "normalTextureInfo";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1500,7 +1500,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "occlusionTextureInfo";
+		public new const string SCHEMANAME = "occlusionTextureInfo";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1561,7 +1561,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "material";
+		public new const string SCHEMANAME = "material";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1666,7 +1666,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "primitive";
+		public new const string SCHEMANAME = "primitive";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1751,7 +1751,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "mesh";
+		public new const string SCHEMANAME = "mesh";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1819,7 +1819,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "node";
+		public new const string SCHEMANAME = "node";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1931,7 +1931,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "sampler";
+		public new const string SCHEMANAME = "sampler";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -2009,7 +2009,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "scene";
+		public new const string SCHEMANAME = "scene";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -2068,7 +2068,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "skin";
+		public new const string SCHEMANAME = "skin";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -2139,7 +2139,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "texture";
+		public new const string SCHEMANAME = "texture";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -2203,7 +2203,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "glTF";
+		public new const string SCHEMANAME = "glTF";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -2372,7 +2372,7 @@ namespace SharpGLTF.Schema2
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "image";
+		public new const string SCHEMANAME = "image";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 3 - 1
src/SharpGLTF.Core/Schema2/gltf.ExtraProperties.cs

@@ -70,7 +70,9 @@ namespace SharpGLTF.Schema2
 
         #region reflection
 
-        protected override string GetSchemaName() => "ExtraProperties";
+        public const string SCHEMANAME = "ExtraProperties";
+
+        protected override string GetSchemaName() => SCHEMANAME;
 
         IEnumerable<FieldInfo> Reflection.IReflectionObject.GetFields()
         {

+ 2 - 2
src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_instance_features.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "featureId";
+		public new const string SCHEMANAME = "featureId";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -129,7 +129,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_instance_features";
+		public new const string SCHEMANAME = "EXT_instance_features";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 3 - 3
src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_mesh_features.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "featureIdTexture";
+		public new const string SCHEMANAME = "featureIdTexture";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -103,7 +103,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "featureId";
+		public new const string SCHEMANAME = "featureId";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -194,7 +194,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_mesh_features";
+		public new const string SCHEMANAME = "EXT_mesh_features";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_primitive.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_structural_metadata";
+		public new const string SCHEMANAME = "EXT_structural_metadata";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 12 - 12
src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_ext_structural_metadata_root.g.cs

@@ -108,7 +108,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "property";
+		public new const string SCHEMANAME = "property";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -260,7 +260,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "class";
+		public new const string SCHEMANAME = "class";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -330,7 +330,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "value";
+		public new const string SCHEMANAME = "value";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -400,7 +400,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "enum";
+		public new const string SCHEMANAME = "enum";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -478,7 +478,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "schema";
+		public new const string SCHEMANAME = "schema";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -566,7 +566,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "property";
+		public new const string SCHEMANAME = "property";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -674,7 +674,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "propertyTable";
+		public new const string SCHEMANAME = "propertyTable";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -751,7 +751,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "propertyTexture";
+		public new const string SCHEMANAME = "propertyTexture";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -834,7 +834,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "propertyTexture";
+		public new const string SCHEMANAME = "propertyTexture";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -904,7 +904,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "property";
+		public new const string SCHEMANAME = "property";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -986,7 +986,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "propertyAttribute";
+		public new const string SCHEMANAME = "propertyAttribute";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -1056,7 +1056,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "EXT_structural_metadata";
+		public new const string SCHEMANAME = "EXT_structural_metadata";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Ext.3DTiles/Schema2/Generated/Ext.CESIUM_primitive_outline.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.Tiles3D
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "CESIUM_primitive_outline";
+		public new const string SCHEMANAME = "CESIUM_primitive_outline";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiNodeArticulations.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "AGI_articulations";
+		public new const string SCHEMANAME = "AGI_articulations";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 1 - 1
src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiNodeStkMetadata.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "AGI_stk_metadata";
+		public new const string SCHEMANAME = "AGI_stk_metadata";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 3 - 3
src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiRootArticulations.g.cs

@@ -62,7 +62,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "stage";
+		public new const string SCHEMANAME = "stage";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -144,7 +144,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "articulation";
+		public new const string SCHEMANAME = "articulation";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -215,7 +215,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "AGI_articulations";
+		public new const string SCHEMANAME = "AGI_articulations";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 2 - 2
src/SharpGLTF.Ext.Agi/Schema2/generated/ext.AgiRootStkMetadata.g.cs

@@ -44,7 +44,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "solarPanelGroup";
+		public new const string SCHEMANAME = "solarPanelGroup";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()
@@ -110,7 +110,7 @@ namespace SharpGLTF.Schema2.AGI
 	
 		#region reflection
 	
-		public const string SCHEMANAME = "AGI_stk_metadata";
+		public new const string SCHEMANAME = "AGI_stk_metadata";
 		protected override string GetSchemaName() => SCHEMANAME;
 	
 		protected override IEnumerable<string> ReflectFieldsNames()

+ 2 - 2
tests/SharpGLTF.Core.Tests/AssemblyAPITests.cs

@@ -58,7 +58,7 @@ namespace SharpGLTF
 
             foreach (var l in API)
             {
-                TestContext.WriteLine(l);
+                TestContext.Out.WriteLine(l);
             }
         }
 
@@ -109,7 +109,7 @@ namespace SharpGLTF
             {
                 if (!newLines.Contains(l))
                 {
-                    TestContext.WriteLine($"Missing:  {l}");
+                    TestContext.Out.WriteLine($"Missing:  {l}");
                     backwardsCompatible = false;
                 }                
             }

+ 1 - 1
tests/SharpGLTF.Core.Tests/IO/JsonContentTests.cs

@@ -194,7 +194,7 @@ namespace SharpGLTF.IO
 
             // checks
 
-            TestContext.WriteLine(roundtripJson);
+            TestContext.Out.WriteLine(roundtripJson);
 
             Assert.That(roundtripJson, Does.Contain("你好"));
             

+ 10 - 5
tests/SharpGLTF.Core.Tests/Schema2/Authoring/BasicSceneCreationTests.cs

@@ -14,6 +14,7 @@ namespace SharpGLTF.Schema2.Authoring
 
     [TestFixture]
     [Category("Model Authoring")]
+    [Description("These tests contain tests and examples on how to create glTF models from scratch, using only basic Toolkit facilities")]
     public class BasicSceneCreationTests
     {
         [Test(Description = "Creates an empty model")]
@@ -27,7 +28,7 @@ namespace SharpGLTF.Schema2.Authoring
             Assert.That(root.DefaultScene.Name, Is.EqualTo("Empty Scene"));
         }
 
-        [Test(Description = "Creates an empty model")]
+        [Test(Description = "Creates an empty model with an extras field")]
         public void CreateSceneWithExtras()
         {
             var root = ModelRoot.CreateModel();
@@ -85,7 +86,8 @@ namespace SharpGLTF.Schema2.Authoring
             var rnode = scene.CreateNode("Triangle Node");
 
             // create material
-            var material = model.CreateMaterial("Default")
+            var material = model
+                .CreateMaterial("Default")
                 .WithDefault(new Vector4(0, 1, 0, 1))
                 .WithDoubleSide(true);
 
@@ -104,7 +106,8 @@ namespace SharpGLTF.Schema2.Authoring
             var indices = new[] { 0, 1, 2 };
 
             // create mesh primitive
-            var primitive = rmesh.CreatePrimitive()
+            var primitive = rmesh
+                .CreatePrimitive()
                 .WithVertexAccessor("POSITION", positions)
                 .WithIndicesAccessor(PrimitiveType.TRIANGLES, indices)
                 .WithMaterial(material);
@@ -127,7 +130,8 @@ namespace SharpGLTF.Schema2.Authoring
             var rnode = scene.CreateNode("Triangle Node");
             var rmesh = rnode.Mesh = model.CreateMesh("Triangle Mesh");
 
-            var material = model.CreateMaterial("Default")
+            var material = model
+                .CreateMaterial("Default")
                 .WithPBRMetallicRoughness(Vector4.One, imagePath)
                 .WithDoubleSide(true);
 
@@ -148,7 +152,8 @@ namespace SharpGLTF.Schema2.Authoring
             };
 
             // create a mesh primitive and assgin the accessors and other properties
-            var primitive = rmesh.CreatePrimitive()
+            var primitive = rmesh
+                .CreatePrimitive()
                 .WithVertexAccessor("POSITION", positions)
                 .WithVertexAccessor("TEXCOORD_0", texCoords)
                 .WithIndicesAutomatic(PrimitiveType.TRIANGLES)

+ 3 - 3
tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadGeneratedTests.cs

@@ -58,7 +58,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
                     }
                     else
                     {
-                        TestContext.WriteLine($"{filePath.ToShortDisplayPath()} 🙂👍");                        
+                        TestContext.Out.WriteLine($"{filePath.ToShortDisplayPath()} 🙂👍");                        
                     }                    
                 }
                 catch (Exception ex)
@@ -71,8 +71,8 @@ namespace SharpGLTF.Schema2.LoadAndSave
                     }
                     else
                     {
-                        TestContext.WriteLine($"{filePath.ToShortDisplayPath()} 🙂👍");
-                        TestContext.WriteLine($"   Expected Exception: {ex.Message}");
+                        TestContext.Out.WriteLine($"{filePath.ToShortDisplayPath()} 🙂👍");
+                        TestContext.Out.WriteLine($"   Expected Exception: {ex.Message}");
                     }                    
                 }
 

+ 8 - 8
tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadSampleTests.cs

@@ -347,7 +347,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
 
                 var nodexform = instance.GetDrawableInstance(0).Transform;
 
-                TestContext.WriteLine($"Animation at {t}");
+                TestContext.Out.WriteLine($"Animation at {t}");
 
                 var curves = node.GetCurveSamplers(anim);
 
@@ -357,14 +357,14 @@ namespace SharpGLTF.Schema2.LoadAndSave
                         .CreateCurveSampler()
                         .GetPoint(t);            
                     
-                    TestContext.WriteLine($"    Morph Weights: {mw[0]} {mw[1]}");
+                    TestContext.Out.WriteLine($"    Morph Weights: {mw[0]} {mw[1]}");
                 }
 
                 var msw = curves.GetMorphingSampler<Transforms.SparseWeight8>()
                     .CreateCurveSampler()
                     .GetPoint(t);
 
-                TestContext.WriteLine($"    Morph Sparse : {msw.Weight0} {msw.Weight1}");
+                TestContext.Out.WriteLine($"    Morph Sparse : {msw.Weight0} {msw.Weight1}");
 
                 var triangles = model.DefaultScene
                     .EvaluateTriangles<Geometry.VertexTypes.VertexPosition, Geometry.VertexTypes.VertexEmpty>(null, anim, t)
@@ -375,9 +375,9 @@ namespace SharpGLTF.Schema2.LoadAndSave
                     .Distinct()
                     .ToList();
 
-                foreach (var v in vertices) TestContext.WriteLine($"{v}");
+                foreach (var v in vertices) TestContext.Out.WriteLine($"{v}");
 
-                TestContext.WriteLine();
+                TestContext.Out.WriteLine();
             }
 
 
@@ -409,16 +409,16 @@ namespace SharpGLTF.Schema2.LoadAndSave
 
             foreach (var f in TestFiles.GetBabylonJSModelsPaths())
             {
-                TestContext.WriteLine(f);
+                TestContext.Out.WriteLine(f);
 
                 var dependencies = ModelRoot.GetSatellitePaths(f);
 
                 foreach(var d in dependencies)
                 {
-                    TestContext.WriteLine($"    {d}");
+                    TestContext.Out.WriteLine($"    {d}");
                 }
 
-                TestContext.WriteLine();
+                TestContext.Out.WriteLine();
             }
         }
     }

+ 1 - 1
tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/LoadSpecialModelsTest.cs

@@ -83,7 +83,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
                 var bn = pollyNormals[b];
                 var cn = pollyNormals[c];
 
-                TestContext.WriteLine($"Triangle {ap} {an} {bp} {bn} {cp} {cn}");
+                TestContext.Out.WriteLine($"Triangle {ap} {an} {bp} {bn} {cp} {cn}");
             }
 
             // create a clone and apply a global axis transform.

+ 3 - 3
tests/SharpGLTF.Core.Tests/Schema2/LoadAndSave/RegressionTests.cs

@@ -28,7 +28,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
             Assert.That(model1, Is.Not.Null);
             Assert.That(model1.LogicalImages, Has.Count.EqualTo(4));
 
-            TestContext.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
+            TestContext.Out.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
 
             // local path            
 
@@ -39,7 +39,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
             Assert.That(model2, Is.Not.Null);
             Assert.That(model2.LogicalImages, Has.Count.EqualTo(4));
 
-            TestContext.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
+            TestContext.Out.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
 
             // relative path:
 
@@ -50,7 +50,7 @@ namespace SharpGLTF.Schema2.LoadAndSave
             Assert.That(model3, Is.Not.Null);
             Assert.That(model3.LogicalImages, Has.Count.EqualTo(4));
 
-            TestContext.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
+            TestContext.Out.WriteLine(string.Join("   ", ModelRoot.GetSatellitePaths(modelPath)));
 
             // restore current directory
 

+ 3 - 3
tests/SharpGLTF.Core.Tests/Transforms/AffineTransformMatrixTests.cs

@@ -142,8 +142,8 @@ namespace SharpGLTF.Transforms
             var srt_ab = AffineTransform.Multiply(srt_a, srt_b);
             var srt_ba = AffineTransform.Multiply(srt_b, srt_a);
 
-            TestContext.WriteLine($"A({sa},{ra}) x B({sb},{rb}) = {srt_ab.IsSRT}");
-            TestContext.WriteLine($"B({sb},{rb}) x A({sa},{ra}) = {srt_ba.IsSRT}");
+            TestContext.Out.WriteLine($"A({sa},{ra}) x B({sb},{rb}) = {srt_ab.IsSRT}");
+            TestContext.Out.WriteLine($"B({sb},{rb}) x A({sa},{ra}) = {srt_ba.IsSRT}");
 
             NumericsAssert.AreEqual(mat_ab, srt_ab.Matrix, 0.00001f);
             NumericsAssert.AreEqual(mat_ba, srt_ba.Matrix, 0.00001f);
@@ -176,7 +176,7 @@ namespace SharpGLTF.Transforms
             #endif
 
             var diff = NumericsAssert.AreGeometryicallyEquivalent(mi, xmi, tolerance);
-            TestContext.WriteLine(diff);
+            TestContext.Out.WriteLine(diff);
 
             Assert.That(AffineTransform.AreGeometricallyEquivalent(mi, xi, tolerance), Is.True);
         }

+ 4 - 4
tests/SharpGLTF.Core.Tests/Validation/InvalidFilesTests.cs

@@ -24,7 +24,7 @@ namespace SharpGLTF.Validation
                 var report = GltfValidator.ValidationReport.Parse(json);
 
                 TestContext.Progress.WriteLine($"{f}...");
-                TestContext.Write($"{f}...");
+                TestContext.Out.Write($"{f}...");
 
                 var result = Schema2.ModelRoot.Validate(f);
 
@@ -50,7 +50,7 @@ namespace SharpGLTF.Validation
                 }
 
                 TestContext.Progress.WriteLine($"{f}...");
-                TestContext.WriteLine($"{f}...");
+                TestContext.Out.WriteLine($"{f}...");
 
                 var result = Schema2.ModelRoot.Validate(f);
 
@@ -88,8 +88,8 @@ namespace SharpGLTF.Validation
 
                 if (result.HasErrors != report.Issues.NumErrors > 0)
                 {
-                    TestContext.WriteLine($"Failed: {f}");
-                    foreach (var e in report.Issues.Messages.Where(item => item.Severity == 0)) TestContext.WriteLine($"    {e.Text}");
+                    TestContext.Out.WriteLine($"Failed: {f}");
+                    foreach (var e in report.Issues.Messages.Where(item => item.Severity == 0)) TestContext.Out.WriteLine($"    {e.Text}");
                 }
 
                 Assert.That(result.HasErrors, Is.EqualTo(report.Issues.NumErrors > 0), result.Errors.FirstOrDefault()?.Message);                                

+ 3 - 3
tests/SharpGLTF.Ext.3DTiles.Tests/GenericTests.cs

@@ -17,16 +17,16 @@ namespace SharpGLTF
 
             var fileName = ResourceInfo.From("_");
 
-            TestContext.WriteLine("Dumping current Resource context:");
+            TestContext.Out.WriteLine("Dumping current Resource context:");
 
             foreach(var f in fileName.File.Directory.EnumerateDirectories("*",System.IO.SearchOption.AllDirectories))
             {
-                TestContext.WriteLine($"{f.Exists} {f.FullName}");
+                TestContext.Out.WriteLine($"{f.Exists} {f.FullName}");
             }
 
             foreach (var f in fileName.File.Directory.EnumerateFiles("*", System.IO.SearchOption.AllDirectories))
             {
-                TestContext.WriteLine($"{f.Exists} {f.FullName}");
+                TestContext.Out.WriteLine($"{f.Exists} {f.FullName}");
             }
 
         }

+ 1 - 1
tests/SharpGLTF.NUnit/NUnitGltfUtils.cs

@@ -107,7 +107,7 @@ namespace SharpGLTF
 
                 if (report.Severity == GltfValidator.Severity.Error || report.Severity == GltfValidator.Severity.Warning)
                 {
-                    TestContext.WriteLine(report.ToString());
+                    TestContext.Out.WriteLine(report.ToString());
                 }
 
                 Assert.That(report.Severity, Is.Not.EqualTo(GltfValidator.Severity.Error));

+ 2 - 2
tests/SharpGLTF.ThirdParty.Tests/SandboxTests.cs

@@ -47,7 +47,7 @@ namespace SharpGLTF.ThirdParty
             var model = ModelRoot.CreateModel();
             model.CreateMaterial(material);
 
-            TestContext.WriteLine(model.GetJsonPreview());
+            TestContext.Out.WriteLine(model.GetJsonPreview());
         }
 
         [Test]
@@ -101,7 +101,7 @@ namespace SharpGLTF.ThirdParty
 
             var json = model.GetJsonPreview();
             AttachmentInfo.From("model.json").WriteAllText(json);
-            TestContext.WriteLine(json);
+            TestContext.Out.WriteLine(json);
 
             model.DeepClone();
 

+ 108 - 108
tests/SharpGLTF.Core.Tests/Collections/VertexListTests.cs → tests/SharpGLTF.Toolkit.Tests/Collections/VertexListTests.cs

@@ -1,108 +1,108 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using NUnit.Framework;
-
-using XYZ = System.Numerics.Vector3;
-
-namespace SharpGLTF.Collections
-{
-    [TestFixture]
-    [Category("Core")]
-    public class VertexListTests
-    {
-        [Test]
-        public void TestFloatHashCode()
-        {
-            // it's important to ensure that the hash or positive and negative Zero is the same.
-
-            float positiveZero = 0f;
-            float negativeZero = -positiveZero;
-
-            var floats = new float[] { positiveZero, negativeZero };
-            var integers = System.Runtime.InteropServices.MemoryMarshal.Cast<float, uint>(floats);
-            Assert.That(integers[1], Is.Not.EqualTo(integers[0]));
-
-            var positiveHash = positiveZero.GetHashCode();
-            var negativeHash = negativeZero.GetHashCode();
-            Assert.That(negativeHash, Is.EqualTo(positiveHash));
-        }
-
-        [System.Diagnostics.DebuggerDisplay("{Value}")]
-        struct _VertexExample
-        {
-            public static implicit operator _VertexExample(int value)
-            {
-                return new _VertexExample(value);
-            }
-
-            public _VertexExample(int val)
-            {
-                Value = val;
-            }
-
-            public int Value;
-        }
-
-        [Test]
-        public void TestVertexListDictionary()
-        {
-            var list = new VertexList<_VertexExample>();
-
-            list.Use(5);
-            Assert.That(list, Has.Count.EqualTo(1));
-
-            list.Use(7);
-            Assert.That(list, Has.Count.EqualTo(2));
-            Assert.That(list[0].Value, Is.EqualTo(5));
-            Assert.That(list[1].Value, Is.EqualTo(7));
-
-            list.Use(5);
-            Assert.That(list, Has.Count.EqualTo(2));
-
-            var list2 = new VertexList<_VertexExample>();
-            list.CopyTo(list2);
-            Assert.That(list2, Has.Count.EqualTo(2));
-
-        }
-
-        [Test]
-        public void TestValueListSet()
-        {
-            var a = new XYZ(1.1f);
-            var b = new XYZ(1.2f);
-            var c = new XYZ(1.3f);
-            var d = new XYZ(1.4f);
-
-            var vlist = new ValueListSet<XYZ>();
-
-            var idx0 = vlist.Use(a); Assert.That(idx0, Is.EqualTo(0));
-            var idx1 = vlist.Use(b); Assert.That(idx1, Is.EqualTo(1));
-            var idx2 = vlist.Use(a); Assert.That(idx2, Is.EqualTo(0));
-
-            Assert.That(vlist[idx0], Is.EqualTo(a));
-            Assert.That(vlist[idx1], Is.EqualTo(b));
-            Assert.That(vlist[idx2], Is.EqualTo(a));
-
-            Assert.That(new[] { a, b }, Is.EqualTo(vlist.ToArray()));
-
-            vlist.Use(c);
-            vlist.Use(d);
-            Assert.That(new[] { a, b, c, d }, Is.EqualTo(vlist.ToArray()));
-
-            var vlist2 = new ValueListSet<XYZ>();
-            vlist.CopyTo(vlist2);
-
-            Assert.That(vlist2[0], Is.EqualTo(vlist[0]));
-            Assert.That(vlist2[1], Is.EqualTo(vlist[1]));
-            Assert.That(vlist2[2], Is.EqualTo(vlist[2]));
-            Assert.That(vlist2[3], Is.EqualTo(vlist[3]));
-
-        }
-
-
-
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using NUnit.Framework;
+
+using XYZ = System.Numerics.Vector3;
+
+namespace SharpGLTF.Collections
+{
+    [TestFixture]
+    [Category("Core")]
+    public class VertexListTests
+    {
+        [Test]
+        public void TestFloatHashCode()
+        {
+            // it's important to ensure that the hash or positive and negative Zero is the same.
+
+            float positiveZero = 0f;
+            float negativeZero = -positiveZero;
+
+            var floats = new float[] { positiveZero, negativeZero };
+            var integers = System.Runtime.InteropServices.MemoryMarshal.Cast<float, uint>(floats);
+            Assert.That(integers[1], Is.Not.EqualTo(integers[0]));
+
+            var positiveHash = positiveZero.GetHashCode();
+            var negativeHash = negativeZero.GetHashCode();
+            Assert.That(negativeHash, Is.EqualTo(positiveHash));
+        }
+
+        [System.Diagnostics.DebuggerDisplay("{Value}")]
+        struct _VertexExample
+        {
+            public static implicit operator _VertexExample(int value)
+            {
+                return new _VertexExample(value);
+            }
+
+            public _VertexExample(int val)
+            {
+                Value = val;
+            }
+
+            public int Value;
+        }
+
+        [Test]
+        public void TestVertexListDictionary()
+        {
+            var list = new VertexList<_VertexExample>();
+
+            list.Use(5);
+            Assert.That(list, Has.Count.EqualTo(1));
+
+            list.Use(7);
+            Assert.That(list, Has.Count.EqualTo(2));
+            Assert.That(list[0].Value, Is.EqualTo(5));
+            Assert.That(list[1].Value, Is.EqualTo(7));
+
+            list.Use(5);
+            Assert.That(list, Has.Count.EqualTo(2));
+
+            var list2 = new VertexList<_VertexExample>();
+            list.CopyTo(list2);
+            Assert.That(list2, Has.Count.EqualTo(2));
+
+        }
+
+        [Test]
+        public void TestValueListSet()
+        {
+            var a = new XYZ(1.1f);
+            var b = new XYZ(1.2f);
+            var c = new XYZ(1.3f);
+            var d = new XYZ(1.4f);
+
+            var vlist = new ValueListSet<XYZ>();
+
+            var idx0 = vlist.Use(a); Assert.That(idx0, Is.EqualTo(0));
+            var idx1 = vlist.Use(b); Assert.That(idx1, Is.EqualTo(1));
+            var idx2 = vlist.Use(a); Assert.That(idx2, Is.EqualTo(0));
+
+            Assert.That(vlist[idx0], Is.EqualTo(a));
+            Assert.That(vlist[idx1], Is.EqualTo(b));
+            Assert.That(vlist[idx2], Is.EqualTo(a));
+
+            Assert.That(new[] { a, b }, Is.EqualTo(vlist.ToArray()));
+
+            vlist.Use(c);
+            vlist.Use(d);
+            Assert.That(new[] { a, b, c, d }, Is.EqualTo(vlist.ToArray()));
+
+            var vlist2 = new ValueListSet<XYZ>();
+            vlist.CopyTo(vlist2);
+
+            Assert.That(vlist2[0], Is.EqualTo(vlist[0]));
+            Assert.That(vlist2[1], Is.EqualTo(vlist[1]));
+            Assert.That(vlist2[2], Is.EqualTo(vlist[2]));
+            Assert.That(vlist2[3], Is.EqualTo(vlist[3]));
+
+        }
+
+
+
+    }
+}

+ 1 - 1
tests/SharpGLTF.Toolkit.Tests/Scenes/SceneBuilderTests.cs

@@ -527,7 +527,7 @@ namespace SharpGLTF.Scenes
 
             var gltf = scene.ToGltf2();
 
-            TestContext.WriteLine(gltf.GetJsonPreview());
+            TestContext.Out.WriteLine(gltf.GetJsonPreview());
 
             var meshIdx = 1;