From b3ffb46e3220f3751defec3ed6bfa973292e9bfb Mon Sep 17 00:00:00 2001 From: Utkarsh Umesan Pillai <66651184+utpilla@users.noreply.github.com> Date: Mon, 12 Jun 2023 19:20:34 -0700 Subject: [PATCH] Remove property related to CodeCoverage from Common.props (#4577) --- build/Common.props | 1 - build/process-codecoverage.ps1 | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/build/Common.props b/build/Common.props index 33b4bcb98..e6eb755ac 100644 --- a/build/Common.props +++ b/build/Common.props @@ -26,7 +26,6 @@ Please sort alphabetically. Refer to https://docs.microsoft.com/nuget/concepts/package-versioning for semver syntax. --> - [17.4.1] 1.5.0 diff --git a/build/process-codecoverage.ps1 b/build/process-codecoverage.ps1 index 219e5b045..6d14a4e97 100644 --- a/build/process-codecoverage.ps1 +++ b/build/process-codecoverage.ps1 @@ -1,7 +1,11 @@ -[xml]$commonProps = Get-Content -Path $PSScriptRoot\Common.props -$microsoftCodeCoveragePkgVer = [string]$commonProps.Project.PropertyGroup.MicrosoftCodeCoveragePkgVer # This is collected in the format: "[16.10.0]" +$rootDirectory = Split-Path $PSScriptRoot -Parent +[xml]$commonProps = Get-Content -Path $rootDirectory\Directory.Packages.props + +$packages = $commonProps.Project.ItemGroup.PackageVersion +$microsoftCodeCoveragePkgVer = [string]($packages | Where-Object {$_.Include -eq "Microsoft.CodeCoverage"}).Version # This is collected in the format: "[17.4.1]" $microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.Trim(); $microsoftCodeCoveragePkgVer = $microsoftCodeCoveragePkgVer.SubString(1, $microsoftCodeCoveragePkgVer.Length - 2) # Removing square brackets + $files = Get-ChildItem "TestResults" -Filter "*.coverage" -Recurse Write-Host $env:USERPROFILE foreach ($file in $files)