diff --git a/Microsoft.Bot.Builder.sln b/Microsoft.Bot.Builder.sln index 4a6480907..47c6cb16f 100644 --- a/Microsoft.Bot.Builder.sln +++ b/Microsoft.Bot.Builder.sln @@ -26,8 +26,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.AI.Lu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.AI.Luis.Tests", "tests\Microsoft.Bot.Builder.AI.LUIS.Tests\Microsoft.Bot.Builder.AI.Luis.Tests.csproj", "{7BCEBDC1-D57F-4717-9B15-4FACD5473489}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.AspNet.WebApi", "libraries\integration\Microsoft.Bot.Builder.Integration.AspNet.WebApi\Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj", "{BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.AspNet.Core", "libraries\integration\Microsoft.Bot.Builder.Integration.AspNet.Core\Microsoft.Bot.Builder.Integration.AspNet.Core.csproj", "{053BD8B8-B5C1-4C45-81D4-C9BA8D5B3CE2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TemplateManager", "libraries\Microsoft.Bot.Builder.TemplateManager\Microsoft.Bot.Builder.TemplateManager.csproj", "{EED5F0D3-6F00-4ED1-9108-5ADCB10A3734}" @@ -48,8 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.AspNet.Core.Tests", "tests\integration\Microsoft.Bot.Builder.Integration.AspNet.Core.Tests\Microsoft.Bot.Builder.Integration.AspNet.Core.Tests.csproj", "{62C4DC83-3B07-45D7-856E-224FFB368E5F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests", "tests\integration\Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests\Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj", "{2614D290-1345-4A41-BE90-F85F817CEADE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Tests", "tests\Microsoft.Bot.Builder.Tests\Microsoft.Bot.Builder.Tests.csproj", "{35F9B8A8-1974-4795-930B-5E4980EE85E5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Transcripts.Tests", "tests\Microsoft.Bot.Builder.Transcripts.Tests\Microsoft.Bot.Builder.Transcripts.Tests.csproj", "{71698D71-4C6F-40D5-8BDE-2587514CA21C}" @@ -64,10 +60,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Appli EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.ApplicationInsights.Core.Tests", "tests\integration\Microsoft.Bot.ApplicationInsights.Core.Tests\Microsoft.Bot.ApplicationInsights.Core.Tests.csproj", "{3F4A0DD8-4D47-4B9C-939A-3146E68C84F7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi", "libraries\integration\Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi\Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj", "{400BB78F-AFDC-4B1C-AD85-BE159B576FCE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.ApplicationInsights.WebApi.Tests", "tests\integration\Microsoft.Bot.ApplicationInsights.WebApi.Tests\Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj", "{873BCC1F-ED12-424E-93FA-D76F4BA022C2}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.ApplicationInsights.Tests", "tests\Microsoft.Bot.Builder.ApplicationInsights.Tests\Microsoft.Bot.Builder.ApplicationInsights.Tests.csproj", "{D790A4BB-D8AC-4AAE-B3FE-0CF432CA8031}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.TestBot", "tests\Microsoft.Bot.Builder.TestBot\Microsoft.Bot.Builder.TestBot.csproj", "{C113E0AE-5564-4389-BA39-183A8D574210}" @@ -162,6 +154,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Connector.Tea EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Schema.Teams.Tests", "tests\Microsoft.Bot.Schema.Teams.Tests\Microsoft.Bot.Schema.Teams.Tests.csproj", "{A67CCC9B-3B0D-4E3D-A111-6D8A85FAA35B}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi", "libraries\integration\Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi\Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj", "{E0223463-97C6-4108-B5A9-AFBA16B9D5CC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Bot.Builder.Integration.AspNet.WebApi", "libraries\integration\Microsoft.Bot.Builder.Integration.AspNet.WebApi\Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj", "{EE76BD65-FB01-498F-B053-4E1B2693D85F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.ApplicationInsights.WebApi.Tests", "tests\integration\Microsoft.Bot.ApplicationInsights.WebApi.Tests\Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj", "{873BCC1F-ED12-424E-93FA-D76F4BA022C2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests", "tests\integration\Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests\Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj", "{2614D290-1345-4A41-BE90-F85F817CEADE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -242,12 +242,6 @@ Global {7BCEBDC1-D57F-4717-9B15-4FACD5473489}.Release|Any CPU.Build.0 = Release|Any CPU {7BCEBDC1-D57F-4717-9B15-4FACD5473489}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU {7BCEBDC1-D57F-4717-9B15-4FACD5473489}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Debug|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Release|Any CPU.ActiveCfg = Release-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU {053BD8B8-B5C1-4C45-81D4-C9BA8D5B3CE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {053BD8B8-B5C1-4C45-81D4-C9BA8D5B3CE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {053BD8B8-B5C1-4C45-81D4-C9BA8D5B3CE2}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU @@ -312,12 +306,6 @@ Global {62C4DC83-3B07-45D7-856E-224FFB368E5F}.Release|Any CPU.Build.0 = Release|Any CPU {62C4DC83-3B07-45D7-856E-224FFB368E5F}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU {62C4DC83-3B07-45D7-856E-224FFB368E5F}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU - {2614D290-1345-4A41-BE90-F85F817CEADE}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU {35F9B8A8-1974-4795-930B-5E4980EE85E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {35F9B8A8-1974-4795-930B-5E4980EE85E5}.Debug|Any CPU.Build.0 = Debug|Any CPU {35F9B8A8-1974-4795-930B-5E4980EE85E5}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU @@ -374,16 +362,6 @@ Global {3F4A0DD8-4D47-4B9C-939A-3146E68C84F7}.Release|Any CPU.Build.0 = Release|Any CPU {3F4A0DD8-4D47-4B9C-939A-3146E68C84F7}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU {3F4A0DD8-4D47-4B9C-939A-3146E68C84F7}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU - {400BB78F-AFDC-4B1C-AD85-BE159B576FCE}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {400BB78F-AFDC-4B1C-AD85-BE159B576FCE}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU - {400BB78F-AFDC-4B1C-AD85-BE159B576FCE}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU - {400BB78F-AFDC-4B1C-AD85-BE159B576FCE}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU - {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU {D790A4BB-D8AC-4AAE-B3FE-0CF432CA8031}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D790A4BB-D8AC-4AAE-B3FE-0CF432CA8031}.Debug|Any CPU.Build.0 = Debug|Any CPU {D790A4BB-D8AC-4AAE-B3FE-0CF432CA8031}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU @@ -650,12 +628,12 @@ Global {56230F58-02EF-4C88-9C28-BE37B8A4D074}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU - {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU + {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug-Windows|Any CPU.ActiveCfg = Debug|Any CPU + {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Debug-Windows|Any CPU.Build.0 = Debug|Any CPU {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release|Any CPU.ActiveCfg = Release|Any CPU {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release|Any CPU.Build.0 = Release|Any CPU - {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU - {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU + {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release-Windows|Any CPU.ActiveCfg = Release|Any CPU + {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F}.Release-Windows|Any CPU.Build.0 = Release|Any CPU {D9C6FA68-340F-4338-8158-3BCBF10F320D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D9C6FA68-340F-4338-8158-3BCBF10F320D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9C6FA68-340F-4338-8158-3BCBF10F320D}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU @@ -672,6 +650,30 @@ Global {A67CCC9B-3B0D-4E3D-A111-6D8A85FAA35B}.Release|Any CPU.Build.0 = Release|Any CPU {A67CCC9B-3B0D-4E3D-A111-6D8A85FAA35B}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU {A67CCC9B-3B0D-4E3D-A111-6D8A85FAA35B}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Debug|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Release|Any CPU.ActiveCfg = Release-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Debug|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Release|Any CPU.ActiveCfg = Release-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU + {EE76BD65-FB01-498F-B053-4E1B2693D85F}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU + {873BCC1F-ED12-424E-93FA-D76F4BA022C2}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug-Windows|Any CPU.ActiveCfg = Debug-Windows|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Debug-Windows|Any CPU.Build.0 = Debug-Windows|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Release-Windows|Any CPU.ActiveCfg = Release-Windows|Any CPU + {2614D290-1345-4A41-BE90-F85F817CEADE}.Release-Windows|Any CPU.Build.0 = Release-Windows|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -687,7 +689,6 @@ Global {276EBE79-A13A-46BD-A566-B01DC0477A9B} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {67AA3C00-E2C5-4D13-BA5E-72EB0E5B8DAA} = {763168FA-A590-482C-84D8-2922F7ADB1A2} {7BCEBDC1-D57F-4717-9B15-4FACD5473489} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} - {BD0B82EF-1601-4E87-B78A-B43DE7EB36B0} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} {053BD8B8-B5C1-4C45-81D4-C9BA8D5B3CE2} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} {EED5F0D3-6F00-4ED1-9108-5ADCB10A3734} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {C93F6192-0123-4121-AD92-374A71E4B0F3} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} @@ -698,7 +699,6 @@ Global {2F77CA1D-E6F0-4DEA-96BB-8A039F4D0FF8} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {62C4DC83-3B07-45D7-856E-224FFB368E5F} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} - {2614D290-1345-4A41-BE90-F85F817CEADE} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} {35F9B8A8-1974-4795-930B-5E4980EE85E5} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {71698D71-4C6F-40D5-8BDE-2587514CA21C} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {0B8ABFDB-F9CF-4EC6-988E-9C32D9E01C26} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} @@ -706,8 +706,6 @@ Global {8FC920C6-E895-4A17-AB2F-452FAAA36CC8} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} {B609DB2C-5C1F-46D1-A0FA-A0FF9216899A} = {4269F3C3-6B42-419B-B64A-3E6DC0F1574A} {3F4A0DD8-4D47-4B9C-939A-3146E68C84F7} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} - {400BB78F-AFDC-4B1C-AD85-BE159B576FCE} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} - {873BCC1F-ED12-424E-93FA-D76F4BA022C2} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} {D790A4BB-D8AC-4AAE-B3FE-0CF432CA8031} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {C113E0AE-5564-4389-BA39-183A8D574210} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {B9DDC8CB-8EDF-4D98-913A-22F19E642223} = {8667F820-8ADA-4498-91AE-AE95DEE5227E} @@ -746,6 +744,10 @@ Global {6EB0FEBB-DB84-44C8-9C5B-FD3D3D187A4F} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {D9C6FA68-340F-4338-8158-3BCBF10F320D} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} {A67CCC9B-3B0D-4E3D-A111-6D8A85FAA35B} = {AD743B78-D61F-4FBF-B620-FA83CE599A50} + {E0223463-97C6-4108-B5A9-AFBA16B9D5CC} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} + {EE76BD65-FB01-498F-B053-4E1B2693D85F} = {276EBE79-A13A-46BD-A566-B01DC0477A9B} + {873BCC1F-ED12-424E-93FA-D76F4BA022C2} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} + {2614D290-1345-4A41-BE90-F85F817CEADE} = {0A0E26B0-7A46-4F1A-8BFE-9A763FDF6CF8} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {7173C9F3-A7F9-496E-9078-9156E35D6E16} diff --git a/libraries/Adapters/Microsoft.Bot.Builder.Adapters.Twilio/TwilioAdapterOptions.cs b/libraries/Adapters/Microsoft.Bot.Builder.Adapters.Twilio/TwilioAdapterOptions.cs index 3eb22b028..23f0cafa8 100644 --- a/libraries/Adapters/Microsoft.Bot.Builder.Adapters.Twilio/TwilioAdapterOptions.cs +++ b/libraries/Adapters/Microsoft.Bot.Builder.Adapters.Twilio/TwilioAdapterOptions.cs @@ -1,6 +1,8 @@ // Copyright(c) Microsoft Corporation.All rights reserved. // Licensed under the MIT License. +using System; + namespace Microsoft.Bot.Builder.Adapters.Twilio { /// @@ -15,7 +17,7 @@ namespace Microsoft.Bot.Builder.Adapters.Twilio /// The account id. /// The authentication token. /// validation URL for incoming requests. - public TwilioAdapterOptions(string twilioNumber, string accountSid, string authToken, string validationUrl = null) + public TwilioAdapterOptions(string twilioNumber, string accountSid, string authToken, Uri validationUrl = null) { TwilioNumber = twilioNumber; AccountSid = accountSid; @@ -49,6 +51,6 @@ namespace Microsoft.Bot.Builder.Adapters.Twilio /// Optional validation URL to override the automatically generated URL signature used /// to validate incoming requests. See the Twilio security documentation on /// [validating requests](https://www.twilio.com/docs/usage/security#validating-requests). - public string ValidationUrl { get; set; } + public Uri ValidationUrl { get; set; } } } diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj b/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj index 05c6053ff..1c62c79fc 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi/Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.csproj @@ -5,7 +5,7 @@ $(PackageVersion) 4.6.0-local $(PackageVersion) - Debug-Windows;Release-Windows + Debug;Release;Debug-Windows;Release-Windows diff --git a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi/Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi/Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj index 08d09df5e..ab5e236c9 100644 --- a/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi/Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj +++ b/libraries/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi/Microsoft.Bot.Builder.Integration.AspNet.WebApi.csproj @@ -5,7 +5,7 @@ $(PackageVersion) 4.6.0-local $(PackageVersion) - Debug-Windows;Release-Windows + Debug;Release;Debug-Windows;Release-Windows diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/ResourceTests.cs b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/ResourceTests.cs index dca0754cd..1965938b5 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/ResourceTests.cs +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/ResourceTests.cs @@ -19,10 +19,11 @@ namespace Microsoft.Bot.Builder.Dialogs.Declarative.Tests public TestContext TestContext { get; set; } - [ClassInitialize] - public static void ClassInitialize(TestContext context) + [TestInitialize] + public void TestInitialize() { - foreach (var file in Directory.EnumerateFiles(Environment.CurrentDirectory, "*.dialog")) + var path = Path.GetFullPath(PathUtils.NormalizePath(Path.Combine(Environment.CurrentDirectory, @"..\.."))); + foreach (var file in Directory.EnumerateFiles(path, "*.dialog")) { File.Delete(file); } diff --git a/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/CancelAndHelpDialogTests.cs b/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/CancelAndHelpDialogTests.cs index 8b940d77b..bf1688787 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/CancelAndHelpDialogTests.cs +++ b/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/CancelAndHelpDialogTests.cs @@ -40,7 +40,7 @@ namespace Microsoft.BotBuilderSamples.Tests.Dialogs reply = await testClient.SendActivityAsync(cancelUtterance); Assert.Equal("Cancelling", reply.Text); - Assert.Equal(DialogTurnStatus.Complete, testClient.DialogTurnResult.Status); + Assert.Equal(DialogTurnStatus.Cancelled, testClient.DialogTurnResult.Status); } [Theory] @@ -71,19 +71,19 @@ namespace Microsoft.BotBuilderSamples.Tests.Dialogs AddDialog(new TextPrompt(nameof(TextPrompt))); var steps = new WaterfallStep[] { - PromptAction, - FinalAction, + PromptStep, + FinalStep, }; AddDialog(new WaterfallDialog("testWaterfall", steps)); InitialDialogId = "testWaterfall"; } - private async Task PromptAction(WaterfallStepContext stepContext, CancellationToken cancellationToken) + private async Task PromptStep(WaterfallStepContext stepContext, CancellationToken cancellationToken) { return await stepContext.PromptAsync(nameof(TextPrompt), new PromptOptions { Prompt = MessageFactory.Text("Hi there") }, cancellationToken); } - private Task FinalAction(WaterfallStepContext stepContext, CancellationToken cancellationToken) + private Task FinalStep(WaterfallStepContext stepContext, CancellationToken cancellationToken) { throw new NotImplementedException(); } diff --git a/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/TestData/BookingDialogTestsDataGenerator.cs b/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/TestData/BookingDialogTestsDataGenerator.cs index ab05e3aba..12eb39d23 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/TestData/BookingDialogTestsDataGenerator.cs +++ b/tests/Microsoft.Bot.Builder.TestBot.Tests/Dialogs/TestData/BookingDialogTestsDataGenerator.cs @@ -60,7 +60,7 @@ namespace Microsoft.BotBuilderSamples.Tests.Dialogs.TestData { "cancel", "Cancelling" }, }, true, - new DialogTurnResult(DialogTurnStatus.Complete)); + new DialogTurnResult(DialogTurnStatus.Cancelled)); yield return BuildTestCaseObject( "Full flow with failed call to FlightBookingService", diff --git a/tests/Microsoft.Bot.Builder.Tests/BotFrameworkAdapterTests.cs b/tests/Microsoft.Bot.Builder.Tests/BotFrameworkAdapterTests.cs index 711bc3cc7..99418ff5b 100644 --- a/tests/Microsoft.Bot.Builder.Tests/BotFrameworkAdapterTests.cs +++ b/tests/Microsoft.Bot.Builder.Tests/BotFrameworkAdapterTests.cs @@ -51,11 +51,11 @@ namespace Microsoft.Bot.Builder.Tests const string TenantIdValue = "theTenantId"; const string EventActivityName = "CreateConversation"; - Func> createResponseMessage = async () => + Func> createResponseMessage = () => { var response = new HttpResponseMessage(System.Net.HttpStatusCode.OK); response.Content = new StringContent(new JObject { { ActivityIdName, ActivityIdValue }, { ConversationIdName, ConversationIdValue } }.ToString()); - return response; + return Task.FromResult(response); }; var mockCredentialProvider = new Mock();