Fix serialization for container style (#806)

* Fix serialization for container style

* add assemblyinfo back

* fix tests

Author: matthidinger

source/dotnet/Library/AdaptiveCards/AdaptiveContainer.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using System;
 
 namespace AdaptiveCards
 {
@@ -31,27 +30,7 @@ public AdaptiveContainer()
         /// <summary>
         ///     The style in which the image is displayed.
         /// </summary>
-        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
         public AdaptiveContainerStyle Style { get; set; }
     }
-
-    [JsonConverter(typeof(IgnoreDefaultStringEnumConverter<AdaptiveContainerStyle>), true)]
-    public enum AdaptiveContainerStyle
-    {
-        /// <summary>
-        /// The container is a default container
-        /// </summary>
-        Default = 0,
-
-        /// <summary>
-        /// The container is a normal container
-        /// </summary>
-        [Obsolete("ContainerStyle.Normal has been deprecated.  Use ContainerStyle.Default", false)]
-        Normal = 0,
-
-        /// <summary>
-        /// The container should be emphasized as a grouping of elements
-        /// </summary>
-        Emphasis = 1
-    }
 }

source/dotnet/Library/AdaptiveCards/AdaptiveContainerStyle.cs

@@ -0,0 +1,25 @@
+using System;
+using Newtonsoft.Json;
+
+namespace AdaptiveCards
+{
+    [JsonConverter(typeof(IgnoreDefaultStringEnumConverter<AdaptiveContainerStyle>), true)]
+    public enum AdaptiveContainerStyle
+    {
+        /// <summary>
+        /// The container is a default container
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        /// The container is a normal container
+        /// </summary>
+        [Obsolete("ContainerStyle.Normal has been deprecated.  Use ContainerStyle.Default", false)]
+        Normal = 0,
+
+        /// <summary>
+        /// The container should be emphasized as a grouping of elements
+        /// </summary>
+        Emphasis = 1
+    }
+}

source/dotnet/Test/AdaptiveCards.Test/AdaptiveCardSerializationTests.cs

@@ -48,7 +48,6 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AdaptiveCardSerializationTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="AdaptiveCardApiTests.cs" />
     <Compile Include="HostConfigApiTests.cs" />

source/dotnet/Test/AdaptiveCards.Test/AdaptiveCards.Test.csproj

@@ -47,5 +47,30 @@ public void TestCardsSerializeInTheCorrectOrder()
             Assert.AreEqual(expected, card.ToJson());
 
         }
+
+        [TestMethod]
+        public void TestSerializingTextBlock()
+        {
+            var card = new AdaptiveCard()
+            {
+                Body =
+                {
+                    new AdaptiveTextBlock()
+                    {
+                        Text = "Hello world"
+                    }
+                }
+            };
+
+            string json = card.ToJson();
+
+            // Re-parse the card
+            card = AdaptiveCard.FromJson(json).Card;
+
+            // Ensure there's a text element
+            Assert.AreEqual(1, card.Body.Count);
+            Assert.IsInstanceOfType(card.Body[0], typeof(AdaptiveTextBlock));
+            Assert.AreEqual("Hello world", (card.Body[0] as AdaptiveTextBlock).Text);
+        }
     }
 }