Merge branch 'xoofx:main' into main

.github/workflows/ci.yml

@@ -15,15 +15,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
 
-    - name: Install .NET 6.0
-      uses: actions/setup-dotnet@v1
+    - name: Install .NET 7.0
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
 
     - name: Build, Test, Pack, Publish
       shell: bash

src/Tomlyn.Tests/BasicTests.cs

@@ -12,6 +12,19 @@ namespace Tomlyn.Tests
 {
     public class BasicTests
     {
+        [Test]
+        public void TestTableArraysContainingPrimitiveArraysSerialize()
+        {
+            var test = @"[[table_array]]
+primitive_list = [4, 5, 6]
+";
+
+            var model = Toml.ToModel(test);
+            var tomlOut = Toml.FromModel(model);
+
+            Assert.AreEqual(test, tomlOut);
+        }
+
         [Test]
         public void TestHelloWorld()
         {

src/Tomlyn.Tests/Tomlyn.Tests.csproj

@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="nunit" Version="3.14.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Tomlyn/Model/Accessors/DictionaryDynamicAccessor.cs

@@ -227,8 +227,7 @@ public SlowDictionaryAccessor(DynamicModelReadContext context, Type dictionaryTy
 
         public override IEnumerable<KeyValuePair<string, object?>> GetElements(object dictionary)
         {
-            var it = (IEnumerable)dictionary;
-            var enumerator = (IDictionaryEnumerator)it.GetEnumerator();
+            var enumerator = ((IDictionary)dictionary).GetEnumerator();
             while (enumerator.MoveNext())
             {
 

src/Tomlyn/Model/ModelToTomlTransform.cs

@@ -432,6 +432,10 @@ private bool IsRequiringInline(object? value)
 
     private bool IsRequiringInline(ListDynamicAccessor accessor, object value, int parentConsecutiveList)
     {
+        // Always disable inline for TomlTableArray
+        // This is only working for default TomlTableArray model
+        if (value is TomlTableArray) return false;
+
         foreach (var element in accessor.GetElements(value))
         {
             if (element is null) continue; // TODO: should this log an error?

src/Tomlyn/Tomlyn.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
     <LangVersion>10.0</LangVersion>
     <Description>Tomlyn is a TOML parser, validator and authoring library for .NET.</Description>
     <Copyright>Alexandre Mutel</Copyright>

src/global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "6.0.100",
+        "version": "7.0.100",
         "rollForward": "latestMinor",
         "allowPrerelease": false
     }