From b953ab126d8516097619abbd63d7e039a066adaf Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Mon, 14 Aug 2017 10:40:11 -0700
Subject: [PATCH] Opencover and Code coverage improvements (#4550)

---
 .../CodeCoverageAutomation/Start-CodeCoverageRun.ps1   | 10 ++++++----
 test/tools/OpenCover/OpenCover.psm1                    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/tools/CodeCoverageAutomation/Start-CodeCoverageRun.ps1 b/test/tools/CodeCoverageAutomation/Start-CodeCoverageRun.ps1
index 65946a588ae..3e89be35272 100644
--- a/test/tools/CodeCoverageAutomation/Start-CodeCoverageRun.ps1
+++ b/test/tools/CodeCoverageAutomation/Start-CodeCoverageRun.ps1
@@ -143,6 +143,12 @@ $jsonFile = "$outputBaseFolder\CC.json"
 
 try
 {
+    ## This is required so we do not keep on merging coverage reports.
+    if(Test-Path $outputLog)
+    {
+        Remove-Item $outputLog -Force -ErrorAction SilentlyContinue
+    }
+
     $oldErrorActionPreference = $ErrorActionPreference
     $ErrorActionPreference = 'Stop'
     Write-LogPassThru -Message "Starting downloads."
@@ -264,9 +270,5 @@ finally
 
     ## Disable the cleanup till we stabilize.
     #Remove-Item -recurse -force -path $outputBaseFolder
-
-    ## This is required so we do not keep on merging coverage reports.
-    Remove-Item $outputLog -Force -ErrorAction SilentlyContinue
-
     $ErrorActionPreference = $oldErrorActionPreference
 }
diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1
index 49b9184d2f6..b9187dc2d6e 100644
--- a/test/tools/OpenCover/OpenCover.psm1
+++ b/test/tools/OpenCover/OpenCover.psm1
@@ -555,7 +555,7 @@ function CreateOpenCoverCmdline($target, $outputLog, $targetArgs)
         "-hideskipped:all",
         "-mergeoutput",
         "-filter:`"+[*]* -[Microsoft.PowerShell.PSReadLine]*`"",
-        "-targetargs:`"-EncodedCommand $base64targetArgs`""
+        "-targetargs:`"-NoProfile -EncodedCommand $base64targetArgs`""
 
     $cmdlineAsString = $cmdline -join " "