Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Updated ent bot to work with az publish #483

Merged
merged 1 commit into from
Dec 20, 2018
Merged

Updated ent bot to work with az publish #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/MainResponses.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public MainResponses()

public static IMessageActivity BuildIntroCard(ITurnContext turnContext, dynamic data)
{
var introCard = MainStrings.ResourceManager.GetObject("Intro").ToString();
var introCard = File.ReadAllText(MainStrings.INTRO_PATH);
var card = AdaptiveCard.FromJson(introCard).Card;
var attachment = new Attachment(AdaptiveCard.ContentType, content: card);

Expand Down
6 changes: 3 additions & 3 deletions ...s/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/Intro.de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -21,7 +21,7 @@
"type": "TextBlock",
"size": "default",
"isSubtle": true,
"text": "Jetzt, wo Sie Ihren bot erfolgreich laufen lassen, folgen Sie den Links in dieser Adaptive Card, um Ihr Wissen �ber Bot Framework zu erweitern.",
"text": "Jetzt, wo Sie Ihren bot erfolgreich laufen lassen, folgen Sie den Links in dieser Adaptive Card, um Ihr Wissen über Bot Framework zu erweitern.",
"wrap": true,
"maxLines": 0
}
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "�bersicht",
"title": "Übersicht",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand Down
6 changes: 3 additions & 3 deletions ...s/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/Intro.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -13,7 +13,7 @@
"spacing": "medium",
"size": "default",
"weight": "bolder",
"text": "�Bienvenido a Bot Framework!",
"text": "¡Bienvenido a Bot Framework!",
"wrap": true,
"maxLines": 0
},
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Visi�n general",
"title": "Visión general",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand Down
10 changes: 5 additions & 5 deletions ...s/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/Intro.fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -13,15 +13,15 @@
"spacing": "medium",
"size": "default",
"weight": "bolder",
"text": "Bienvenue � Bot Framework!",
"text": "Bienvenue à Bot Framework!",
"wrap": true,
"maxLines": 0
},
{
"type": "TextBlock",
"size": "default",
"isSubtle": true,
"text": "Maintenant que vous avez r�ussi � ex�cuter votre bot, suivez les liens dans cette carte Adaptive pour d�velopper vos connaissances du Bot Framework.",
"text": "Maintenant que vous avez réussi à exécuter votre bot, suivez les liens dans cette carte Adaptive pour développer vos connaissances du Bot Framework.",
"wrap": true,
"maxLines": 0
}
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Aper�u",
"title": "Aperçu",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand All @@ -46,7 +46,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Apprenez � d�ployer",
"title": "Apprenez à déployer",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-deploy-azure?view=azure-bot-service-4.0"
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...s/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/Intro.it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion ...ates/Enterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/Intro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand Down
18 changes: 3 additions & 15 deletions ...se-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions ...rprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>Hilfe für Enterprise Bot</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.de.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.de.json</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ...rprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.es.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>Ayuda para el asistente virtual</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.es.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.es.json</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ...rprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.fr.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>Aide pour Virtual Assistant</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.fr.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.fr.json</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ...rprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.it.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>Aiuto per assistente virtuale</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.it.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.it.json</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ...nterprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>HELP</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.json</value>
</data>
</root>
5 changes: 2 additions & 3 deletions ...rprise-Template/src/csharp/EnterpriseBotSample/Dialogs/Main/Resources/MainStrings.zh.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>智能助手的帮助</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.zh.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.zh.json</value>
</data>
</root>
12 changes: 6 additions & 6 deletions templates/Enterprise-Template/src/csharp/EnterpriseBotSample/EnterpriseBotSample.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2046
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnterpriseBotSample", "EnterpriseBotSample.csproj", "{EE3D1DCA-06B1-47D1-AB32-D097FD96742F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnterpriseBotSample", "EnterpriseBotSample.csproj", "{5061ED52-DE55-4076-B4BF-54F4C792B656}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EE3D1DCA-06B1-47D1-AB32-D097FD96742F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE3D1DCA-06B1-47D1-AB32-D097FD96742F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE3D1DCA-06B1-47D1-AB32-D097FD96742F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE3D1DCA-06B1-47D1-AB32-D097FD96742F}.Release|Any CPU.Build.0 = Release|Any CPU
{5061ED52-DE55-4076-B4BF-54F4C792B656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5061ED52-DE55-4076-B4BF-54F4C792B656}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5061ED52-DE55-4076-B4BF-54F4C792B656}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5061ED52-DE55-4076-B4BF-54F4C792B656}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BCDDB818-2CF4-4DEF-B921-9B70FF37173E}
SolutionGuid = {25DB81BB-3549-4CD2-9B9F-F586EC7FE1F1}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion ...ise-Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/MainResponses.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public MainResponses()

