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

Commit 77405cf

Browse files
lauren-millsryanisgrig
lauren-mills
authored and
ryanisgrig
committed
update va and skills to 4.3 (#942)
* updated va and skills * updated skill template to 4.3.1
1 parent 30abbb8 commit 77405cf

File tree

11 files changed

+155
-128
lines changed

11 files changed

+155
-128
lines changed

‎solutions/Virtual-Assistant/src/csharp/assistant/VirtualAssistant.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
<PackageReference Include="Microsoft.AspNetCore.All" />
2626
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="1.0.0" />
2727
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
28-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
29-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
30-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
31-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
32-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
33-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
34-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
35-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
36-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
37-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
38-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
39-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
28+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
29+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
30+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
31+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
32+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
33+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
34+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
35+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
36+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
37+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
38+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
39+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
4040
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
4141
<PackageReference Include="Microsoft.Extensions.Options" Version="2.2.0" />
4242
<PackageReference Include="Microsoft.Graph" Version="1.12.0" />

‎solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Authentication/MultiProviderAuthDialog.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ private async Task<DialogTurnResult> PromptForProvider(WaterfallStepContext step
6767
var adapter = stepContext.Context.Adapter as BotFrameworkAdapter;
6868
var tokenStatusCollection = await adapter.GetTokenStatusAsync(stepContext.Context, stepContext.Context.Activity.From.Id);
6969

70-
var matchingProviders = tokenStatusCollection.Where(p => p.HasToken && _skillConfiguration.AuthenticationConnections.Any(t => t.Key == p.ConnectionName)).ToList();
70+
var matchingProviders = tokenStatusCollection.Where(p => (bool)p.HasToken && _skillConfiguration.AuthenticationConnections.Any(t => t.Key == p.ConnectionName)).ToList();
7171

7272
if (matchingProviders.Count() == 1)
7373
{

‎solutions/Virtual-Assistant/src/csharp/microsoft.bot.solutions/Microsoft.Bot.Solutions.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
<PackageReference Include="Autofac" Version="4.8.1" />
2828
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
2929
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="1.0.0" />
30-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
31-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
32-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
33-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
34-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
35-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
36-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
30+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
31+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
32+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
33+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
34+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
35+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
36+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
3737
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.2" />
3838
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.2" />
3939
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.2.0" />

‎solutions/Virtual-Assistant/src/csharp/skills/automotiveskill/automotiveskill/AutomotiveSkill.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<PackageReference Include="Microsoft.AspNetCore.All" />
1212
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="1.0.0" />
1313
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
14-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
15-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
16-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
17-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
18-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
19-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
20-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
22-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
23-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
24-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
25-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
14+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
15+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
16+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
17+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
18+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
19+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
22+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
23+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
24+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
25+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
2626
<PackageReference Include="Microsoft.Graph" Version="1.12.0" />
2727
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
2828
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008">

‎solutions/Virtual-Assistant/src/csharp/skills/calendarskill/calendarskill/CalendarSkill.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616
<PackageReference Include="Microsoft.AspNetCore.All" />
1717
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
1818
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="1.2.0" />
19-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
20-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
21-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
22-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
23-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
24-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
25-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
26-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
27-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
28-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
29-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
30-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
19+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
22+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
23+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
24+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
25+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
26+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
27+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
28+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
29+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
30+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
3131
<PackageReference Include="Microsoft.Graph" Version="1.10.0" />
3232
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
3333
<PackageReference Include="Microsoft.Recognizers.Text.DataTypes.TimexExpression" Version="1.1.4" />

‎solutions/Virtual-Assistant/src/csharp/skills/emailskill/emailskill/EmailSkill.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<PackageReference Include="Microsoft.AspNetCore.All" />
1515
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
1616
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="1.2.0" />
17-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
18-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
19-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
20-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
22-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
23-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
24-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
25-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
26-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
27-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
28-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
17+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
18+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
19+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
22+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
23+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
24+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
25+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
26+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
27+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
28+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
2929
<PackageReference Include="Microsoft.Graph" Version="1.10.0" />
3030
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
3131
<PackageReference Include="MimeKit" Version="2.0.6" />

‎solutions/Virtual-Assistant/src/csharp/skills/pointofinterestskill/pointofinterestskill/PointOfInterestSkill.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<PackageReference Include="Microsoft.AspNetCore.All" />
1212
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
1313
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="1.2.0" />
14-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
15-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
16-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
17-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
18-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
19-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
20-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
22-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
23-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
24-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
25-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
14+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
15+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
16+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
17+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
18+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
19+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
22+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
23+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
24+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
25+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
2626
<PackageReference Include="Microsoft.Graph" Version="1.10.0" />
2727
<PackageReference Include="System.Drawing.Common" Version="4.5.1" />
2828
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />

‎solutions/Virtual-Assistant/src/csharp/skills/todoskill/todoskill/ToDoSkill.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<PackageReference Include="Microsoft.AspNetCore.All" />
1212
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
1313
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="1.2.0" />
14-
<PackageReference Include="Microsoft.Bot.Builder" Version="4.2.2" />
15-
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.2.2" />
16-
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.2.2" />
17-
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.2.2" />
18-
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.2.2" />
19-
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.2.2" />
20-
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.2.2" />
21-
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.2.2" />
22-
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.2.2" />
23-
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.2.2" />
24-
<PackageReference Include="Microsoft.Bot.Connector" Version="4.2.2" />
25-
<PackageReference Include="Microsoft.Bot.Schema" Version="4.2.2" />
14+
<PackageReference Include="Microsoft.Bot.Builder" Version="4.3.1" />
15+
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.3.1" />
16+
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.3.1" />
17+
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.3.1" />
18+
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.3.1" />
19+
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.3.1" />
20+
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.3.1" />
21+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.3.1" />
22+
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.3.1" />
23+
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.3.1" />
24+
<PackageReference Include="Microsoft.Bot.Connector" Version="4.3.1" />
25+
<PackageReference Include="Microsoft.Bot.Schema" Version="4.3.1" />
2626
<PackageReference Include="Microsoft.Graph" Version="1.10.0" />
2727
<PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003" PrivateAssets="all" />
2828
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta008" PrivateAssets="all" />

0 commit comments

Comments
 (0)