From 33edbfbb1061bbdebd8b919996e6de847488c9e4 Mon Sep 17 00:00:00 2001
From: Andrew <anclear@microsoft.com>
Date: Thu, 8 Aug 2019 15:47:36 -0700
Subject: [PATCH] Fix build errors

---
 .../Microsoft.Bot.Builder.Teams.csproj               |  1 +
 .../Microsoft.Bot.Connector.Teams.csproj             |  1 +
 .../MessageActionsPayloadBodyExtensions.cs           | 12 ++++++------
 .../Microsoft.Bot.Schema.Teams.csproj                |  1 +
 .../Microsoft.Bot.Builder.Abstractions.Teams.csproj  |  1 +
 .../Microsoft.Bot.Builder.Abstractions.csproj        |  1 +
 ...icrosoft.Bot.Builder.Teams.AuditBot.AspNet.csproj |  8 +++++++-
 .../Web.config                                       |  4 ++--
 .../Microsoft.Bot.Builder.Teams.AuditBot.csproj      |  1 +
 .../Microsoft.Bot.Builder.Teams.FileBot.csproj       |  1 +
 ...ft.Bot.Builder.Teams.MessagingExtensionBot.csproj |  1 +
 .../Microsoft.Bot.Builder.Teams.RemindMeBot.csproj   |  3 ++-
 .../Microsoft.Bot.Builder.Teams.TeamEchoBot.csproj   |  1 +
 ....Builder.Teams.WikipediaMessagingExtension.csproj |  1 +
 .../Microsoft.Bot.Builder.Teams.Tests.csproj         |  1 +
 15 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/CSharp/Microsoft.Bot.Builder.Teams/Microsoft.Bot.Builder.Teams.csproj b/CSharp/Microsoft.Bot.Builder.Teams/Microsoft.Bot.Builder.Teams.csproj
index 6f9c004..5217021 100644
--- a/CSharp/Microsoft.Bot.Builder.Teams/Microsoft.Bot.Builder.Teams.csproj
+++ b/CSharp/Microsoft.Bot.Builder.Teams/Microsoft.Bot.Builder.Teams.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AdaptiveCards" Version="1.0.0" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.3.2" />
   </ItemGroup>
 
diff --git a/CSharp/Microsoft.Bot.Connector.Teams/Microsoft.Bot.Connector.Teams.csproj b/CSharp/Microsoft.Bot.Connector.Teams/Microsoft.Bot.Connector.Teams.csproj
index 3256454..a4b52e4 100644
--- a/CSharp/Microsoft.Bot.Connector.Teams/Microsoft.Bot.Connector.Teams.csproj
+++ b/CSharp/Microsoft.Bot.Connector.Teams/Microsoft.Bot.Connector.Teams.csproj
@@ -7,6 +7,7 @@
   <Import Project="..\Build\Common.props" />
   
   <ItemGroup>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
   </ItemGroup>
 
diff --git a/CSharp/Microsoft.Bot.Schema.Teams/MessageActionsPayloadBodyExtensions.cs b/CSharp/Microsoft.Bot.Schema.Teams/MessageActionsPayloadBodyExtensions.cs
index 00a7714..c222a97 100644
--- a/CSharp/Microsoft.Bot.Schema.Teams/MessageActionsPayloadBodyExtensions.cs
+++ b/CSharp/Microsoft.Bot.Schema.Teams/MessageActionsPayloadBodyExtensions.cs
@@ -10,10 +10,9 @@ namespace Microsoft.Bot.Schema.Teams
     /// <summary>
     /// MessageActionsPayloadBody extensions.
     /// </summary>
-
     public static class MessageActionsPayloadBodyExtensions
     {
-        private static readonly HashSet<string> textRestrictedHtmlTags = new HashSet<string> { "at", "attachment" };
+        private static readonly HashSet<string> TextRestrictedHtmlTags = new HashSet<string> { "at", "attachment" };
 
         /// <summary>
         /// Strip HTML tags from MessageActionsPayloadBody content.
@@ -23,13 +22,13 @@ public static class MessageActionsPayloadBodyExtensions
         public static string GetPlainTextContent(this MessageActionsPayloadBody body)
         {
             var doc = new HtmlDocument();
-            doc.LoadHtml(body.content);
-            return StripHtmlTags(doc.DocumentNode, textRestrictedHtmlTags);
+            doc.LoadHtml(body.Content);
+            return StripHtmlTags(doc.DocumentNode, TextRestrictedHtmlTags);
         }
 
         private static string StripHtmlTags(HtmlNode node, ISet<string> tags)
         {
-            string result = "";
+            string result = string.Empty;
             if (tags.Contains(node.Name))
             {
                 result += node.OuterHtml;
@@ -48,7 +47,8 @@ private static string StripHtmlTags(HtmlNode node, ISet<string> tags)
                     }
                 }
             }
+
             return result;
-        }                            
+        }
     }
 }
