diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs index c258178316..8abb69e568 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/MainResponses.cs @@ -60,7 +60,7 @@ public MainResponses() public static IMessageActivity BuildIntroCard(ITurnContext turnContext, dynamic data) { - var introCard = File.ReadAllText(@".\Dialogs\Main\Resources\Intro.json"); + var introCard = File.ReadAllText(MainStrings.INTRO_PATH); var card = AdaptiveCard.FromJson(introCard).Card; var attachment = new Attachment(AdaptiveCard.ContentType, content: card); diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.de.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.de.json index f85dbb419c..cfaece9648 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.de.json +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.de.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", @@ -23,7 +23,7 @@ "type": "TextBlock", "size": "default", "isSubtle": true, - "text": "Nun, da Sie Ihren virtuellen Assistenten erfolgreich geführt haben, folgen Sie den Links in dieser adaptiven Karte, um weiter zu erforschen.", + "text": "Nun, da Sie Ihren virtuellen Assistenten erfolgreich geführt haben, folgen Sie den Links in dieser adaptiven Karte, um weiter zu erforschen.", "speak": "Jetzt, wo Sie loslegen lassen.", "wrap": true, "maxLines": 0 diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.es.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.es.json index 6344c74632..8ed725f892 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.es.json +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.es.json @@ -1,8 +1,8 @@ -{ +{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", - "speak": "¡ Bienvenido a tu asistente virtual! Ahora que estás en marcha, empecemos.", + "speak": "¡ Bienvenido a tu asistente virtual! Ahora que estás en marcha, empecemos.", "body": [ { "type": "Image", @@ -23,7 +23,7 @@ "type": "TextBlock", "size": "default", "isSubtle": true, - "text": "Ahora que ha ejecutado correctamente su asistente virtual, siga los enlaces de esta tarjeta adaptativa para explorar más.", + "text": "Ahora que ha ejecutado correctamente su asistente virtual, siga los enlaces de esta tarjeta adaptativa para explorar más.", "speak": "Ahora que su funcionamiento vamos a empezar.", "wrap": true, "maxLines": 0 @@ -32,7 +32,7 @@ "actions": [ { "type": "Action.OpenUrl", - "title": "Documentación", + "title": "Documentación", "url": "https://aka.ms/customassistantdocs" }, { diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.fr.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.fr.json index f9a38fbc8d..7c2e5e0ffc 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.fr.json +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.fr.json @@ -1,8 +1,8 @@ -{ +{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", - "speak": "Bienvenue à votre assistant virtuel! Maintenant que vous êtes en marche, commençons.", + "speak": "Bienvenue à votre assistant virtuel! Maintenant que vous êtes en marche, commençons.", "body": [ { "type": "Image", @@ -14,8 +14,8 @@ "spacing": "medium", "size": "default", "weight": "bolder", - "text": "Bienvenue à votre assistant virtuel", - "speak": "Bienvenue à votre assistant virtuel", + "text": "Bienvenue à votre assistant virtuel", + "speak": "Bienvenue à votre assistant virtuel", "wrap": true, "maxLines": 0 }, @@ -23,8 +23,8 @@ "type": "TextBlock", "size": "default", "isSubtle": true, - "text": "Maintenant que vous avez réussi à exécuter votre assistant virtuel, suivez les liens dans cette carte adaptative pour explorer plus loin.", - "speak": "Maintenant que votre place et en cours d'exécution nous allons commencer.", + "text": "Maintenant que vous avez réussi à exécuter votre assistant virtuel, suivez les liens dans cette carte adaptative pour explorer plus loin.", + "speak": "Maintenant que votre place et en cours d'exécution nous allons commencer.", "wrap": true, "maxLines": 0 } @@ -37,7 +37,7 @@ }, { "type": "Action.OpenUrl", - "title": "Comptes liés", + "title": "Comptes liés", "url": "https://github.com/Microsoft/AI/blob/master/solutions/Virtual-Assistant/docs/virtualassistant-linkedaccounts.md" }, { diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.it.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.it.json index 148c4295b0..1d75cd0e38 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.it.json +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.it.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.json b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.json index 41544119ee..bd0d1d33c7 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.json +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/Intro.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "http://adaptivecards.io/schemas/adaptive-card.json", "type": "AdaptiveCard", "version": "1.0", diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs index 8e7f1413f8..4f38f94244 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.Designer.cs @@ -174,6 +174,15 @@ public static string Intro { } } + /// + /// Looks up a localized string similar to .\Dialogs\Main\Resources\Intro.json. + /// + public static string INTRO_PATH { + get { + return ResourceManager.GetString("INTRO_PATH", resourceCulture); + } + } + /// /// Looks up a localized string similar to Ok, you're signed out.. /// diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx index d4853f8fb8..b8fba10156 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.de.resx @@ -151,6 +151,9 @@ Intro.de.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + .\Dialogs\Main\Resources\Intro.de.json + OK, du bist abgemeldet. diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx index 19d98053c2..7a4ea1704a 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.es.resx @@ -151,6 +151,9 @@ Intro.es.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + .\Dialogs\Main\Resources\Intro.es.json + OK, estás desconectado. diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx index 3ad394fde2..5e15b26c46 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.fr.resx @@ -151,6 +151,9 @@ Intro.fr.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + .\Dialogs\Main\Resources\Intro.fr.json + OK, vous êtes déconnecté. diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx index 22bc768444..ac5593233b 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.it.resx @@ -151,6 +151,9 @@ Intro.it.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + .\Dialogs\Main\Resources\Intro.it.json + OK, sei uscito. diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx index db7740ac8e..ae875e08f1 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.resx @@ -151,6 +151,9 @@ Intro.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + .\Dialogs\Main\Resources\Intro.json + Ok, you're signed out. diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh.resx b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh.resx index b8be25f653..0f120470ed 100644 --- a/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh.resx +++ b/solutions/Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainStrings.zh.resx @@ -151,6 +151,9 @@ Intro.zh.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8 + + .\Dialogs\Main\Resources\Intro.zh.json + ä½ å·²æˆåŠŸé€€å‡ºã€‚ diff --git a/solutions/Virtual-Assistant/src/csharp/skills/tests/todoskilltest/Flow/ToDoBotTestBase.cs b/solutions/Virtual-Assistant/src/csharp/skills/tests/todoskilltest/Flow/ToDoBotTestBase.cs index edf641db14..7c98259a1d 100644 --- a/solutions/Virtual-Assistant/src/csharp/skills/tests/todoskilltest/Flow/ToDoBotTestBase.cs +++ b/solutions/Virtual-Assistant/src/csharp/skills/tests/todoskilltest/Flow/ToDoBotTestBase.cs @@ -90,7 +90,10 @@ public TestFlow GetTestFlow() public override IBot BuildBot() { - return new ToDoSkill.ToDoSkill(this.Services, this.ConversationState, this.UserState, this.TelemetryClient, this.ToDoService, this.MailService, true); + var skill = new ToDoSkill.ToDoSkill(this.Services, this.ConversationState, this.UserState, this.TelemetryClient, this.ToDoService, true); + skill.MailService = MailService; + + return skill; } } } diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/ToDoSkill.cs b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/ToDoSkill.cs index b8145db29c..4422f652d5 100644 --- a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/ToDoSkill.cs +++ b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/ToDoSkill.cs @@ -22,11 +22,10 @@ public class ToDoSkill : IBot private readonly UserState _userState; private readonly IBotTelemetryClient _telemetryClient; private ITaskService _serviceManager; - private IMailService _mailService; private DialogSet _dialogs; private bool _skillMode; - public ToDoSkill(ISkillConfiguration services, ConversationState conversationState, UserState userState, IBotTelemetryClient telemetryClient, ITaskService serviceManager = null, IMailService mailService = null, bool skillMode = false) + public ToDoSkill(ISkillConfiguration services, ConversationState conversationState, UserState userState, IBotTelemetryClient telemetryClient, ITaskService serviceManager = null, bool skillMode = false) { _skillMode = skillMode; _services = services ?? throw new ArgumentNullException(nameof(services)); @@ -43,12 +42,14 @@ public ToDoSkill(ISkillConfiguration services, ConversationState conversationSta } _serviceManager = serviceManager ?? taskService; - _mailService = mailService ?? new MailService(); + MailService = new MailService(); _dialogs = new DialogSet(_conversationState.CreateProperty(nameof(DialogState))); - _dialogs.Add(new MainDialog(_services, _conversationState, _userState, _telemetryClient, _serviceManager, _mailService, _skillMode)); } + // TODO: this property was added to allow the to do tests to work correctly. It should be reevaluated. + public IMailService MailService { get; set; } + /// /// Run every turn of the conversation. Handles orchestration of messages. /// @@ -57,6 +58,11 @@ public ToDoSkill(ISkillConfiguration services, ConversationState conversationSta /// A representing the asynchronous operation. public async Task OnTurnAsync(ITurnContext turnContext, CancellationToken cancellationToken) { + if (_dialogs.Find(nameof(MainDialog)) == null) + { + _dialogs.Add(new MainDialog(_services, _conversationState, _userState, _telemetryClient, _serviceManager, MailService, _skillMode)); + } + var dc = await _dialogs.CreateContextAsync(turnContext); if (dc.ActiveDialog != null)