public static IMessageActivity BuildIntroCard(ITurnContext turnContext, dynamic data)
{
var introCard = MainStrings.ResourceManager.GetObject("Intro").ToString();
var introCard = File.ReadAllText(MainStrings.INTRO_PATH);
var card = AdaptiveCard.FromJson(introCard).Card;
var attachment = new Attachment(AdaptiveCard.ContentType, content: card);

Expand Down
6 changes: 3 additions & 3 deletions ...plate/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/Intro.de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -21,7 +21,7 @@
"type": "TextBlock",
"size": "default",
"isSubtle": true,
"text": "Jetzt, wo Sie Ihren bot erfolgreich laufen lassen, folgen Sie den Links in dieser Adaptive Card, um Ihr Wissen �ber Bot Framework zu erweitern.",
"text": "Jetzt, wo Sie Ihren bot erfolgreich laufen lassen, folgen Sie den Links in dieser Adaptive Card, um Ihr Wissen über Bot Framework zu erweitern.",
"wrap": true,
"maxLines": 0
}
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "�bersicht",
"title": "Übersicht",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand Down
6 changes: 3 additions & 3 deletions ...plate/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/Intro.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -13,7 +13,7 @@
"spacing": "medium",
"size": "default",
"weight": "bolder",
"text": "�Bienvenido a Bot Framework!",
"text": "¡Bienvenido a Bot Framework!",
"wrap": true,
"maxLines": 0
},
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Visi�n general",
"title": "Visión general",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand Down
10 changes: 5 additions & 5 deletions ...plate/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/Intro.fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand All @@ -13,15 +13,15 @@
"spacing": "medium",
"size": "default",
"weight": "bolder",
"text": "Bienvenue � Bot Framework!",
"text": "Bienvenue à Bot Framework!",
"wrap": true,
"maxLines": 0
},
{
"type": "TextBlock",
"size": "default",
"isSubtle": true,
"text": "Maintenant que vous avez r�ussi � ex�cuter votre bot, suivez les liens dans cette carte Adaptive pour d�velopper vos connaissances du Bot Framework.",
"text": "Maintenant que vous avez réussi à exécuter votre bot, suivez les liens dans cette carte Adaptive pour développer vos connaissances du Bot Framework.",
"wrap": true,
"maxLines": 0
}
Expand All @@ -36,7 +36,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Aper�u",
"title": "Aperçu",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/?view=azure-bot-service-4.0"
},
{
Expand All @@ -46,7 +46,7 @@
},
{
"type": "Action.OpenUrl",
"title": "Apprenez � d�ployer",
"title": "Apprenez à déployer",
"url": "https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-howto-deploy-azure?view=azure-bot-service-4.0"
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...plate/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/Intro.it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion ...Template/src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/Intro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
{
"$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
"type": "AdaptiveCard",
"version": "1.0",
Expand Down
22 changes: 5 additions & 17 deletions ...csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/MainStrings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions ...src/csharp/EnterpriseBotTemplate/Bot Framework/Dialogs/Main/Resources/MainStrings.de.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,7 @@
<data name="HELP_TITLE" xml:space="preserve">
<value>Hilfe für Enterprise Bot</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Intro" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Intro.de.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
<data name="INTRO_PATH" xml:space="preserve">
<value>.\Dialogs\Main\Resources\Intro.de.json</value>
</data>
</root>
Loading