diff --git a/runtime/dotnet/ComposerRuntime.sln b/runtime/dotnet/ComposerRuntime.sln
index f39a16131b..c0ee8d1a38 100644
--- a/runtime/dotnet/ComposerRuntime.sln
+++ b/runtime/dotnet/ComposerRuntime.sln
@@ -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
@@ -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
diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
index f0ae957a6c..56562f912d 100644
--- a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
+++ b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
v3
2eb1c70c-5cd2-4c08-8aab-df989c347067
@@ -12,19 +12,20 @@
..\core\Microsoft.BotFramework.Composer.Core.ruleset
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/runtime/dotnet/azurefunctions/Startup.cs b/runtime/dotnet/azurefunctions/Startup.cs
index 0641c70d30..dae2d83eef 100644
--- a/runtime/dotnet/azurefunctions/Startup.cs
+++ b/runtime/dotnet/azurefunctions/Startup.cs
@@ -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;
@@ -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();
services.AddHttpClient();
diff --git a/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
index 98da149d43..77a5b336c2 100644
--- a/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
+++ b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
@@ -16,18 +16,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
all
diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
index 36c3dc2975..64acff15d4 100644
--- a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
+++ b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
@@ -13,18 +13,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj b/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
index 9e0945f9c0..83770a294e 100644
--- a/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
+++ b/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
@@ -11,7 +11,7 @@
-
+