[.NET + WPF + HTML] Add underline support (#3316)

* Add underline support to WPF

* Add underline to html

Author: almedina-ms

source/dotnet/Library/AdaptiveCards.Rendering.Html/AdaptiveCardRenderer.cs

@@ -18,7 +18,7 @@ public class AdaptiveCardRenderer : AdaptiveCardRendererBase<HtmlTag, AdaptiveRe
     {
         protected override AdaptiveSchemaVersion GetSupportedSchemaVersion()
         {
-            return new AdaptiveSchemaVersion(1, 2);
+            return new AdaptiveSchemaVersion(1, 3);
         }
 
         /// <summary>
@@ -1076,10 +1076,18 @@ protected static HtmlTag TextRunRender(AdaptiveTextRun textRun, AdaptiveRenderCo
                 uiTextRun.Style("font-style", "italic");
             }
 
-            if (textRun.Strikethrough)
+            if (textRun.Strikethrough && textRun.Underline)
+            {
+                uiTextRun.Style("text-decoration", "line-through underline");
+            }
+            else if (textRun.Strikethrough)
             {
                 uiTextRun.Style("text-decoration", "line-through");
             }
+            else if (textRun.Underline)
+            {
+                uiTextRun.Style("text-decoration", "underline");
+            }
 
             if (textRun.Highlight)
             {

source/dotnet/Library/AdaptiveCards.Rendering.Wpf/AdaptiveCardRenderer.cs

@@ -17,7 +17,7 @@ public class AdaptiveCardRenderer : AdaptiveCardRendererBase<FrameworkElement, A
     {
         protected override AdaptiveSchemaVersion GetSupportedSchemaVersion()
         {
-            return new AdaptiveSchemaVersion(1, 2);
+            return new AdaptiveSchemaVersion(1, 3);
         }
 
         protected Action<object, AdaptiveActionEventArgs> ActionCallback;

source/dotnet/Library/AdaptiveCards.Rendering.Wpf/AdaptiveRichTextBlockRenderer.cs

@@ -70,7 +70,12 @@ private static void AddInlineTextRun(TextBlock uiRichTB, AdaptiveTextRun textRun
 
             if (textRun.Strikethrough)
             {
-                textRunSpan.TextDecorations = TextDecorations.Strikethrough;
+                textRunSpan.TextDecorations.Add(TextDecorations.Strikethrough);
+            }
+            
+            if (textRun.Underline)
+            {
+                textRunSpan.TextDecorations.Add(TextDecorations.Underline);
             }
 
             if (textRun.Highlight)

source/dotnet/Library/AdaptiveCards/AdaptiveCard.cs

@@ -30,7 +30,7 @@ public class AdaptiveCard : AdaptiveTypedElement
         /// <summary>
         /// The latest known schema version supported by this library
         /// </summary>
-        public static AdaptiveSchemaVersion KnownSchemaVersion = new AdaptiveSchemaVersion(1, 2);
+        public static AdaptiveSchemaVersion KnownSchemaVersion = new AdaptiveSchemaVersion(1, 3);
 
         /// <summary>
         /// Creates an AdaptiveCard using a specific schema version

source/dotnet/Library/AdaptiveCards/AdaptiveTextRun.cs

@@ -125,5 +125,15 @@ public AdaptiveTextRun(string text)
 #endif
         [DefaultValue(null)]
         public AdaptiveAction SelectAction { get; set; }
+
+        /// <summary>
+        ///     Make the text be underlined
+        /// </summary>
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Ignore)]
+#if !NETSTANDARD1_3
+        [XmlAttribute]
+#endif
+        [DefaultValue(false)]
+        public bool Underline { get; set; }
     }
 }

source/dotnet/Library/AdaptiveCards/Globals.cs

@@ -2,6 +2,6 @@ namespace AdaptiveCards
 {
     class Globals
     {
-        public static readonly string ObjectModelVersion = "1.2";
+        public static readonly string ObjectModelVersion = "1.3";
     }
 }