Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 2111366

Browse files
lzc850612lzc850612
authored
move skills functionalities into solutions package (#2666)
1 parent 350c77e commit 2111366

File tree

79 files changed

+219
-344
lines changed

Some content is hidden

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

79 files changed

+219
-344
lines changed

‎sdk/csharp/Microsoft.Bot.Builder.Solutions.sln‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solut
1111
EndProject
1212
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions", "libraries\microsoft.bot.builder.solutions\Microsoft.Bot.Builder.Solutions.csproj", "{3AB538FC-B6CA-42E6-A065-53B6A87B57E7}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions.Skills", "libraries\microsoft.bot.builder.solutions.skills\Microsoft.Bot.Builder.Solutions.Skills.csproj", "{2D82A150-35FC-4D84-91D3-99DD27C25AB7}"
15-
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Solutions.Skills.Tests", "tests\microsoft.bot.builder.solutions.skills.tests\Microsoft.Bot.Builder.Solutions.Skills.Tests.csproj", "{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}"
17-
EndProject
1814
Global
1915
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2016
Debug - NuGet Packages|Any CPU = Debug - NuGet Packages|Any CPU
@@ -39,31 +35,13 @@ Global
3935
{3AB538FC-B6CA-42E6-A065-53B6A87B57E7}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
4036
{3AB538FC-B6CA-42E6-A065-53B6A87B57E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
4137
{3AB538FC-B6CA-42E6-A065-53B6A87B57E7}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug - NuGet Packages|Any CPU
43-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Debug - NuGet Packages|Any CPU.Build.0 = Debug - NuGet Packages|Any CPU
44-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
46-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Documentation|Any CPU.ActiveCfg = Documentation|Any CPU
47-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Documentation|Any CPU.Build.0 = Documentation|Any CPU
48-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
49-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7}.Release|Any CPU.Build.0 = Release|Any CPU
50-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Debug - NuGet Packages|Any CPU.ActiveCfg = Debug|Any CPU
51-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Debug - NuGet Packages|Any CPU.Build.0 = Debug|Any CPU
52-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Debug|Any CPU.Build.0 = Debug|Any CPU
54-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Documentation|Any CPU.ActiveCfg = Debug|Any CPU
55-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Documentation|Any CPU.Build.0 = Debug|Any CPU
56-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D}.Release|Any CPU.Build.0 = Release|Any CPU
5838
EndGlobalSection
5939
GlobalSection(SolutionProperties) = preSolution
6040
HideSolutionNode = FALSE
6141
EndGlobalSection
6242
GlobalSection(NestedProjects) = preSolution
6343
{DB53E49B-76B1-4DEE-9ADC-8528F899C7B4} = {A26898D5-E8CB-4CC8-8997-59090DCF6ECD}
6444
{3AB538FC-B6CA-42E6-A065-53B6A87B57E7} = {385B75F0-44DF-4B32-8676-BC46110467B7}
65-
{2D82A150-35FC-4D84-91D3-99DD27C25AB7} = {385B75F0-44DF-4B32-8676-BC46110467B7}
66-
{DAE0734E-2B65-4FED-ADF6-B14FD18A879D} = {A26898D5-E8CB-4CC8-8997-59090DCF6ECD}
6745
EndGlobalSection
6846
GlobalSection(ExtensibilityGlobals) = postSolution
6947
SolutionGuid = {9990775D-5FC4-4B23-8374-05AE6A536EC8}

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Microsoft.Bot.Builder.Solutions.Skills.csproj‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Microsoft.Bot.Builder.Solutions.csproj‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@
4545
<ItemGroup>
4646
<PackageReference Include="AdaptiveCards" Version="1.2.3" />
4747
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.8.1" />
48+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.2" />
4849
<PackageReference Include="Microsoft.Azure.CognitiveServices.ContentModerator" Version="1.0.0" />
4950
<PackageReference Include="Microsoft.Bot.Builder.AI.Luis" Version="4.6.1" />
5051
<PackageReference Include="Microsoft.Bot.Builder.AI.QnA" Version="4.6.1" />
5152
<PackageReference Include="Microsoft.Bot.Builder.Azure" Version="4.6.1" />
5253
<PackageReference Include="Microsoft.Bot.Builder.Dialogs" Version="4.6.1" />
5354
<PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive" Version="4.6.0-preview-rc1" />
55+
<PackageReference Include="Microsoft.Bot.Builder.Integration.AspNet.Core" Version="4.6.1" />
5456
<PackageReference Include="Microsoft.Bot.Builder.LanguageGeneration" Version="4.6.0-rc0-preview" />
5557
<PackageReference Include="Microsoft.Bot.Builder.TemplateManager" Version="4.6.1" />
5658
<PackageReference Include="Microsoft.Bot.Configuration" Version="4.6.1" />
@@ -81,6 +83,11 @@
8183
<AutoGen>True</AutoGen>
8284
<DependentUpon>CommonStrings.resx</DependentUpon>
8385
</Compile>
86+
<Compile Update="Skills\Responses\SkillResponses.cs">
87+
<DependentUpon>SkillResponses.tt</DependentUpon>
88+
<DesignTime>True</DesignTime>
89+
<AutoGen>True</AutoGen>
90+
</Compile>
8491
</ItemGroup>
8592

