PR Comments

Author: prawalagarwal

Tasks/ANT/ant.ps1

@@ -108,14 +108,21 @@ if ($jdkPath)
 }
 
 $buildRootPath = Split-Path $antBuildFile -Parent
-$reportDirectoryName = "ReportDirectory_75C12DBC-FB59-450A-8E4F-772EA8BFCFA6"
+$reportDirectoryName = "ReportDirectory75C12DBC"
 $reportDirectory = Join-Path $buildRootPath $reportDirectoryName
 
-if(Test-Path $reportDirectory)
- {
-    # delete any previous code coverage data 
-    rm -r $reportDirectory -force | Out-Null
- }
+try 
+{
+    if(Test-Path $reportDirectory)
+    {
+        # delete any previous code coverage data 
+        rm -r $reportDirectory -force | Out-Null
+    }
+}
+catch
+{
+    Write-Verbose "Failed to delete report directory"
+}
 
 if($isCoverageEnabled)
 {
@@ -134,20 +141,34 @@ $summaryFile = Join-Path $summaryFile $summaryFileName
 # ensuring unique code coverage report task name by using guid
 $CCReportTask = "CodeCoverage_" +[guid]::NewGuid()
 
-$reportBuildFileName = "ReportBuildFile_9B5907FC-EC56-4662-B8EA-EC23FCB97C43.xml"
+$reportBuildFileName = "ReportBuildFile9B5907FC.xml"
 $reportBuildFile = Join-Path $buildRootPath $reportBuildFileName
 $instrumentedClassesDirectory = Join-Path $buildRootPath "InstrumentedClasses"
 
-if(Test-Path $reportBuildFile)
+try
+{
+    if(Test-Path $reportBuildFile)
+    {
+        # delete any previous code coverage report build file
+        rm -r $reportBuildFile -force | Out-Null
+    }
+}
+catch
 {
-    # delete any previous code coverage report build file
-    rm -r $reportBuildFile -force | Out-Null
+    Write-Verbose "Failed to delete report build file"
 }
 
-if(Test-Path $instrumentedClassesDirectory)
+try
+{
+    if(Test-Path $instrumentedClassesDirectory)
+    {
+        # delete any previous instrumented classes directory
+        rm -r $instrumentedClassesDirectory -force | Out-Null
+    }
+}
+catch
 {
-    # delete any previous instrumented classes directory
-    rm -r $instrumentedClassesDirectory -force | Out-Null
+    Write-Verbose "Failed to delete instrumented classes directory"
 }
 
 if($isCoverageEnabled)

Tasks/Gradle/Gradle.ps1

@@ -105,15 +105,23 @@ if ($jdkPath)
 
 $buildRootPath = $cwd
 $wrapperDirectory = Split-Path $wrapperScript -Parent
-$reportDirectoryName = "ReportDirectory_84B7D86C-F08D-4B65-8D37-742D8B02D27B"
+$reportDirectoryName = "ReportDirectory84B7D86C"
 $reportDirectory = Join-Path $buildRootPath $reportDirectoryName
 
-if(Test-Path $reportDirectory)
+try 
+{    
+    if(Test-Path $reportDirectory)
+    {
+    # delete any code coverage data 
+    rm -r $reportDirectory -force | Out-Null
+    }
+}
+catch
 {
-   # delete any code coverage data 
-   rm -r $reportDirectory -force | Out-Null
+    Write-Verbose "Failed to delete report directory"
 }
 
+
 # check if project is multi module gradle build or not
 $subprojects = Invoke-BatchScript -Path $wrapperScript -Arguments 'properties' -WorkingFolder $buildRootPath | Select-String '^subprojects: (.*)'|ForEach-Object {$_.Matches[0].Groups[1].Value}
 Write-Verbose "subprojects: $subprojects"

Tasks/Maven/maven.ps1

@@ -109,9 +109,9 @@ import-module "Microsoft.TeamFoundation.DistributedTask.Task.TestResults"
 
 
 $buildRootPath = Split-Path $mavenPOMFile -Parent
-$reportDirectoryName = "ReportDirectory_C91CDE2D-CC66-4541-9C27-E3EF6CB3DB16"
+$reportDirectoryName = "ReportDirectoryC91CDE2D"
 $reportDirectoryNameCobertura = "target\site\cobertura"
-$reportPOMFileName = "ReportPOMFile_4E52C1C4-8C32-4580-A54D-41D5E9ED1F74.xml"
+$reportPOMFileName = "ReportPOMFile4E52C1C4.xml"
 $reportPOMFile = Join-Path $buildRootPath $reportPOMFileName
 $reportDirectory = Join-Path $buildRootPath $reportDirectoryName
 $reportDirectoryCobertura = Join-Path $buildRootPath $reportDirectoryNameCobertura
@@ -126,22 +126,36 @@ $CCReportTask = "jacoco:report"
 
 Write-Verbose "SummaryFileCobertura = $summaryFileCobertura"
 
-if(Test-Path $reportDirectory)
+try 
 {
-    # delete any previous code coverage data 
-    rm -r $reportDirectory -force | Out-Null
-}
+	if(Test-Path $reportDirectory)
+	{
+		# delete any previous code coverage data 
+		rm -r $reportDirectory -force | Out-Null
+	}
 
-if(Test-Path $reportDirectoryCobertura)
+	if(Test-Path $reportDirectoryCobertura)
+	{
+		# delete any previous code coverage data from Cobertura
+		rm -r $reportDirectoryCobertura -force | Out-Null
+	}
+}
+catch
 {
-    # delete any previous code coverage data from Cobertura
-    rm -r $reportDirectoryCobertura -force | Out-Null
+	Write-Verbose "Failed to delete report directory"
 }
 
-if(Test-Path $reportPOMFile)
+try 
+{
+	if(Test-Path $reportPOMFile)
+	{
+		# delete any previous code coverage data 
+		rm $reportPOMFile -force | Out-Null
+	}
+}
+catch
 {
-    # delete any previous code coverage data 
-    rm $reportPOMFile -force | Out-Null
+	Write-Verbose "Failed to delete report POM file"
 }
 
 if($isCoverageEnabled)