Skip to content

Commit e9cc10d

Browse files
garyprettySteveniccarlosscastrostephanbisserrvinothrajendran
authored
Merge Packages Preview Branch into Develop to prep for GA release (#389)
* New CallDialogs component for composer (#365) * Added CallDialogs component * Updated nuget package and sample * Implemented call dialogs sample * Updated sample to use 1.3-preview package of call dialogs * Added readme * Added screen shots * Update readme.md * Update readme.md * Update AllowedCallersClaimsValidator.cs Removed copyright header * Stevenic/storage component (#368) * Added CallDialogs component * Updated nuget package and sample * Implemented call dialogs sample * Updated sample to use 1.3-preview package of call dialogs * Added readme * Added screen shots * Update readme.md * Update readme.md * Added new storage component * Added Storage Sample * Updated readme for storage component * Update readme.md Fixed typo * Update AllowedCallersClaimsValidator.cs * Update AllowedCallersClaimsValidationTests.cs * Update MessagesTrigger.cs * Update ActivitySerializationSettings.cs * Update SkillsTrigger.cs * Update Startup.cs * Update BotController.cs * Update SkillController.cs * Update Program.cs * Update Startup.cs * Update ComposerBot.cs * Update ComposerBotPathExtensions.cs * Update ComposerSettingsExtensions.cs * Update LuisConfig.cs * Update BlobStorageConfiguration.cs * Update BotFeatureSettings.cs * Update BotSettings.cs * Update BotSkillConfiguration.cs * Update SkillConversationIdFactory.cs * Update MultiplyDialog.cs * Update CustomActionComponentRegistration.cs * Update ActionsTests.cs * Update ControllingConversationTests.cs * Adapter components: Zoom, Alexa, ActionsSDK and ACS SMS (#373) * Adapter components: Zoom, Alexa, ActionsSDK and ACS SMS * Adapters: add data annotation validations for adapter component * Components: Add new tag msbot-component and category tags (#377) * Components: upgrade to 4.13rc2, update to BotComponent base class, rename adapter schemas, add adapter type (#379) * GetWeather delcarative package added to packages-preview feature branch * Update Adapter Component project files to supress NU5104 temporarily and add PackageIcon property. * Add nuget.config to add Bot Builder MyGet as a package source * Update GetWeather dialog project to align with other projects in the solution. * Temporarily removed the Adaptive Dialog Test project to allow for build / publish of preview packages. * Update README.md * Update README.md * Update project URLs to correct Component library locations. * Add LivePerson Handoff Package and Handoff Shared package * Update shared targets to rc5. Fix runtime reference in handoff package. * Update LivePerson controller to handle RichContentEvents * Update SDK version shared target to 4.13.0 * Updated shared handoff proj properties * Add readme for LivePerson handoff * Update README.md * ADapter schemas: add type, update doc link to main repo (#382) * A collection of custom input for Bot Framework Composer (#381) * Update tag for LivePerson package * ServiceNow Handoff Implementation (#388) * Add LivePerson handoff component. Tidy up package references and shared NuGet props. * Update SDK / preview targets * First implementation of ServiceNow handoff utilising a fixed user/password for demonstration purposes. Further work is identified to identify pass-through authentication (SSO) * adding oauth config setting and trace * oauth work * oAuth implementation and readme * new response handling Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Alexa component help link issue has been fixed (#383) * Alexa helplink issue has been fixed * Alexa components help link has fixec * Stevenic develop (#391) * Added CallDialogs component * Updated nuget package and sample * Implemented call dialogs sample * Updated sample to use 1.3-preview package of call dialogs * Added readme * Added screen shots * Update readme.md * Update readme.md * Update AllowedCallersClaimsValidator.cs Removed copyright header * Fix links to samples (#374) * chore: update the SentimentAnalyzer reference for Sentiment Analysis Middleware (#375) Co-authored-by: Gary Pretty <gary@garypretty.co.uk> Co-authored-by: Kyle Delaney <v-kydel@microsoft.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Gary Pretty <gary@garypretty.co.uk> * Add sso token exchange skill handler package (#387) * Add Bot.Builder.Community.Components.TokenExchangeSkillHandler * Remove package generation from TokenExchangeSkillHandler project * Readme fix * Bot.Builder.Community.Components.TokenExchangeSkillHandler readme update * Add Prerequisite to readme * Add null checks to SkillsConfiguration * Add SkillConfigurationTests Co-authored-by: Steven Ickman <stevenic@microsoft.com> Co-authored-by: Carlos Castro <carlosscastro@users.noreply.github.com> Co-authored-by: Stephan Bisser <stephan@bisser.at> Co-authored-by: Vinoth Rajendran <r.vinoth@live.com> Co-authored-by: Darren Jefford <33519520+darrenj@users.noreply.github.com> Co-authored-by: Kyle Delaney <v-kydel@microsoft.com> Co-authored-by: Arafat Tehsin <arafattehsin@hotmail.com> Co-authored-by: Eric Dahlvang <erdahlva@microsoft.com>
1 parent a1d5673 commit e9cc10d

354 files changed

Lines changed: 44511 additions & 19 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Bot.Builder.Community.sln‎

Lines changed: 156 additions & 11 deletions
Large diffs are not rendered by default.

‎CommonTargets/library.shared.targets‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project>
22

33
<PropertyGroup>
4-
<Bot_Builder_Version>4.12.1</Bot_Builder_Version>
4+
<Bot_Builder_Version>4.13.0</Bot_Builder_Version>
5+
<Bot_Builder_Preview_Version>4.13.0-rc5.preview</Bot_Builder_Preview_Version>
56
</PropertyGroup>
67

78
</Project>

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PropertyGroup>
3232
<!-- Rules found at: https://aka.ms/Microsoft-NuGet-Compliance -->
3333
<PackageProjectUrl>http://www.github.com/botbuildercommunity/botbuildercommunity-dotnet</PackageProjectUrl>
34-
<PackageIconUrl>https://bot-framework.azureedge.net/static/58168-ae253ca613/intercom-webui/v1.6.2/assets/landing-page/images/BotFrame_Logo_Icon.png</PackageIconUrl>
34+
<IconUrl>https://bot-framework.azureedge.net/static/58168-ae253ca613/intercom-webui/v1.6.2/assets/landing-page/images/BotFrame_Logo_Icon.png</IconUrl>
3535
<PackageLicenseUrl>http://www.github.com/botbuildercommunity/botbuildercommunity-dotnet/blob/master/LICENSE</PackageLicenseUrl>
3636
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
3737
<RepositoryUrl>

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Bot Builder Community
3+
Copyright (c) 2021 Bot Builder Community
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎libraries/Bot.Builder.Community.Adapters.ACS.SMS/AcsSmsAdapterOptions.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Azure.Core;
2+
using System.ComponentModel.DataAnnotations;
23

34
namespace Bot.Builder.Community.Adapters.ACS.SMS
45
{
@@ -7,10 +8,12 @@ namespace Bot.Builder.Community.Adapters.ACS.SMS
78
/// </summary>
89
public class AcsSmsAdapterOptions
910
{
11+
[Required]
1012
public string AcsConnectionString { get; set; }
1113

1214
public bool EnableDeliveryReports { get; set; } = true;
1315

16+
[Required]
1417
public string AcsPhoneNumber { get; set; }
1518

1619
public RetryOptions RetryOptions { get; set; }

‎libraries/Bot.Builder.Community.Adapters.ACS.SMS/Bot.Builder.Community.Adapters.ACS.SMS.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)../', 'Bot.Builder.Community.sln'))\CommonTargets\library.shared.targets" />
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<Description>Adapter for v4 of the Bot Builder .NET SDK to allow for a bot to be used with SMS via Azure Communication Services.</Description>
77
<Authors>Bot Builder Community</Authors>
88
<Company>Bot Builder Community</Company>
@@ -13,7 +13,7 @@
1313
<AssemblyVersion>1.0.0</AssemblyVersion>
1414
<RepositoryUrl>https://github.com/BotBuilderCommunity/botbuilder-community-dotnet/</RepositoryUrl>
1515
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
16-
</PropertyGroup>
16+
</PropertyGroup>
1717

1818
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1919
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -25,6 +25,7 @@
2525
<PackageReference Include="Microsoft.Azure.EventGrid" Version="3.2.0" />
2626
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="$(Bot_Builder_Version)" />
2727
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
28+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

‎libraries/Bot.Builder.Community.Adapters.ActionsSDK/ActionsSdkAdapterOptions.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
namespace Bot.Builder.Community.Adapters.ActionsSDK
1+
using System.ComponentModel.DataAnnotations;
2+
3+
namespace Bot.Builder.Community.Adapters.ActionsSDK
24
{
35
public class ActionsSdkAdapterOptions
46
{
57
public bool ShouldEndSessionByDefault { get; set; } = true;
68

9+
[Required]
710
public string ActionInvocationName { get; set; }
811

12+
[Required]
913
public string ActionProjectId { get; set; }
1014
}
1115
}

‎libraries/Bot.Builder.Community.Adapters.ActionsSDK/Bot.Builder.Community.Adapters.ActionsSDK.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="$(Bot_Builder_Version)" />
28+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2829
</ItemGroup>
2930

3031
<ItemGroup>

‎libraries/Bot.Builder.Community.Adapters.Alexa/AlexaAdapterOptions.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
namespace Bot.Builder.Community.Adapters.Alexa
1+
using System.ComponentModel.DataAnnotations;
2+
3+
namespace Bot.Builder.Community.Adapters.Alexa
24
{
35
public class AlexaAdapterOptions
46
{
@@ -15,6 +17,7 @@ public class AlexaAdapterOptions
1517
/// This will be used to verify requests coming from Alexa are for this bot.
1618
/// See https://developer.amazon.com/en-US/docs/alexa/custom-skills/handle-requests-sent-by-alexa.html for more information including how to get this value.
1719
/// </remarks>
20+
[Required]
1821
public string AlexaSkillId { get; set; }
1922
}
2023
}

‎libraries/Bot.Builder.Community.Adapters.Alexa/Bot.Builder.Community.Adapters.Alexa.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="$(Bot_Builder_Version)" />
3131
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.1.1" />
32+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
3233
</ItemGroup>
3334

3435
<ItemGroup>

0 commit comments

Comments
 (0)