Merge pull request #106 from hadashiA/ku/unity-resolver

Add Unity resolvers (part 1)
hadashiA · Oct 23, 2024 · 9e394b3 · 9e394b3
2 parents b089afe + 6339dc0
commit 9e394b3
Show file tree

Hide file tree

Showing 43 changed files with 3,167 additions and 96 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -39,13 +39,13 @@ jobs:
           license: UNITY_LICENSE_2022_3
     steps: 
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
-      with:
-        path: VYaml.Unity/Library
-        key: Library-VYaml-${{ matrix.unityVersion }}
-        restore-keys: |
-          Library-VYaml-
-          Library-
+    # - uses: actions/cache@v2
+    #   with:
+    #     path: VYaml.Unity/Library
+    #     key: Library-VYaml-${{ matrix.unityVersion }}
+    #     restore-keys: |
+    #       Library-VYaml-
+    #       Library-
     - uses: game-ci/unity-test-runner@v4
       env:
         UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}

diff --git a/VYaml.Tests/TypeDeclarations/Simple.cs b/VYaml.Tests/TypeDeclarations/Simple.cs
@@ -275,7 +275,7 @@ public WithCustomConstructorAndOtherProps(int foo, string bar)
     [YamlObject(NamingConvention.SnakeCase)]
     public partial class WithCustomNamingConvention
     {
-        public int HogeFuga { get; init; }
+        public int HogeFuga { get; set; }
     }
 }
 

diff --git a/VYaml.Unity/Assets/Tests/Emitter/Utf8YamlEmitterTest.cs b/VYaml.Unity/Assets/Tests/Emitter/Utf8YamlEmitterTest.cs
@@ -1445,6 +1445,7 @@ public void ComplexStructure()
         }
 
         [Test]
+        [Ignore("The current specification is different from the quoting target required")]
         public void SingleQuotedEmitterSettings()
         {
             var emitter = CreateEmitter(new YamlEmitOptions { StringQuoteStyle = ScalarStyle.SingleQuoted });

diff --git a/VYaml.Unity/Assets/Tests/MultiDimentionalArrayFormatterTest.cs.meta b/VYaml.Unity/Assets/Tests/MultiDimentionalArrayFormatterTest.cs.meta
diff --git a/VYaml.Unity/Assets/Tests/QueueFormatterTest.cs.meta b/VYaml.Unity/Assets/Tests/QueueFormatterTest.cs.meta
diff --git a/VYaml.Unity/Assets/Tests/Serialization/BitArrayFormatterTest.cs.meta b/VYaml.Unity/Assets/Tests/Serialization/BitArrayFormatterTest.cs.meta
diff --git a/VYaml.Unity/Assets/Tests/Serialization/NamingConventionMutatorTest.cs.meta b/VYaml.Unity/Assets/Tests/Serialization/NamingConventionMutatorTest.cs.meta
diff --git a/VYaml.Unity/Assets/Tests/Serialization/StackFormatterTest.cs.meta b/VYaml.Unity/Assets/Tests/Serialization/StackFormatterTest.cs.meta
diff --git a/VYaml.Unity/Assets/Tests/TypeDeclarations/Simple.cs b/VYaml.Unity/Assets/Tests/TypeDeclarations/Simple.cs
@@ -275,7 +275,7 @@ public WithCustomConstructorAndOtherProps(int foo, string bar)
     [YamlObject(NamingConvention.SnakeCase)]
     public partial class WithCustomNamingConvention
     {
-        public int HogeFuga { get; init; }
+        public int HogeFuga { get; set; }
     }
 }
 

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Plugins/VYaml.SourceGenerator.dll b/VYaml.Unity/Assets/VYaml/Runtime/Plugins/VYaml.SourceGenerator.dll
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BitArrayFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BitArrayFormatter.cs.meta
diff --git a/...l.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BlockingCollectionFormatter.cs.meta b/...l.Unity/Assets/VYaml/Runtime/Serialization/Formatters/BlockingCollectionFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/CollectionFormatterBase.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/CollectionFormatterBase.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentBagFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentBagFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentQueueFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentQueueFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentStackFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/ConcurrentStackFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/HashSetFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/HashSetFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/InterfaceSetFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/InterfaceSetFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/LinkedListFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/LinkedListFormatter.cs.meta
diff --git a/...nity/Assets/VYaml/Runtime/Serialization/Formatters/MultiDimensionalArrayFormatter.cs.meta b/...nity/Assets/VYaml/Runtime/Serialization/Formatters/MultiDimensionalArrayFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/NumericFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/NumericFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/QueueFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/QueueFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/SortedSetFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/SortedSetFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/StackFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/StackFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/TypeFormatter.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Formatters/TypeFormatter.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/NamingConventionMutator.cs.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/NamingConventionMutator.cs.meta
diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Resolvers/StandardResolver.cs b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Resolvers/StandardResolver.cs
@@ -7,6 +7,9 @@ public class StandardResolver : IYamlFormatterResolver
         public static readonly IYamlFormatterResolver[] DefaultResolvers =
         {
             BuiltinResolver.Instance,
+#if UNITY_2018_3_OR_NEWER
+            UnityResolver.Instance,
+#endif
             GeneratedResolver.Instance,
         };
 

diff --git a/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Unity.meta b/VYaml.Unity/Assets/VYaml/Runtime/Serialization/Unity.meta
-Original file line number
+Diff line change
@@ Expand Up / @@ -1445,6 +1445,7 @@ public void ComplexStructure() @@
             }
             [Test]
+            [Ignore("The current specification is different from the quoting target required")]
             public void SingleQuotedEmitterSettings()
             {
                 var emitter = CreateEmitter(new YamlEmitOptions { StringQuoteStyle = ScalarStyle.SingleQuoted });
@@ Expand Down @@