Merge bb4fd2e into ee4f5f0

microsoft · Jun 23, 2021 · 7bfaf20 · 7bfaf20
2 parents ee4f5f0 + bb4fd2e
commit 7bfaf20
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/CodeCoverage.runsettings b/CodeCoverage.runsettings
@@ -11,31 +11,40 @@
           <CodeCoverage>
             <ModulePaths>
               <Include>
-                <ModulePath>.*\Microsoft.Bot.Builder.dll$</ModulePath>               
+                <ModulePath>.*\AdaptiveExpressions.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Facebook.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Slack.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Twilio.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Teams.dll$</ModulePath>               
+                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Webex.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.AI.Luis.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.AI.Orchestrator.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.AI.QnA.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.ApplicationInsights.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Azure.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Configuration.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Connector.dll$</ModulePath>                
-                <ModulePath>.*\Microsoft.Bot.Builder.Connector.Teams.dll$</ModulePath>                
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Azure.dll$</ModulePath>-->
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Azure.Blobs.dll$</ModulePath>-->
+                <ModulePath>.*\Microsoft.Bot.Builder.Azure.Queues.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Adaptive.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Adaptive.Runtime.dll$</ModulePath>
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Adaptive.Testing.dll$</ModulePath>-->
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Debugging.dll$</ModulePath>-->
+                <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Declarative.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Integration.ApplicationInsights.Core.dll$</ModulePath>
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Integration.ApplicationInsights.WebApi.dll$</ModulePath>-->
                 <ModulePath>.*\Microsoft.Bot.Builder.Integration.AspNet.Core.dll$</ModulePath>
+                <!--<ModulePath>.*\Microsoft.Bot.Builder.Integration.AspNet.WebApi.dll$</ModulePath>-->
+                <ModulePath>.*\Microsoft.Bot.Builder.LanguageGeneration.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.TemplateManager.dll$</ModulePath>
                 <ModulePath>.*\Microsoft.Bot.Builder.Testing.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Webex.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Twilio.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Slack.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Adapters.Facebook.dll$</ModulePath>
-                <ModulePath>.*\AdaptiveExpressions.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Adaptive.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.Dialogs.Declarative.dll$</ModulePath>
-                <ModulePath>.*\Microsoft.Bot.Builder.LanguageGeneration.dll$</ModulePath>                
-                 <ModulePath>.*\Microsoft.Bot.Builder.Schema.dll$</ModulePath> 
+                <!--<ModulePath>.*\Microsoft.Bot.Configuration.dll$</ModulePath>-->
+                <ModulePath>.*\Microsoft.Bot.Connector.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Schema.dll$</ModulePath>
+                <ModulePath>.*\Microsoft.Bot.Streaming.dll$</ModulePath>
               </Include>
+              <Exclude>
+                <ModulePath>.*\*.tests.dll</ModulePath>
+              </Exclude>
             </ModulePaths>
             <Sources>
               <Exclude>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -18,8 +18,9 @@
 
   <PropertyGroup>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)BotBuilder-DotNet.ruleset</CodeAnalysisRuleSet>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)\CodeCoverage.runsettings</RunSettingsFilePath>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
   </ItemGroup>