diff --git a/CSharp/Microsoft.Bot.Schema.Teams/Microsoft.Bot.Schema.Teams.csproj b/CSharp/Microsoft.Bot.Schema.Teams/Microsoft.Bot.Schema.Teams.csproj
index fcede3a..06cc38d 100644
--- a/CSharp/Microsoft.Bot.Schema.Teams/Microsoft.Bot.Schema.Teams.csproj
+++ b/CSharp/Microsoft.Bot.Schema.Teams/Microsoft.Bot.Schema.Teams.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="AdaptiveCards" Version="1.0.0" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.Bot.Schema" Version="4.3.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
   </ItemGroup>
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Abstractions.Teams/Microsoft.Bot.Builder.Abstractions.Teams.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Abstractions.Teams/Microsoft.Bot.Builder.Abstractions.Teams.csproj
index 864398b..c07ef01 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Abstractions.Teams/Microsoft.Bot.Builder.Abstractions.Teams.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Abstractions.Teams/Microsoft.Bot.Builder.Abstractions.Teams.csproj
@@ -19,6 +19,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Abstractions/Microsoft.Bot.Builder.Abstractions.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Abstractions/Microsoft.Bot.Builder.Abstractions.csproj
index dbb73e0..abb3210 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Abstractions/Microsoft.Bot.Builder.Abstractions.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Abstractions/Microsoft.Bot.Builder.Abstractions.csproj
@@ -20,6 +20,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.3.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008">
       <PrivateAssets>all</PrivateAssets>
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Microsoft.Bot.Builder.Teams.AuditBot.AspNet.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Microsoft.Bot.Builder.Teams.AuditBot.AspNet.csproj
index c9c19e9..2965e62 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Microsoft.Bot.Builder.Teams.AuditBot.AspNet.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Microsoft.Bot.Builder.Teams.AuditBot.AspNet.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Bot.Builder.Teams.AuditBot</RootNamespace>
     <AssemblyName>Microsoft.Bot.Builder.Teams.AuditBot.AspNet</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -52,6 +52,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
@@ -65,10 +66,12 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Global.asax" />
@@ -124,6 +127,9 @@
     <PackageReference Include="Autofac.WebApi2">
       <Version>4.2.0</Version>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack">
+      <Version>1.11.12</Version>
+    </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi">
       <Version>5.2.6</Version>
     </PackageReference>
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Web.config b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Web.config
index eaad4ab..ea62bec 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Web.config
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot.AspNet/Web.config
@@ -14,8 +14,8 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="true" targetFramework="4.6.2"/>
-    <httpRuntime targetFramework="4.6.2"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
+    <httpRuntime targetFramework="4.6.1"/>
   </system.web>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot/Microsoft.Bot.Builder.Teams.AuditBot.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot/Microsoft.Bot.Builder.Teams.AuditBot.csproj
index 44655aa..181fd76 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot/Microsoft.Bot.Builder.Teams.AuditBot.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.AuditBot/Microsoft.Bot.Builder.Teams.AuditBot.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.2" />
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.FileBot/Microsoft.Bot.Builder.Teams.FileBot.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.FileBot/Microsoft.Bot.Builder.Teams.FileBot.csproj
index 7f2e878..f331865 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.FileBot/Microsoft.Bot.Builder.Teams.FileBot.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.FileBot/Microsoft.Bot.Builder.Teams.FileBot.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.2" />
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.MessagingExtensionBot/Microsoft.Bot.Builder.Teams.MessagingExtensionBot.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.MessagingExtensionBot/Microsoft.Bot.Builder.Teams.MessagingExtensionBot.csproj
index 7f2e878..f331865 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.MessagingExtensionBot/Microsoft.Bot.Builder.Teams.MessagingExtensionBot.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.MessagingExtensionBot/Microsoft.Bot.Builder.Teams.MessagingExtensionBot.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.2" />
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.RemindMeBot/Microsoft.Bot.Builder.Teams.RemindMeBot.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.RemindMeBot/Microsoft.Bot.Builder.Teams.RemindMeBot.csproj
index c6f7be0..90831fd 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.RemindMeBot/Microsoft.Bot.Builder.Teams.RemindMeBot.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.RemindMeBot/Microsoft.Bot.Builder.Teams.RemindMeBot.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.2" />
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.TeamEchoBot/Microsoft.Bot.Builder.Teams.TeamEchoBot.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.TeamEchoBot/Microsoft.Bot.Builder.Teams.TeamEchoBot.csproj
index 3286c25..92e9f73 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.TeamEchoBot/Microsoft.Bot.Builder.Teams.TeamEchoBot.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.TeamEchoBot/Microsoft.Bot.Builder.Teams.TeamEchoBot.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008">
diff --git a/CSharp/Samples/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension.csproj b/CSharp/Samples/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension.csproj
index 7f2e878..f331865 100644
--- a/CSharp/Samples/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension.csproj
+++ b/CSharp/Samples/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension/Microsoft.Bot.Builder.Teams.WikipediaMessagingExtension.csproj
@@ -23,6 +23,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.2" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.2" />
diff --git a/CSharp/UnitTests/Microsoft.Bot.Builder.Teams.Tests/Microsoft.Bot.Builder.Teams.Tests.csproj b/CSharp/UnitTests/Microsoft.Bot.Builder.Teams.Tests/Microsoft.Bot.Builder.Teams.Tests.csproj
index 656bce5..1808b29 100644
--- a/CSharp/UnitTests/Microsoft.Bot.Builder.Teams.Tests/Microsoft.Bot.Builder.Teams.Tests.csproj
+++ b/CSharp/UnitTests/Microsoft.Bot.Builder.Teams.Tests/Microsoft.Bot.Builder.Teams.Tests.csproj
@@ -14,6 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.12" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="Moq" Version="4.8.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />