Sample App more changes

zyraglee · Oct 20, 2017 · f3038bc · f3038bc
1 parent c1033b7
commit f3038bc
Show file tree

Hide file tree

Showing 29 changed files with 843 additions and 180 deletions.
diff --git a/template-bot-master-csharp/DialogMatches.cs b/template-bot-master-csharp/DialogMatches.cs
@@ -56,5 +56,17 @@ public static class DialogMatches
         public const string MessageBack = "msgback";
 
         public const string LocalTime = "localtime";
+
+        public const string HeroCard = "hero card";
+        public const string ThumbnailCard = "thumbnail card";
+
+        public const string ConnectorCardV1 = "connectorcardv1";
+        public const string ConnectorCardV2 = "connectorcardv2";
+        public const string ConnectorCardV3 = "connectorcardv3";
+
+        public const string ActionableCard = "actionablecard";
+        public const string ActionableCardV2 = "actionablecardv2";
+
+        public const string PopUpSignIn = "signin";
     }
 }
diff --git a/template-bot-master-csharp/Properties/Strings.Designer.cs b/template-bot-master-csharp/Properties/Strings.Designer.cs
diff --git a/template-bot-master-csharp/Properties/Strings.resx b/template-bot-master-csharp/Properties/Strings.resx
@@ -397,16 +397,16 @@
     <value>no</value>
   </data>
   <data name="DisplayCardHeroCard" xml:space="preserve">
-    <value>Hero</value>
+    <value>Hero Card</value>
   </data>
   <data name="DisplayCardO365ConnectorCardV1" xml:space="preserve">
-    <value>O365ConnectorCard V1</value>
+    <value>ConnectorCardV1</value>
   </data>
   <data name="DisplayCardO365ConnectorCardV2" xml:space="preserve">
-    <value>O365ConnectorCard V2</value>
+    <value>ConnectorCardV2</value>
   </data>
   <data name="DisplayCardO365ConnectorCardV3" xml:space="preserve">
-    <value>O365ConnectorCard V3</value>
+    <value>ConnectorCardV3</value>
   </data>
   <data name="DisplayCardPromptText" xml:space="preserve">
     <value>What card you would like to test?</value>
@@ -418,7 +418,7 @@
     <value>Hope you liked the Cards!!</value>
   </data>
   <data name="DisplayCardThumbnailCard" xml:space="preserve">
-    <value>Thumbnail</value>
+    <value>Thumbnail Card</value>
   </data>
   <data name="HelpCaptionDisplayCards" xml:space="preserve">
     <value>Choose Cards</value>
@@ -742,9 +742,51 @@
     <value>composeextension/querysettingurl</value>
   </data>
   <data name="DisplayCardO365ConnectorActionableCard" xml:space="preserve">
-    <value>Actionable Card</value>
+    <value>ActionableCard</value>
   </data>
   <data name="cmdO365ConnectorCardActionableMessages" xml:space="preserve">
     <value>Actionable Card</value>
   </data>
+  <data name="LastDialogActionableMessageDialog" xml:space="preserve">
+    <value>ActionableMessageCardDialog</value>
+  </data>
+  <data name="LastDialogConnectorCardV1Dialog" xml:space="preserve">
+    <value>ConnectorCardV1Dialog</value>
+  </data>
+  <data name="LastDialogConnectorCardV2Dialog" xml:space="preserve">
+    <value>ConnectorCardV2Dialog</value>
+  </data>
+  <data name="LastDialogConnectorCardV3Dialog" xml:space="preserve">
+    <value>ConnectorCardV3Dialog</value>
+  </data>
+  <data name="TenantLevelDeniedAccess" xml:space="preserve">
+    <value>MS Teams: Attempted access from a different Office 365 tenant: message rejected</value>
+  </data>
+  <data name="DisplayCardO365ConnectorActionableCardV2" xml:space="preserve">
+    <value>ActionableCardV2</value>
+  </data>
+  <data name="LastDialogPopUpSignIn" xml:space="preserve">
+    <value>PopUpSignInDialog</value>
+  </data>
+  <data name="cmdPopUpSignIn" xml:space="preserve">
+    <value>signin</value>
+  </data>
+  <data name="HelpCaptionPopUpSignIn" xml:space="preserve">
+    <value>Popup Signin</value>
+  </data>
+  <data name="PopUpSignInCardButtonTitle" xml:space="preserve">
+    <value>SignIn</value>
+  </data>
+  <data name="PopUpSignInCardTitle" xml:space="preserve">
+    <value>Please click below for Popup SignIn experience</value>
+  </data>
+  <data name="cmdMessageBack" xml:space="preserve">
+    <value>msgback</value>
+  </data>
+  <data name="HelpCaptionMessageBack" xml:space="preserve">
+    <value>Message Back</value>
+  </data>
+  <data name="MessageBackTitleMsg" xml:space="preserve">
+    <value>This is Message Back example</value>
+  </data>
 </root>
diff --git a/template-bot-master-csharp/Web.config b/template-bot-master-csharp/Web.config
@@ -12,7 +12,8 @@
   <add key="MicrosoftAppPassword" value="" />
   <add key="BaseUri" value="" />
 
-  <!-- VSTS Auth Config Keys --> 
+  <add key="OFFICE_365_TENANT_FILTER" value="#PleaseSetTenantInformation" />
+  <!-- VSTS Auth Config Keys -->
   <add key="AppId" value="#PleaseSetVSTSAppId#" />
   <add key="AppSecret" value="#PleaseSetVSTSAppSecret#" />
   <add key="AuthUrl" value="https://app.vssps.visualstudio.com/oauth2/authorize" />
@@ -36,6 +37,8 @@
   <add key="FBAccessTokenKey" value="AccessToken" />
   <add key="FBIsValidatedKey" value="IsValidated" />
   <add key="FBAuthToken" value="AuthToken" />
+
+
   <!-- Ends Here -->
 
 </appSettings>
@@ -95,11 +98,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bot.Connector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.9.1.0" newVersion="3.9.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.11.1.0" newVersion="3.11.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.6.1.0" newVersion="4.6.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.6.2.0" newVersion="4.6.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />