From e57707f911f238d0e715405c76e1fdcd45febb25 Mon Sep 17 00:00:00 2001
From: Paymaun <Paymaunh@microsoft.com>
Date: Fri, 30 Apr 2021 10:38:36 -0700
Subject: [PATCH] Explicit branch includes. (#338)

---
 .azure-devops/merge.yml                             | 12 ++++++++----
 .azure-devops/templates/calculate-code-coverage.yml |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.azure-devops/merge.yml b/.azure-devops/merge.yml
index 762950505..6a620155e 100644
--- a/.azure-devops/merge.yml
+++ b/.azure-devops/merge.yml
@@ -1,10 +1,14 @@
 trigger:
-- dev
-- master
+  branches:
+    include:
+      - dev
+      - master
 
 pr:
-- dev
-- master
+  branches:
+    include:
+      - dev
+      - master
 
 variables:
   iot_ext_package: azure-iot
diff --git a/.azure-devops/templates/calculate-code-coverage.yml b/.azure-devops/templates/calculate-code-coverage.yml
index eb14c272a..76000c8fe 100644
--- a/.azure-devops/templates/calculate-code-coverage.yml
+++ b/.azure-devops/templates/calculate-code-coverage.yml
@@ -24,7 +24,7 @@ steps:
       for i in ./coverage/.coverage.*; do
         coverage combine -a $i
       done
-      coverage xml --rcfile="$(System.DefaultWorkingDirectory)/.coveragerc"
+      coverage xml -i --rcfile="$(System.DefaultWorkingDirectory)/.coveragerc"
     workingDirectory: '$(System.ArtifactsDirectory)/aziotext_kpi/'
     displayName: 'Merging code coverage data'