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

chore: Updating to daily runtime for R12 development #5529

Merged
Geoff Cox (Microsoft) (GeoffCoxMSFT) merged 4 commits into from
Jan 19, 2021
Merged

chore: Updating to daily runtime for R12 development #5529

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74fd06d
Updating to daily runtime for R12 development
GeoffCoxMSFT Jan 14, 2021
3a722c2
Merge branch 'main' into gcox/update-to-daily
GeoffCoxMSFT Jan 15, 2021
171da60
Merge branch 'main' into gcox/update-to-daily
GeoffCoxMSFT Jan 19, 2021
b9d077b
Merge branch 'main' into gcox/update-to-daily
GeoffCoxMSFT Jan 19, 2021
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
2 changes: 1 addition & 1 deletion Composer/packages/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions Composer/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions runtime/dotnet/azurefunctions/Microsoft.BotFramework.Composer.Functions.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.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" />
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 @@ -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>
Expand Down
26 changes: 13 additions & 13 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,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>
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.11.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.12.0-daily.*"/>
</ItemGroup>

</Project>