diff --git a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj index 47765a61d0..ec1beda515 100644 --- a/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj +++ b/FunctionalTests/Microsoft.Bot.Builder.FunctionalTests/Microsoft.Bot.Builder.FunctionalTests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/libraries/AdaptiveExpressions/AdaptiveExpressions.csproj b/libraries/AdaptiveExpressions/AdaptiveExpressions.csproj index cbf87b77a0..6a4c591840 100644 --- a/libraries/AdaptiveExpressions/AdaptiveExpressions.csproj +++ b/libraries/AdaptiveExpressions/AdaptiveExpressions.csproj @@ -30,7 +30,7 @@ - + diff --git a/libraries/Directory.Build.props b/libraries/Directory.Build.props index fd31358942..0f213f8499 100644 --- a/libraries/Directory.Build.props +++ b/libraries/Directory.Build.props @@ -14,7 +14,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj b/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj index a3c9a828f2..b4df3dc5fe 100644 --- a/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj +++ b/libraries/Microsoft.Bot.AdaptiveExpressions.Core/Microsoft.Bot.AdaptiveExpressions.Core.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/libraries/Microsoft.Bot.Builder.Azure.Blobs/Microsoft.Bot.Builder.Azure.Blobs.csproj b/libraries/Microsoft.Bot.Builder.Azure.Blobs/Microsoft.Bot.Builder.Azure.Blobs.csproj index c0997e4d65..86ec2e184e 100644 --- a/libraries/Microsoft.Bot.Builder.Azure.Blobs/Microsoft.Bot.Builder.Azure.Blobs.csproj +++ b/libraries/Microsoft.Bot.Builder.Azure.Blobs/Microsoft.Bot.Builder.Azure.Blobs.csproj @@ -23,7 +23,7 @@ - + diff --git a/libraries/Microsoft.Bot.Builder.Azure.Queues/Microsoft.Bot.Builder.Azure.Queues.csproj b/libraries/Microsoft.Bot.Builder.Azure.Queues/Microsoft.Bot.Builder.Azure.Queues.csproj index fa36d22293..eeb08799f1 100644 --- a/libraries/Microsoft.Bot.Builder.Azure.Queues/Microsoft.Bot.Builder.Azure.Queues.csproj +++ b/libraries/Microsoft.Bot.Builder.Azure.Queues/Microsoft.Bot.Builder.Azure.Queues.csproj @@ -34,7 +34,7 @@ - + diff --git a/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj b/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj index c9d34ef641..1dfead4bc6 100644 --- a/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj +++ b/libraries/Microsoft.Bot.Builder.Azure/Microsoft.Bot.Builder.Azure.csproj @@ -38,7 +38,7 @@ - + diff --git a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj index c558824c54..ccffb8f8db 100644 --- a/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj +++ b/libraries/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing/Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.csproj @@ -48,7 +48,7 @@ - + diff --git a/libraries/Microsoft.Bot.Builder.LanguageGeneration/Microsoft.Bot.Builder.LanguageGeneration.csproj b/libraries/Microsoft.Bot.Builder.LanguageGeneration/Microsoft.Bot.Builder.LanguageGeneration.csproj index 61e141ebde..ab26df5a76 100644 --- a/libraries/Microsoft.Bot.Builder.LanguageGeneration/Microsoft.Bot.Builder.LanguageGeneration.csproj +++ b/libraries/Microsoft.Bot.Builder.LanguageGeneration/Microsoft.Bot.Builder.LanguageGeneration.csproj @@ -22,7 +22,7 @@ - + diff --git a/libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj b/libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj index d4704b266d..6c1583444a 100644 --- a/libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj +++ b/libraries/Microsoft.Bot.Connector/Microsoft.Bot.Connector.csproj @@ -29,8 +29,8 @@ - - + + diff --git a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Microsoft.Bot.Builder.Parsers.LU.csproj b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Microsoft.Bot.Builder.Parsers.LU.csproj index b48be5e523..2ac9754c39 100644 --- a/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Microsoft.Bot.Builder.Parsers.LU.csproj +++ b/libraries/Parsers/Microsoft.Bot.Builder.Parsers.LU/Microsoft.Bot.Builder.Parsers.LU.csproj @@ -28,7 +28,7 @@ - + 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 805670efa7..ac64ed9e19 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 @@ -47,14 +47,14 @@ - - - - - - - - + + + + + + + + diff --git a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj index df70aa91bd..0283b0ccb2 100644 --- a/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj +++ b/tests/Adapters/Microsoft.Bot.Builder.Adapters.Twilio.TestBot/Microsoft.Bot.Builder.Adapters.Twilio.TestBot.csproj @@ -16,7 +16,7 @@ - + \ No newline at end of file diff --git a/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj b/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj index aab6d3b98f..a5c405296d 100644 --- a/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj +++ b/tests/AdaptiveExpressions.Tests/AdaptiveExpressions.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj b/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj index 3486bb7bcc..f7faa7ea81 100644 --- a/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj +++ b/tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests/Microsoft.Bot.AdaptiveExpressions.Core.AOT.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj b/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj index 1bf10f24c9..ced67a1673 100644 --- a/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj +++ b/tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests/Microsoft.Bot.AdaptiveExpressions.Core.Tests.csproj @@ -14,7 +14,7 @@ - + diff --git a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj index 38176097e3..37db05107d 100644 --- a/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.LUIS.Tests/Microsoft.Bot.Builder.AI.Luis.Tests.csproj @@ -18,7 +18,7 @@ - + all diff --git a/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj b/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj index 7f3f3ce13b..29def90d71 100644 --- a/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj +++ b/tests/Microsoft.Bot.Builder.AI.Luis.TestUtils/Microsoft.Bot.Builder.AI.Luis.TestUtils.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj index 0ccb929128..4027940a8c 100644 --- a/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests/Microsoft.Bot.Builder.AI.Orchestrator.Tests.csproj @@ -13,7 +13,7 @@ - + all diff --git a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/LanguageServiceTests.cs b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/LanguageServiceTests.cs index 14692c0c59..dcb9ce78d1 100644 --- a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/LanguageServiceTests.cs +++ b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/LanguageServiceTests.cs @@ -1138,7 +1138,7 @@ await CreateFlow(rootDialog, nameof(LanguageServiceAction_MultiTurnDialogBase_Wi } Assert.Equal(2, result.InnerExceptions.Count); - Assert.All(result.InnerExceptions, (e) => Assert.IsType(e)); + Assert.All(result.InnerExceptions, (e) => Assert.IsType(e)); } /// diff --git a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj index d650f351fe..3b28699047 100644 --- a/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.AI.QnA.Tests/Microsoft.Bot.Builder.AI.QnA.Tests.csproj @@ -11,7 +11,7 @@ - + all diff --git a/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj b/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj index 730801bd96..c8960d5fff 100644 --- a/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Ai.LUISV3.tests/Microsoft.Bot.Builder.AI.LuisV3.Tests.csproj @@ -12,7 +12,7 @@ - + all diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj index 6ed49cd68a..358598423f 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests.csproj @@ -41,7 +41,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_HttpRequestMock.test.dialog b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_HttpRequestMock.test.dialog index e02b5f2382..46d91c555f 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_HttpRequestMock.test.dialog +++ b/tests/Microsoft.Bot.Builder.Dialogs.Adaptive.Tests/Tests/TestScriptTests/TestScriptTests_HttpRequestMock.test.dialog @@ -17,7 +17,7 @@ "actions": [ { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -28,7 +28,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -39,7 +39,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -50,7 +50,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -61,7 +61,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -72,7 +72,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "POST", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -83,7 +83,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -94,7 +94,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "GET", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -105,7 +105,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "POST", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -116,7 +116,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "POST", "url": "http://127.0.0.1", "resultProperty": "dialog.result" @@ -127,7 +127,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "POST", "url": "http://127.0.0.2", "resultProperty": "dialog.result" @@ -138,7 +138,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "PATCH", "url": "http://127.0.0.1", "body": "full body or partial body", @@ -150,7 +150,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "PATCH", "body": "full body", "url": "http://127.0.0.1", @@ -162,7 +162,7 @@ }, { "$kind": "Microsoft.HttpRequest", - "responseType": "Json", + "responseType": "json", "method": "POST", "body": "gzip body", "url": "http://127.0.0.1", diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj index 55f86c939f..23dfa211b4 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests/Microsoft.Bot.Builder.Dialogs.Declarative.Tests.csproj @@ -12,7 +12,7 @@ - + all diff --git a/tests/Microsoft.Bot.Builder.Dialogs.Flow.Tests/Microsoft.Bot.Builder.Dialogs.Flows.Tests.csproj b/tests/Microsoft.Bot.Builder.Dialogs.Flow.Tests/Microsoft.Bot.Builder.Dialogs.Flows.Tests.csproj index 28a64b3bd7..a0cdbcbbe4 100644 --- a/tests/Microsoft.Bot.Builder.Dialogs.Flow.Tests/Microsoft.Bot.Builder.Dialogs.Flows.Tests.csproj +++ b/tests/Microsoft.Bot.Builder.Dialogs.Flow.Tests/Microsoft.Bot.Builder.Dialogs.Flows.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj index 47577c7324..f5226e8a5a 100644 --- a/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj +++ b/tests/Microsoft.Bot.Builder.TestBot.Json/Microsoft.Bot.Builder.TestBot.Json.csproj @@ -33,7 +33,7 @@ - + diff --git a/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj b/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj index 4bc8e41d17..e7fbe472a0 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Perf/Microsoft.Bot.Connector.Streaming.Perf.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj b/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj index bdadf2946e..48c612f64b 100644 --- a/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj +++ b/tests/Microsoft.Bot.Connector.Streaming.Tests/Microsoft.Bot.Connector.Streaming.Tests.csproj @@ -27,14 +27,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Microsoft.Bot.Connector.Tests/Authentication/ManagedIdentityAuthenticatorTests.cs b/tests/Microsoft.Bot.Connector.Tests/Authentication/ManagedIdentityAuthenticatorTests.cs index 9c3f03b581..e215b854f4 100644 --- a/tests/Microsoft.Bot.Connector.Tests/Authentication/ManagedIdentityAuthenticatorTests.cs +++ b/tests/Microsoft.Bot.Connector.Tests/Authentication/ManagedIdentityAuthenticatorTests.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Bot.Connector.Authentication; +using Microsoft.Extensions.Logging; using Moq; using Moq.Protected; using Newtonsoft.Json.Linq; @@ -75,29 +76,15 @@ public void CanGetJwtTokenWithForceRefresh(bool forceRefreshInput, int index) public void DefaultRetryOnException() { var maxRetries = 10; - var callsToAcquireToken = 0; - var actualCallsToAcquireToken = 0; + var mockLogger = new Mock(); var mockHttpMessageHandler = new Mock(); mockHttpMessageHandler.Protected() .Setup>("SendAsync", ItExpr.IsAny(), ItExpr.IsAny()) - .ReturnsAsync(() => - { - // ManagedCredentialsClient is apparently auto-retrying failed requests once. - // Resolution unclear. - // For now, count the number of times WE think it's be called. - actualCallsToAcquireToken++; - - if (actualCallsToAcquireToken % 2 != 0) - { - callsToAcquireToken++; - } - - return new HttpResponseMessage(HttpStatusCode.TooManyRequests); - }); + .ReturnsAsync(() => new HttpResponseMessage(HttpStatusCode.TooManyRequests)); var httpClient = new HttpClient(mockHttpMessageHandler.Object); - var sut = new ManagedIdentityAuthenticator(appId(nameof(DefaultRetryOnException)), audience(nameof(DefaultRetryOnException)), httpClient); + var sut = new ManagedIdentityAuthenticator(appId(nameof(DefaultRetryOnException)), audience(nameof(DefaultRetryOnException)), httpClient, mockLogger.Object); try { @@ -109,7 +96,14 @@ public void DefaultRetryOnException() } finally { - Assert.Equal(maxRetries + 1, callsToAcquireToken); + mockLogger.Verify( + x => x.Log( + LogLevel.Error, + It.IsAny(), + It.Is((o, t) => o.ToString().Contains("Exception when trying to acquire token using MSI!")), + It.IsAny(), + (Func)It.IsAny()), + Times.Exactly(maxRetries + 1)); } } diff --git a/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj b/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj index 7bcf63560c..52e31d61a9 100644 --- a/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj +++ b/tests/Microsoft.Bot.Connector.Tests/Microsoft.Bot.Connector.Tests.csproj @@ -13,12 +13,12 @@ - + - - + + all diff --git a/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj b/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj index 48e3608ed8..0a573842c8 100644 --- a/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj +++ b/tests/Microsoft.Bot.Streaming.Tests/Microsoft.Bot.Streaming.Tests.csproj @@ -22,14 +22,14 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/integration/Microsoft.Bot.ApplicationInsights.WebApi.Tests/Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj b/tests/integration/Microsoft.Bot.ApplicationInsights.WebApi.Tests/Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj index fdc04d8ca3..4dc65a102b 100644 --- a/tests/integration/Microsoft.Bot.ApplicationInsights.WebApi.Tests/Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj +++ b/tests/integration/Microsoft.Bot.ApplicationInsights.WebApi.Tests/Microsoft.Bot.ApplicationInsights.WebApi.Tests.csproj @@ -99,16 +99,16 @@ 5.3.0 - 16.3.0 + 17.10.0 - 16.1.1 + 17.10.0 - 4.13.1 + 4.20.70 - 2.4.1 + 2.9.0 2.8.2 diff --git a/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj b/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj index dc7adbe242..a74f227b96 100644 --- a/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj +++ b/tests/integration/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests/Microsoft.Bot.Builder.Integration.AspNet.WebApi.Tests.csproj @@ -107,10 +107,10 @@ 6.12.0 - 4.13.1 + 4.20.70 - 2.4.1 + 2.9.0