Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Azure Function Customized Action fix and 4.9.2->4.9.3 #3294

Merged
a-b-r-o-w-n merged 3 commits into from
Jun 3, 2020
Merged

fix: Azure Function Customized Action fix and 4.9.2->4.9.3 #3294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87e3f7b
Azure Function Customized Action fix and 4.9.2->4.9.3
luhan2017 Jun 3, 2020
481c90c
Merge branch 'master' into luhan/azureFunctionFix
luhan2017 Jun 3, 2020
00fdfac
Merge branch 'master' into luhan/azureFunctionFix
cwhitten Jun 3, 2020
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
6 changes: 6 additions & 0 deletions runtime/dotnet/ComposerRuntime.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Comp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.Functions", "azurefunctions\Microsoft.BotFramework.Composer.Functions.csproj", "{9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.BotFramework.Composer.CustomAction", "customaction\Microsoft.BotFramework.Composer.CustomAction.csproj", "{EE58DDD7-DE91-4DB0-A6C6-D8182523896B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -33,6 +35,10 @@ Global
{9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9FC308C1-F0EC-41BE-90FD-9DC00DA7B80B}.Release|Any CPU.Build.0 = Release|Any CPU
{EE58DDD7-DE91-4DB0-A6C6-D8182523896B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EE58DDD7-DE91-4DB0-A6C6-D8182523896B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE58DDD7-DE91-4DB0-A6C6-D8182523896B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE58DDD7-DE91-4DB0-A6C6-D8182523896B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
27 changes: 14 additions & 13 deletions runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<AzureFunctionsVersion>v3</AzureFunctionsVersion>
<UserSecretsId>2eb1c70c-5cd2-4c08-8aab-df989c347067</UserSecretsId>
</PropertyGroup>
Expand All @@ -12,19 +12,20 @@
<CodeAnalysisRuleSet>..\core\Microsoft.BotFramework.Composer.Core.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.3-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.3" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.3" />
Expand Down
5 changes: 5 additions & 0 deletions runtime/dotnet/azurefunctions/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
using Microsoft.Bot.Connector.Authentication;
using Microsoft.BotFramework.Composer.Core;
using Microsoft.BotFramework.Composer.Core.Settings;

//using Microsoft.BotFramework.Composer.CustomAction;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using System;
Expand Down Expand Up @@ -96,6 +98,9 @@ public override void Configure(IFunctionsHostBuilder builder)
ComponentRegistration.Add(new QnAMakerComponentRegistration());
ComponentRegistration.Add(new LuisComponentRegistration());

// This is for custom action component registration.
//ComponentRegistration.Add(new CustomActionComponentRegistration());

// Register the skills client and skills request handler.
services.AddSingleton<SkillConversationIdFactoryBase, SkillConversationIdFactory>();
services.AddHttpClient<BotFrameworkClient, SkillHttpClient>();
Expand Down
24 changes: 12 additions & 12 deletions runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.3-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.3" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
<PrivateAssets>all</PrivateAssets>
Expand Down
24 changes: 12 additions & 12 deletions runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.2-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.9.3-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.9.3" />
<PackageReference Include="Microsoft.Bot.Connector" Version="4.9.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.2" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.9.3" />
</ItemGroup>

</Project>