[VA] Resolve card localization bug that defaults to English (microsof…

…t#1095) * Add local solutions ref * Moved cards to card directory. Renamed zh-cn to zh ref for EscalateStrings * Updated italian/chinese responses and embedded resource refs for main dialog responses * Updated projects to latest solutions nuget ref * Update VirtualAssistant.sln * Update VirtualAssistant.sln * Update VirtualAssistant.csproj
ToluFash · Apr 12, 2019 · 50806fe · 50806fe
1 parent 2500489
commit 50806fe
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 47 deletions.
diff --git a/...late/Resources/EscalateStrings.zh-cn.resx → ...scalate/Resources/EscalateStrings.zh.resx b/...late/Resources/EscalateStrings.zh-cn.resx → ...scalate/Resources/EscalateStrings.zh.resx
diff --git a/...alogs/Main/Resources/NewUserGreeting.json → ...Main/Resources/Cards/NewUserGreeting.json b/...alogs/Main/Resources/NewUserGreeting.json → ...Main/Resources/Cards/NewUserGreeting.json
diff --git a/...Main/Resources/ReturningUserGreeting.json → ...esources/Cards/ReturningUserGreeting.json b/...Main/Resources/ReturningUserGreeting.json → ...esources/Cards/ReturningUserGreeting.json
diff --git a/...Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.it.json b/...Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.it.json
diff --git a/...Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json b/...Virtual-Assistant/src/csharp/assistant/Dialogs/Main/Resources/MainDialogResponses.zh.json
@@ -11,12 +11,12 @@
   "HaveNameMessage": {
     "replies": [
       {
-        "text": "嗨, {Name}!",
-        "speak": "嗨, {Name}!"
+        "text": "嗨{Name}!",
+        "speak": "嗨{Name}!"
       },
       {
-        "text": "很高兴见到你, {Name}!",
-        "speak": "很高兴见到你, {Name}!"
+        "text": "很高兴见到你{Name}!",
+        "speak": "很高兴见到你{Name}!"
       }
     ],
     "inputHint": "acceptingInput"
@@ -51,8 +51,8 @@
   "ReturningUserGreetingTitle": {
     "replies": [
       {
-        "text": "欢迎回来 {Name}",
-        "speak": "欢迎回来 {Name}!"
+        "text": "欢迎回来{Name}",
+        "speak": "欢迎回来{Name}!"
       },
       {
         "text": "你好{Name}",

diff --git a/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj b/solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj
@@ -12,19 +12,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Remove="Dialogs\Main\Resources\NewUserGreeting.json" />
-    <Content Remove="Dialogs\Main\Resources\ReturningUserGreeting.json" />
-  </ItemGroup>
-
-  <ItemGroup>
+    <EmbeddedResource Include="Dialogs\Main\Resources\Cards\NewUserGreeting.json" />
+    <EmbeddedResource Include="Dialogs\Main\Resources\Cards\ReturningUserGreeting.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.de.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.es.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.fr.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.it.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.json" />
     <EmbeddedResource Include="Dialogs\Main\Resources\MainDialogResponses.zh.json" />
-    <EmbeddedResource Include="Dialogs\Main\Resources\NewUserGreeting.json" />
-    <EmbeddedResource Include="Dialogs\Main\Resources\ReturningUserGreeting.json" />
   </ItemGroup>
 
   <ItemGroup>
@@ -49,7 +44,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
@@ -63,26 +58,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Dialogs\Escalate\Resources\EscalateStrings - Copy.Designer.cs">
-      <DependentUpon>EscalateStrings.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-    </Compile>
-    <Compile Update="Dialogs\Escalate\Resources\EscalateStrings - Copy.Designer.cs">
+    <Compile Update="Dialogs\Main\Resources\MainDialogResponses.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>EscalateStrings.resx</DependentUpon>
+      <DependentUpon>MainDialogResponses.tt</DependentUpon>
     </Compile>
     <Compile Update="Dialogs\Escalate\Resources\EscalateStrings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
       <DependentUpon>EscalateStrings.resx</DependentUpon>
     </Compile>
-    <Compile Update="Dialogs\Main\Resources\MainDialogResponses.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>MainDialogResponses.tt</DependentUpon>
-    </Compile>
     <Compile Update="Dialogs\Main\Resources\MainStrings.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -116,13 +101,6 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\skills\calendarskill\calendarskill\CalendarSkill.csproj" />
-    <ProjectReference Include="..\skills\emailskill\emailskill\EmailSkill.csproj" />
-    <ProjectReference Include="..\skills\pointofinterestskill\pointofinterestskill\PointOfInterestSkill.csproj" />
-    <ProjectReference Include="..\skills\todoskill\todoskill\ToDoSkill.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Update="*.bot">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj b/solutions/Virtual-Assistant/src/csharp/experimental/skills/newsskill/NewsSkill.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/...rtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj b/...rtual-Assistant/src/csharp/experimental/skills/restaurantbooking/RestaurantBooking.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />

diff --git a/...irtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj b/...irtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/...ssistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj b/...ssistant/src/csharp/skills/automotiveskill/automotiveskilltest/AutomotiveSkillTest.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20190203-03" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0-beta2" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0-beta2" />

diff --git a/...ions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj b/...ions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/...tual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj b/...tual-Assistant/src/csharp/skills/calendarskill/calendarskilltest/CalendarSkillTest.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Autofac.Extras.Moq" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />

diff --git a/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/...tions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj b/...tions/Virtual-Assistant/src/csharp/skills/emailskill/emailskilltest/EmailSkillTest.csproj
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Autofac.Extras.Moq" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />

diff --git a/...t/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj b/...t/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/...rp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj b/...rp/skills/pointofinterestskill/pointofinterestskilltests/PointOfInterestSkillTests.csproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Autofac.Extras.Moq" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
     <PackageReference Include="MSTest.TestFramework" Version="1.3.2" />

diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
     <PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />

diff --git a/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj b/solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskilltest/ToDoSkillTest.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Autofac.Extras.Moq" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Moq" Version="4.10.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0-beta" />

diff --git a/...ual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj b/...ual-Assistant/src/csharp/tests/experimental.skills.tests/Experimental.Skills.Tests.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
     <PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20181205-02" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />

diff --git a/...s/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj b/...s/Virtual-Assistant/src/csharp/tests/virtualassistant.tests/VirtualAssistant.Tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.All" />
-    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.24-preview" />
+    <PackageReference Include="Microsoft.Bot.Builder.Solutions" Version="4.4.36-preview" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20181205-02" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />