Merge branch 'main' of https://github.com/microsoft/BotFramework-Comp…

…oser into benbrown/searchfeeds
microsoft · Jan 20, 2021 · 094373e · 094373e
2 parents 22c6b37 + 1aa2c8a
commit 094373e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 45 deletions.
diff --git a/Composer/packages/server/package.json b/Composer/packages/server/package.json
@@ -12,7 +12,7 @@
     "build": "tsc -p tsconfig.build.json && node scripts/build.js",
     "clean": "rimraf build",
     "prep:dist:electron": "yarn build --outDir ../electron-server/dist && node scripts/copyAssets.js",
-    "start": "node build/init.js",
+    "start": "node --max-http-header-size=16000 build/init.js",
     "start:dev": "nodemon",
     "test": "jest",
     "test:watch": "jest --watch",
@@ -23,7 +23,7 @@
   },
   "author": "",
   "nodemonConfig": {
-    "exec": "cross-env TS_NODE_FILES=true node --inspect=9228 -r ts-node/register src/init.ts",
+    "exec": "cross-env TS_NODE_FILES=true node --max-http-header-size=16000 --inspect=9228 -r ts-node/register src/init.ts",
     "watch": [
       "src",
       "../extension/lib"
@@ -66,7 +66,7 @@
     "@botframework-composer/types": "*",
     "@microsoft/bf-dialog": "4.11.0-dev.20201025.69cf2b9",
     "@microsoft/bf-dispatcher": "^4.11.0-beta.20201016.393c6b2",
-    "@microsoft/bf-generate-library": "^4.10.0-daily.20210107.200547",
+    "@microsoft/bf-generate-library": "^4.10.0-daily.20210113.202382",
     "@microsoft/bf-lu": "^4.12.0-dev.20201209.a2ab9dd",
     "@microsoft/bf-orchestrator": "4.11.0-beta.20201208.165a6d6",
     "applicationinsights": "^1.8.7",

diff --git a/Composer/yarn.lock b/Composer/yarn.lock
@@ -3196,10 +3196,10 @@
     ts-md5 "^1.2.6"
     tslib "^1.10.0"
 
-"@microsoft/bf-generate-library@^4.10.0-daily.20210107.200547":
-  version "4.10.0-daily.20210107.200547"
-  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-generate-library/-/@microsoft/bf-generate-library-4.10.0-daily.20210107.200547.tgz#f89a3786a5f77105f4695a7a07b3b5407b97b465"
-  integrity sha1-+Jo3hqX3cQX0aVp6B7O1QHuXtGU=
+"@microsoft/bf-generate-library@^4.10.0-daily.20210113.202382":
+  version "4.10.0-daily.20210113.202382"
+  resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@microsoft/bf-generate-library/-/@microsoft/bf-generate-library-4.10.0-daily.20210113.202382.tgz#4e5fc90c53841473138da13d559063adeeddaf5d"
+  integrity sha1-Tl/JDFOEFHMTjaE9VZBjre7dr10=
   dependencies:
     "@microsoft/bf-lu" rc
     adaptive-expressions "^4.11.0"

diff --git a/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj b/runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.csproj
@@ -13,18 +13,18 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.11.0-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Connector" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.0-daily.preview.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.12.0-daily.*"/>
     <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" />

diff --git a/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj b/runtime/dotnet/azurewebapp/Microsoft.BotFramework.Composer.WebApp.csproj
@@ -17,18 +17,18 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.11.0-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Connector" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.0-daily.preview.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.12.0-daily.*"/>
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.66">
       <PrivateAssets>all</PrivateAssets>

diff --git a/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj b/runtime/dotnet/core/Microsoft.BotFramework.Composer.Core.csproj
@@ -13,19 +13,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.Builder" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.11.0-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Bot.Connector" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Bot.Builder" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.ApplicationInsights" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Azure.Blobs" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Debugging" Version="4.12.0-daily.preview.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.12.0-daily.*"/>
+    <PackageReference Include="Microsoft.Bot.Connector" Version="4.12.0-daily.*"/>
   </ItemGroup>
 
 </Project>
diff --git a/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj b/runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.11.0" />
+    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.0-daily.*"/>
   </ItemGroup>
 
 </Project>