8693
<ItemGroup>
@@ -112,6 +119,10 @@
112119
<Generator>TextTemplatingFileGenerator</Generator>
113120
<LastGenOutput>AuthenticationResponses.cs</LastGenOutput>
114121
</None>
122+
<None Update="Skills\Responses\SkillResponses.tt">
123+
<LastGenOutput>SkillResponses.cs</LastGenOutput>
124+
<Generator>TextTemplatingFileGenerator</Generator>
125+
</None>
115126
</ItemGroup>
116127

117128
<ItemGroup>

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/AuthHelpers.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/AuthHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq;
66
using System.Security.Claims;
77

8-
namespace Microsoft.Bot.Builder.Skills.Auth
8+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
99
{
1010
public static class AuthHelpers
1111
{

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/Authenticator.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/Authenticator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using System.Threading.Tasks;
99
using Microsoft.AspNetCore.Http;
1010

11-
namespace Microsoft.Bot.Builder.Skills.Auth
11+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
1212
{
1313
public class Authenticator : IAuthenticator
1414
{
@@ -21,7 +21,7 @@ public Authenticator(IAuthenticationProvider authenticationProvider, IWhitelistA
2121
_whitelistAuthenticationProvider = whitelistAuthenticationProvider ?? throw new ArgumentNullException(nameof(whitelistAuthenticationProvider));
2222
}
2323

24-
public async Task<ClaimsIdentity> Authenticate(HttpRequest httpRequest, HttpResponse httpResponse)
24+
public async Task<ClaimsIdentity> AuthenticateAsync(HttpRequest httpRequest, HttpResponse httpResponse)
2525
{
2626
if (httpRequest == null)
2727
{

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/IAuthenticationProvider.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/IAuthenticationProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Security.Claims;
55

6-
namespace Microsoft.Bot.Builder.Skills.Auth
6+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
77
{
88
public interface IAuthenticationProvider
99
{

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/IAuthenticator.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/IAuthenticator.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
using System.Threading.Tasks;
66
using Microsoft.AspNetCore.Http;
77

8-
namespace Microsoft.Bot.Builder.Skills.Auth
8+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
99
{
1010
public interface IAuthenticator
1111
{
12-
Task<ClaimsIdentity> Authenticate(HttpRequest httpRequest, HttpResponse httpResponse);
12+
Task<ClaimsIdentity> AuthenticateAsync(HttpRequest httpRequest, HttpResponse httpResponse);
1313
}
1414
}

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/IServiceClientCredentials.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/IServiceClientCredentials.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Threading;
66
using System.Threading.Tasks;
77

8-
namespace Microsoft.Bot.Builder.Skills.Auth
8+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
99
{
1010
public interface IServiceClientCredentials
1111
{

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/IWhitelistAuthenticationProvider.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/IWhitelistAuthenticationProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Collections.Generic;
55

6-
namespace Microsoft.Bot.Builder.Skills.Auth
6+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
77
{
88
public interface IWhitelistAuthenticationProvider
99
{

‎sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/Auth/MicrosoftAppCredentialsEx.cs‎ renamed to ‎sdk/csharp/libraries/microsoft.bot.builder.solutions/Skills/Auth/MicrosoftAppCredentialsEx.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.Bot.Connector.Authentication;
55

6-
namespace Microsoft.Bot.Builder.Skills.Auth
6+
namespace Microsoft.Bot.Builder.Solutions.Skills.Auth
77
{
88
public class MicrosoftAppCredentialsEx : MicrosoftAppCredentials, IServiceClientCredentials
99
{

0 commit comments

Comments
 (0)