Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 generators/generator-bot-adaptive/platforms.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

const dotnet = {
name: 'dotnet',
defaultSdkVersion: '4.14.0',
defaultSdkVersion: '4.14.1',
};

const js = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
{
botName,
packageReferences: '',
sdkVersion: '4.14.0',
sdkVersion: '4.14.1',
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe(`generator-bot-adaptive --platform ${platform} --integration ${integrat
{
botName,
packageReferences: '',
sdkVersion: '4.14.0',
sdkVersion: '4.14.1',
}
);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const packageReferences = {
[platforms.dotnet.name]: [
{
name: 'Microsoft.Bot.Components.HelpAndCancel',
version: '1.1.0-preview.1',
version: '1.1.0-rc0',
},
{
name: 'Microsoft.Bot.Components.Welcome',
version: '1.1.0-preview.1',
version: '1.1.0-rc0',
},
],
[platforms.js.name]: [
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-core-qna/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-empty/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = class extends BaseGenerator {
{
isPlugin: true,
name: 'Microsoft.Bot.Builder.AI.Orchestrator',
version: '4.14.0',
version: '4.14.1',
},
],
modifyApplicationSettings: (appSettings) => {
Expand Down
6 changes: 3 additions & 3 deletions generators/generator-bot-enterprise-assistant/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0",
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-rc0",
"@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-rc0",
"uuid": "^8.3.2",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator {
{
isPlugin: true,
name: 'Microsoft.Bot.Components.Graph',
version: '1.1.0-preview.1',
version: '1.1.0-rc0',
},
],
modifyApplicationSettings: (appSettings) => {
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-calendar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"lint": "eslint ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = class extends BaseGenerator {
{
isPlugin: true,
name: 'Microsoft.Bot.Components.Graph',
version: '1.1.0-preview.1',
version: '1.1.0-rc0',
},
],
modifyApplicationSettings: (appSettings) => {
Expand Down
2 changes: 1 addition & 1 deletion generators/generator-bot-enterprise-people/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"lint": "eslint -c ../../.eslintrc.json ."
},
"dependencies": {
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1",
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0",
"yeoman-generator": "^2.0.5",
"yeoman-test": "^1.9.1"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="AdaptiveCards.Templating" Version="1.2.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion packages/Graph/Microsoft.Bot.Components.Graph.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Graph.Beta" Version="0.39.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.1" />

<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.333">
<PrivateAssets>all</PrivateAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>Contains Adaptive Dialog assets to support Help and Cancel conversational flows in a bot built on the Azure Bot Framework.</description>
<tags>msbot-component msbot-content conversationalcore helpintent cancelintent preview</tags>
<dependencies>
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.0" />
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.1" />
</dependencies>
</metadata>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<description>An Adaptive Dialog for greeting new and returning users on first interaction with your bot built on the Azure Bot Framework.</description>
<tags>msbot-component msbot-content conversationalcore welcome preview</tags>
<dependencies>
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.0" />
<dependency id="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" version="4.14.1" />
</dependencies>
</metadata>

Expand Down
2 changes: 1 addition & 1 deletion skills/csharp/calendarskill/CalendarSkill.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language" Version="1.0.1-preview" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Search.NewsSearch" Version="2.0.0" />
<PackageReference Include="Microsoft.Azure.Search" Version="10.0.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.ApplicationInsights.Core" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Solutions" Version="1.0.1" />
<PackageReference Include="Microsoft.Graph" Version="3.7.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion skills/declarative/Calendar/Calendar/Calendar.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\packages\Graph\Microsoft.Bot.Components.Graph.csproj" />
Expand Down
6 changes: 3 additions & 3 deletions skills/declarative/People/People/People.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Components.Graph" Version="1.0.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Schema" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Schema" Version="4.14.1" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AdaptiveExpressions" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.14.0" />
<PackageReference Include="AdaptiveExpressions" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Connector.DirectLine" Version="3.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.9" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.9" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework Condition="'$(BuildTarget)' == 'netcoreapp21'">netcoreapp2.1</TargetFramework>
<TargetFramework Condition="'$(BuildTarget)' == 'netcoreapp31'">netcoreapp3.1</TargetFramework>
<TargetFrameworks Condition="'$(BuildTarget)' == ''">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release</Configurations>
<LangVersion>latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\..\packages\Teams\dotnet\Microsoft.Bot.Components.Teams.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.0-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.0" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.14.1" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ __metadata:
languageName: unknown
linkType: soft

"@microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive":
"@microsoft/generator-bot-adaptive@workspace:^1.1.0-preview.1, @microsoft/generator-bot-adaptive@workspace:^1.1.0-rc0, @microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive":
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-adaptive@workspace:generators/generator-bot-adaptive"
dependencies:
Expand Down Expand Up @@ -284,7 +284,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-core-qna@workspace:generators/generator-bot-core-qna"
dependencies:
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0"
eslint: latest
eslint-config-prettier: latest
eslint-plugin-prettier: latest
Expand All @@ -298,7 +298,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-empty@workspace:generators/generator-bot-empty"
dependencies:
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0"
eslint: latest
eslint-config-prettier: latest
eslint-plugin-prettier: latest
Expand All @@ -312,9 +312,9 @@ __metadata:
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-enterprise-assistant@workspace:generators/generator-bot-enterprise-assistant"
dependencies:
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0"
"@microsoft/generator-bot-enterprise-calendar": "workspace:^1.1.0-rc0"
"@microsoft/generator-bot-enterprise-people": "workspace:^1.1.0-rc0"
eslint: latest
eslint-config-prettier: latest
eslint-plugin-prettier: latest
Expand All @@ -325,11 +325,11 @@ __metadata:
languageName: unknown
linkType: soft

"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar":
"@microsoft/generator-bot-enterprise-calendar@workspace:^1.1.0-rc0, @microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar":
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-enterprise-calendar@workspace:generators/generator-bot-enterprise-calendar"
dependencies:
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0"
eslint: latest
eslint-config-prettier: latest
eslint-plugin-prettier: latest
Expand All @@ -339,11 +339,11 @@ __metadata:
languageName: unknown
linkType: soft

"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-preview.1, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people":
"@microsoft/generator-bot-enterprise-people@workspace:^1.1.0-rc0, @microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people":
version: 0.0.0-use.local
resolution: "@microsoft/generator-bot-enterprise-people@workspace:generators/generator-bot-enterprise-people"
dependencies:
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-preview.1"
"@microsoft/generator-bot-adaptive": "workspace:^1.1.0-rc0"
eslint: latest
eslint-config-prettier: latest
eslint-plugin-prettier: latest
Expand Down