From 5105c8875e2a7f140d2c00cb4c346188e2eaa940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 28 Jan 2022 13:04:04 +0100 Subject: [PATCH 1/2] Reformat projects and script files --- TestPlatform.sln | 1 - azure-pipelines.yml | 6 +- playground/MSTest1/MSTest1.csproj | 2 +- .../TestPlatform.Playground.csproj | 2 +- scripts/PortableToFullPdb.ps1 | 50 ++-- scripts/build.ps1 | 136 +++++------ scripts/build.sh | 24 +- scripts/build/TestPlatform.Dependencies.props | 14 +- scripts/build/TestPlatform.targets | 2 +- scripts/perf/perf.ps1 | 22 +- scripts/test.ps1 | 12 +- scripts/test.sh | 2 +- scripts/verify-nupkgs.ps1 | 2 +- scripts/verify-sign.ps1 | 24 +- scripts/vsts-prebuild.ps1 | 16 +- scripts/write-release-notes.ps1 | 28 +-- src/AttachVS/AttachVS.csproj | 6 +- .../DumpMinitool.x86/DumpMinitool.x86.csproj | 2 +- .../DumpMinitool/DumpMinitool.csproj | 2 +- ...atform.Extensions.EventLogCollector.csproj | 4 +- ...osoft.TestPlatform.AdapterUtilities.csproj | 2 +- .../Microsoft.TestPlatform.Build.csproj | 3 +- .../Microsoft.TestPlatform.Client.csproj | 2 +- .../Microsoft.TestPlatform.Common.csproj | 2 +- ...TestPlatform.CommunicationUtilities.csproj | 2 +- ...icrosoft.TestPlatform.CoreUtilities.csproj | 24 +- ...rosoft.TestPlatform.CrossPlatEngine.csproj | 2 +- ...tform.Extensions.BlameDataCollector.csproj | 2 +- ....TestPlatform.Extensions.HtmlLogger.csproj | 100 ++++---- ...t.TestPlatform.Extensions.TrxLogger.csproj | 4 +- .../Microsoft.TestPlatform.ObjectModel.csproj | 228 +++++++++--------- ...t.TestPlatform.PlatformAbstractions.csproj | 116 ++++----- ...osoft.TestPlatform.TestHostProvider.csproj | 2 +- .../Microsoft.TestPlatform.Utilities.csproj | 2 +- ...form.VsTestConsole.TranslationLayer.csproj | 2 +- src/datacollector/datacollector.csproj | 2 +- src/package/package/package.csproj | 2 +- src/testhost.x86/testhost.x86.csproj | 2 +- src/testhost/testhost.csproj | 2 +- src/vstest.console/vstest.console.csproj | 2 +- ...ensions.EventLogCollector.UnitTests.csproj | 4 +- ...rosoft.TestPlatform.AcceptanceTests.csproj | 2 +- ...Platform.AdapterUtilities.UnitTests.csproj | 6 +- ...rosoft.TestPlatform.Build.UnitTests.csproj | 2 +- ...osoft.TestPlatform.Client.UnitTests.csproj | 2 +- ...t.TestPlatform.Common.PlatformTests.csproj | 2 +- ...osoft.TestPlatform.Common.UnitTests.csproj | 2 +- ...ommunicationUtilities.PlatformTests.csproj | 2 +- ...rm.CommunicationUtilities.UnitTests.csproj | 2 +- ...estPlatform.CoreUtilities.UnitTests.csproj | 2 +- ...tPlatform.CrossPlatEngine.UnitTests.csproj | 2 +- ...nsions.BlameDataCollector.UnitTests.csproj | 4 +- ...orm.Extensions.HtmlLogger.UnitTests.csproj | 4 +- ...form.Extensions.TrxLogger.UnitTests.csproj | 4 +- ...tPlatform.ObjectModel.PlatformTests.csproj | 4 +- ....TestPlatform.ObjectModel.UnitTests.csproj | 2 +- ...osoft.TestPlatform.PerformanceTests.csproj | 2 +- .../Microsoft.TestPlatform.SmokeTests.csproj | 2 +- ...Platform.TestHostProvider.UnitTests.csproj | 2 +- ...icrosoft.TestPlatform.TestUtilities.csproj | 2 +- ...ft.TestPlatform.Utilities.UnitTests.csproj | 46 ++-- .../SettingsMigrator.UnitTests.csproj | 8 +- .../AppDomainGetAssembliesTestProject.csproj | 2 +- .../ArchitectureSwitch.csproj | 2 +- .../AttachmentProcessorDataCollector.csproj | 2 +- .../CUITTestProject/CUITTestProject.csproj | 2 +- .../CodeCoverageTest/CodeCoverageTest.csproj | 4 +- .../ConsoleManagedApp.csproj | 2 +- .../ConsoleRunners/ConsoleRunners.csproj | 2 +- .../CrashingOnDebugAssertTestProject.csproj | Bin 2584 -> 1258 bytes .../DisableAppdomainTest1.csproj | 2 +- .../DiscoveryTestProject.csproj | 4 +- .../EnvironmentVariablesTestProject.csproj | 2 +- .../LegacySettingsUnitTestProject.csproj | 2 +- .../MstestV1UnitTestProject.csproj | 2 +- .../MultitargetedNetFrameworkProject.csproj | Bin 2034 -> 991 bytes .../NUTestProject/NUTestProject.csproj | 2 +- .../NewtonSoftDependency.csproj | 2 +- test/TestAssets/NuGet.config | 2 +- .../OutOfProcDataCollector.csproj | 2 +- .../ParametrizedTestProject.csproj | Bin 2508 -> 1219 bytes .../MSTestAdapterPerfTestProject.csproj | 2 +- .../NUnitAdapterPerfTestProject.csproj | 2 +- .../XUnitAdapterPerfTestProject.csproj | 4 +- .../PerfTestProject/PerfTestProject.csproj | Bin 2438 -> 1192 bytes .../SampleProjectWithOldTestHost.csproj | 2 +- .../SimpleClassLibrary.csproj | 2 +- .../SimpleTestProject.csproj | Bin 2496 -> 1213 bytes .../SimpleTestProject2.csproj | Bin 3046 -> 1484 bytes .../SimpleTestProject3.csproj | 2 +- .../SimpleTestProjectARM.csproj | Bin 2252 -> 1103 bytes .../SimpleTestProjectx86.csproj | Bin 2132 -> 1043 bytes .../XUTestProject/XUTestProject.csproj | 2 +- .../TestAssets/child-crash/child-crash.csproj | 4 +- test/TestAssets/child-hang/child-hang.csproj | 6 +- test/TestAssets/crash/crash.csproj | 4 +- .../hanging-child/hanging-child.csproj | 4 +- .../problematic-child.csproj | 2 +- test/TestAssets/timeout/timeout.csproj | 4 +- .../TranslationLayer.UnitTests.csproj | 2 +- .../coverlet.collector.csproj | 2 +- .../datacollector.PlatformTests.csproj | 2 +- .../datacollector.UnitTests.csproj | 2 +- .../testhost.UnitTests.csproj | 2 +- .../vstest.console.PlatformTests.csproj | 2 +- .../vstest.console.UnitTests.csproj | 2 +- 106 files changed, 528 insertions(+), 530 deletions(-) diff --git a/TestPlatform.sln b/TestPlatform.sln index 61c4c661c9..eb1c6ae9af 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -84,7 +84,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49 scripts\build.ps1 = scripts\build.ps1 scripts\build.sh = scripts\build.sh scripts\PortableToFullPdb.ps1 = scripts\PortableToFullPdb.ps1 - scripts\stylecop.json = scripts\stylecop.json scripts\stylecop.ruleset = scripts\stylecop.ruleset scripts\stylecop.test.ruleset = scripts\stylecop.test.ruleset scripts\test.ps1 = scripts\test.ps1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 20c1387af2..99978e76a5 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,7 +69,7 @@ jobs: displayName: 'Run script build.cmd' inputs: filename: build.cmd - # build should not be needed in the end, we are copying the build task from the build folder, but we should get + # build should not be needed in the end, we are copying the build task from the build folder, but we should get # it either from artifacts, if present, or from extracted package file # Adding it at the moment to avoid this error: #[error]Copy-Item : Cannot find path 'D:\a\1\s\src\Microsoft.TestPlatform.Build\bin\Release\netstandard2.0' because it does not exist. arguments: '-verbose -configuration $(buildConfiguration) -steps "InstallDotnet, Restore, Build, PrepareAcceptanceTests"' @@ -142,7 +142,7 @@ jobs: buildConfiguration: 'Release' VSTestRTMBuild: 'false' steps: - - script: chmod +x ./scripts/vsts-prebuild.sh + - script: chmod +x ./scripts/vsts-prebuild.sh displayName: 'Preparing for set version' - script: ./scripts/vsts-prebuild.sh -build "preview-$(Build.BuildNumber)" -rtm "$(VSTestRTMBuild)" -branch "$(Build.SourceBranch)" @@ -152,7 +152,7 @@ jobs: displayName: 'Build' - script: ./test.sh -c $(buildConfiguration) -p Unit - displayName: 'Unit tests' + displayName: 'Unit tests' - task: DownloadPipelineArtifact@2 inputs: diff --git a/playground/MSTest1/MSTest1.csproj b/playground/MSTest1/MSTest1.csproj index 633f35bf75..e952c0fa11 100644 --- a/playground/MSTest1/MSTest1.csproj +++ b/playground/MSTest1/MSTest1.csproj @@ -4,7 +4,7 @@ true - + $(TargetFrameworks);net472 diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj index 4fbfd04487..da802a6e46 100644 --- a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj +++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj @@ -1,4 +1,4 @@ - + ..\..\ true diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1 index f81a89cd83..0cb245465d 100644 --- a/scripts/PortableToFullPdb.ps1 +++ b/scripts/PortableToFullPdb.ps1 @@ -32,45 +32,45 @@ function Locate-PdbConverterTool } function ConvertPortablePdbToWindowsPdb -{ +{ $allPdbs = Get-ChildItem -path $TP_OUT_DIR\$Configuration *.pdb -Recurse | % {$_.FullName} $portablePdbs = New-Object System.Collections.Generic.List[System.Object] - + foreach($pdb in $allPdbs) { - # First four bytes should be 'BSJB' for portable pdb - $bytes = [char[]](Get-Content $pdb -Encoding byte -TotalCount 4) -join '' - - if( $bytes -eq "BSJB") - { - $portablePdbs.Add($pdb) - } + # First four bytes should be 'BSJB' for portable pdb + $bytes = [char[]](Get-Content $pdb -Encoding byte -TotalCount 4) -join '' + + if( $bytes -eq "BSJB") + { + $portablePdbs.Add($pdb) + } } - + $pdbConverter = Locate-PdbConverterTool - + foreach($portablePdb in $portablePdbs) { - # First check if corresponding dll exists + # First check if corresponding dll exists $dllOrExePath = $portablePdb -replace ".pdb",".dll" - - if(!(Test-Path -path $dllOrExePath)) - { - # If no corresponding dll found, check if exe exists - $dllOrExePath = $portablePdb -replace ".pdb",".exe" - - if(!(Test-Path -path $dllOrExePath)) - { - throw "Unable to locate dll/exe corresponding to $portablePdb" - } - } - + + if(!(Test-Path -path $dllOrExePath)) + { + # If no corresponding dll found, check if exe exists + $dllOrExePath = $portablePdb -replace ".pdb",".exe" + + if(!(Test-Path -path $dllOrExePath)) + { + throw "Unable to locate dll/exe corresponding to $portablePdb" + } + } + $fullpdb = $portablePdb -replace ".pdb",".pdbfull" Write-Verbose "$pdbConverter $dll /pdb $portablePdb /out $fullpdb" & $pdbConverter $dllOrExePath /pdb $portablePdb /out $fullpdb - Remove-Item -Path $portablePdb + Remove-Item -Path $portablePdb } } diff --git a/scripts/build.ps1 b/scripts/build.ps1 index abf25891d0..a8e3a46473 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -48,7 +48,7 @@ Param( [System.String[]] $ProjectNamePatterns = @(), [Alias("f")] - [Switch] $Force, + [Switch] $Force, [Alias("s")] [String[]] $Steps = @("InstallDotnet", "Restore", "UpdateLocalization", "Build", "Publish", "PrepareAcceptanceTests") @@ -58,15 +58,15 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\common.lib.ps1 -# Set Version from scripts/build/TestPlatform.Settings.targets, when we are running locally and not providing the version as the parameter +# Set Version from scripts/build/TestPlatform.Settings.targets, when we are running locally and not providing the version as the parameter # or when the build is done directly in VS if([string]::IsNullOrWhiteSpace($Version)) { - $Version = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Settings.targets)).Project.PropertyGroup[0].TPVersionPrefix | + $Version = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Settings.targets)).Project.PropertyGroup[0].TPVersionPrefix | ForEach-Object { $_.Trim() } | - Select-Object -First 1 + Select-Object -First 1 - Write-Verbose "Version was not provided using version '$Version' from TestPlatform.Settings.targets" + Write-Verbose "Version was not provided using version '$Version' from TestPlatform.Settings.targets" } @@ -104,8 +104,8 @@ $language = @("cs", "de", "es", "fr", "it", "ja", "ko", "pl", "pt-BR", "ru", "tr . "$($CurrentScriptDir.FullName)\verify-nupkgs.ps1" -# Update the version in the dependencies props to be the TPB_version version, this is not ideal but because changing how this is resolved would -# mean that we need to change the whole build process this is a solution with the least amount of impact, that does not require us to keep track of +# Update the version in the dependencies props to be the TPB_version version, this is not ideal but because changing how this is resolved would +# mean that we need to change the whole build process this is a solution with the least amount of impact, that does not require us to keep track of # the version in multiple places $dependenciesPath = "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props" $dependencies = Get-Content -Raw -Encoding UTF8 $dependenciesPath @@ -116,7 +116,7 @@ $updatedDependencies | Set-Content -Encoding $encoding $dependenciesPath -NoNewl $attachVsPath = "$env:TP_ROOT_DIR\src\AttachVS\bin\Debug\net472" -if ($env:PATH -notlike "*$attachVsPath") { +if ($env:PATH -notlike "*$attachVsPath") { Write-Log "Adding AttachVS to PATH" $env:PATH = "$attachVsPath;$env:PATH" } @@ -159,9 +159,9 @@ function Invoke-TestAssetsBuild Write-Log "Invoke-TestAssetsBuild: Complete. {$(Get-ElapsedTime($timer))}" } -function Copy-PackageIntoStaticDirectory { - # packages are published into folder based on configuration, but - # nuget does not understand that, and does not support wildcards in paths +function Copy-PackageIntoStaticDirectory { + # packages are published into folder based on configuration, but + # nuget does not understand that, and does not support wildcards in paths # in order to be able to use the produced packages for acceptance tests we # need to put them in folder that is not changing it's name based on config $tpPackagesPath = "$env:TP_OUT_DIR\$TPB_Configuration\packages\" @@ -170,13 +170,13 @@ function Copy-PackageIntoStaticDirectory { Copy-Item $tpPackagesPath $tpPackagesDestination -Force -Filter *.nupkg -Verbose -Recurse } -function Publish-PatchedDotnet { +function Publish-PatchedDotnet { Write-Log "Publish-PatchedDotnet: Copy local dotnet installation to testArtifacts" $dotnetPath = "$env:TP_TOOLS_DIR\dotnet\" - $dotnetTestArtifactsPath = "$env:TP_TESTARTIFACTS\dotnet\" - - if (Test-Path $dotnetTestArtifactsPath) { + $dotnetTestArtifactsPath = "$env:TP_TESTARTIFACTS\dotnet\" + + if (Test-Path $dotnetTestArtifactsPath) { Remove-Item -Force -Recurse $dotnetTestArtifactsPath } @@ -212,13 +212,13 @@ function Publish-Package $testhostCore20PackageX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X86_Runtime") $testhostCore20PackageTempX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X64_Runtime") $testhostCore20PackageTempX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X86_Runtime") - + $testhostCore10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10") $testhostCore10PackageX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X64_Runtime") $testhostCore10PackageX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X86_Runtime") $testhostCore10PackageTempX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X64_Runtime") $testhostCore10PackageTempX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\publishTemp\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10\$TPB_X86_Runtime") - + $testhostUapPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkUap100") $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj" $settingsMigratorProject = Join-Path $env:TP_ROOT_DIR "src\SettingsMigrator\SettingsMigrator.csproj" @@ -228,13 +228,13 @@ function Publish-Package Publish-PackageInternal $packageProject $TPB_TargetFramework451 $fullCLRPackage451Dir Publish-PackageInternal $packageProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir - + ################################################################################ # Publish vstest.console and datacollector exclusively because *.config/*.deps.json file is not getting publish when we are publishing aforementioned project through dependency. Write-Log "Package: Publish src\vstest.console\vstest.console.csproj" Publish-PackageInternal $vstestConsoleProject $TPB_TargetFramework451 $fullCLRPackage451Dir Publish-PackageInternal $vstestConsoleProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir - + Write-Log "Package: Publish src\SettingsMigrator\SettingsMigrator.csproj" Publish-PackageInternal $settingsMigratorProject $TPB_TargetFramework451 $fullCLRPackage451Dir @@ -251,35 +251,35 @@ function Publish-Package Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore20 $testhostUapPackageDir Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore20 $TPB_X64_Runtime false $testhostCore20PackageTempX64Dir Publish-PackageWithRuntimeInternal $testHostProject $TPB_TargetFrameworkCore10 $TPB_X64_Runtime true $testhostCore10PackageTempX64Dir - + Write-Log "Package: Publish testhost.x86\testhost.x86.csproj" Publish-PackageInternal $testHostx86Project $TPB_TargetFramework451 $testhostFullPackageDir Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore20 $TPB_X86_Runtime false $testhostCore20PackageTempX86Dir Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore10 $TPB_X86_Runtime true $testhostCore10PackageTempX86Dir - + # Copy the .NET multitarget testhost exes to destination folder (except for net451 which is the default) foreach ($tfm in "net452;net46;net461;net462;net47;net471;net472;net48" -split ";") { - Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe" $testhostFullPackageDir\testhost.$tfm.exe -Force - Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.pdb" $testhostFullPackageDir\testhost.$tfm.pdb -Force - Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe.config" $testhostFullPackageDir\testhost.$tfm.exe.config -Force + Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe" $testhostFullPackageDir\testhost.$tfm.exe -Force + Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.pdb" $testhostFullPackageDir\testhost.$tfm.pdb -Force + Copy-Item "$(Split-Path $testHostProject)\bin\$TPB_Configuration\$tfm\$TPB_X64_Runtime\testhost.$tfm.exe.config" $testhostFullPackageDir\testhost.$tfm.exe.config -Force } # Copy the .NET multitarget testhost.x86 exes to destination folder (except for net451 which is the default) foreach ($tfm in "net452;net46;net461;net462;net47;net471;net472;net48" -split ";") { - Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe" $testhostFullPackageDir\testhost.$tfm.x86.exe -Force - Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.pdb" $testhostFullPackageDir\testhost.$tfm.x86.pdb -Force - Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe.config" $testhostFullPackageDir\testhost.$tfm.x86.exe.config -Force + Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe" $testhostFullPackageDir\testhost.$tfm.x86.exe -Force + Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.pdb" $testhostFullPackageDir\testhost.$tfm.x86.pdb -Force + Copy-Item "$(Split-Path $testHostx86Project)\bin\$TPB_Configuration\$tfm\$TPB_X86_Runtime\testhost.$tfm.x86.exe.config" $testhostFullPackageDir\testhost.$tfm.x86.exe.config -Force } # Copy the .NET core x86 and x64 testhost exes from tempPublish to required folder New-Item -ItemType directory -Path $testhostCore20PackageX64Dir -Force | Out-Null Copy-Item $testhostCore20PackageTempX64Dir\testhost* $testhostCore20PackageX64Dir -Force -Recurse Copy-Item $testhostCore20PackageTempX64Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore20PackageX64Dir -Force - + New-Item -ItemType directory -Path $testhostCore20PackageX86Dir -Force | Out-Null Copy-Item $testhostCore20PackageTempX86Dir\testhost.x86* $testhostCore20PackageX86Dir -Force -Recurse Copy-Item $testhostCore20PackageTempX86Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore20PackageX86Dir -Force - + New-Item -ItemType directory -Path $testhostCore10PackageX64Dir -Force | Out-Null Copy-Item $testhostCore10PackageTempX64Dir\testhost* $testhostCore10PackageX64Dir -Force -Recurse Copy-Item $testhostCore20PackageTempX64Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore10PackageX64Dir -Force @@ -287,7 +287,7 @@ function Publish-Package New-Item -ItemType directory -Path $testhostCore10PackageX86Dir -Force | Out-Null Copy-Item $testhostCore10PackageTempX86Dir\testhost.x86* $testhostCore10PackageX86Dir -Force -Recurse Copy-Item $testhostCore10PackageTempX86Dir\Microsoft.TestPlatform.PlatformAbstractions.dll $testhostCore10PackageX86Dir -Force - + # Copy over the Full CLR built testhost package assemblies to the Core CLR and Full CLR package folder. $coreCLRFull_Dir = "TestHost" $fullDestDir = Join-Path $coreCLR20PackageDir $coreCLRFull_Dir @@ -296,7 +296,7 @@ function Publish-Package # Copy over the Full CLR built datacollector package assemblies to the Core CLR package folder along with testhost Publish-PackageInternal $dataCollectorProject $TPB_TargetFramework472 $fullDestDir - + New-Item -ItemType directory -Path $fullCLRPackage451Dir -Force | Out-Null Copy-Item $testhostFullPackageDir\* $fullCLRPackage451Dir -Force -Recurse @@ -317,7 +317,7 @@ function Publish-Package $TPB_TargetFrameworkNS20 = $netstandard20PackageDir # netstandard2_0 $TPB_TargetFrameworkUap100 = $uap100PackageDir # uap10.0 } - + Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration") ` -files @{ $TPB_TargetFrameworkUap100 = $testhostUapPackageDir # uap10.0 - testhost @@ -400,14 +400,14 @@ function Publish-Package # If there are some dependencies for the logger assemblies, those need to be moved too. # Ideally we should just be publishing the loggers to the Extensions folder. $loggers = @( - "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb", + "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb", "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll", "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb" ) foreach($file in $loggers) { Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force" Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force - + Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force" Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force } @@ -473,7 +473,7 @@ function Publish-Package Copy-Loc-Files $eventLogDataCollectorNetFull $coreCLRExtensionsDir "Microsoft.TestPlatform.Extensions.EventLogCollector.resources.dll" } - # Copy Microsoft.VisualStudio.Coverage.IO dlls + # Copy Microsoft.VisualStudio.Coverage.IO dlls $codeCoverageExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.MicrosoftInternalCodeCoverageVersion $codeCoverageIOPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.io\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkStandard" Copy-Item $codeCoverageIOPackagesDir\Microsoft.VisualStudio.Coverage.IO.dll $coreCLR20PackageDir -Force @@ -486,7 +486,7 @@ function Publish-Package foreach($file in $runtimeproviders) { Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force" Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force - + Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force" Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force } @@ -507,7 +507,7 @@ function Publish-Package Copy-Item $newtonsoft $coreCLR20PackageDir -Force # Copy .NET Standard CPP Test adapter - New-Item "$fullCLRPackage451Dir\TestHost" -ItemType Directory -Force | Out-Null + New-Item "$fullCLRPackage451Dir\TestHost" -ItemType Directory -Force | Out-Null $fullCLRTestHostDir = "$fullCLRPackage451Dir\TestHost" $testPlatformRemoteExternalsVersion = ([xml](Get-Content "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props")).Project.PropertyGroup.TestPlatformRemoteExternalsVersion @@ -521,8 +521,8 @@ function Publish-Package Copy-Item $testhostCore20PackageDir\testhost.dll $coreCLR20PackageDir -Force Copy-Item $testhostCore20PackageDir\testhost.pdb $coreCLR20PackageDir -Force - Get-Item "$testhostCore20PackageDir\*" | - Where-Object { $_.Name -notin ("x64", "x86", "win7-x64", "win7-x86", "testhost.deps.json", "testhost.runtimeconfig.json")} | + Get-Item "$testhostCore20PackageDir\*" | + Where-Object { $_.Name -notin ("x64", "x86", "win7-x64", "win7-x86", "testhost.deps.json", "testhost.runtimeconfig.json")} | Copy-Item -Recurse -Destination $fullCLRTestHostDir -Force Copy-Item $standaloneTesthost $fullCLRTestHostDir -Force @@ -551,7 +551,7 @@ function Publish-Package # Copy Microsoft.VisualStudio.Telemetry APIs $testPlatformDirectory = Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Intellitrace\Common7\IDE\Extensions\TestPlatform" - + if (-not (Test-Path $testPlatformDirectory)) { New-Item $testPlatformDirectory -Type Directory -Force | Out-Null } @@ -578,7 +578,7 @@ function Publish-Tests # Adding only Perf project for now $fullCLRTestDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework451" $fullCLRPerfTestAssetDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework451\TestAssets\PerfAssets" - + $mstest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "MSTestAdapterPerfTestProject" $mstest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\MSTestAdapterPerfTestProject" Publish-PackageInternal $mstest10kPerfProject $TPB_TargetFramework451 $mstest10kPerfProjectDir @@ -719,12 +719,12 @@ function Create-VsixPackage New-Item $legacyTestImpactComComponentsDir -Type Directory -Force | Out-Null } Copy-Item -Recurse $comComponentsDirectoryTIA\* $legacyTestImpactComComponentsDir -Force - + Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt") $packageDir -Force Write-Verbose "Locating MSBuild install path..." $msbuildPath = Locate-MSBuildPath - + # Create vsix only when msbuild is installed. if(![string]::IsNullOrEmpty($msbuildPath)) { @@ -739,7 +739,7 @@ function Create-VsixPackage Invoke-Exe $msbuildPath -Arguments """$vsixProjectDir\TestPlatform.csproj"" -p:Configuration=$Configuration" } else - { + { throw ".. Create-VsixPackage: Cannot generate vsix as msbuild.exe not found at '$msbuildPath'." } @@ -753,7 +753,7 @@ function Create-NugetPackages Write-Log "Create-NugetPackages: Started." $stagingDir = Join-Path $env:TP_OUT_DIR $TPB_Configuration $packageOutputDir = $TPB_PackageOutDir - + Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "Icon.png") $stagingDir -Force @@ -801,13 +801,13 @@ function Create-NugetPackages $testhostUapPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkUap100") Copy-Item $tpNuspecDir\uap\"Microsoft.TestPlatform.TestHost.Uap.props" $testhostUapPackageDir\Microsoft.TestPlatform.TestHost.props -Force Copy-Item $tpNuspecDir\uap\"Microsoft.TestPlatform.TestHost.Uap.targets" $testhostUapPackageDir\Microsoft.TestPlatform.TestHost.targets -Force - + $testhostCore20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20") Copy-Item $tpNuspecDir\"Microsoft.TestPlatform.TestHost.NetCore.props" $testhostCore20PackageDir\Microsoft.TestPlatform.TestHost.props -Force - + $testhostCore10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore10") Copy-Item $tpNuspecDir\"Microsoft.TestPlatform.TestHost.NetCore.props" $testhostCore10PackageDir\Microsoft.TestPlatform.TestHost.props -Force - + # Call nuget pack on these components. $nugetExe = Join-Path $env:TP_PACKAGES_DIR -ChildPath "Nuget.CommandLine" | Join-Path -ChildPath $env:NUGET_EXE_Version | Join-Path -ChildPath "tools\NuGet.exe" @@ -832,7 +832,7 @@ function Create-NugetPackages # and does not have netstandard2.0 versions, so I don't copy them by mistake $uap10Nuget = $uap100PackageDir } - else { + else { $uap10Nuget = $testhostUapPackageDir } @@ -957,16 +957,16 @@ function Get-CoreCLR20TestHostPackageDirectory return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkCore20\TestHost") } -function Locate-MSBuildPath +function Locate-MSBuildPath { $vsInstallPath = Locate-VsInstallPath $msbuildPath = Get-ChildItem (Join-Path -path $vsInstallPath -childPath "MSBuild\*\Bin\MSBuild.exe") Write-Verbose "found msbuild : '$($msbuildPath -join "','")'" $msBuild = $msBuildPath | Select-Object -First 1 - + Write-Verbose "msbuildPath is : '$($msbuildPath -join "','")'" - if ($null -eq $msBuild -or 0 -eq $msBuild.Count) { + if ($null -eq $msBuild -or 0 -eq $msBuild.Count) { throw "MSBuild not found." } @@ -986,7 +986,7 @@ function Locate-VsInstallPath Write-Verbose "VSInstallation requirements : $requiredPackageIds" Try - { + { if ($TPB_CIBuild) { $vsInstallPath = Invoke-Exe $vswhere -CaptureOutput -Arguments "-version (15.0 -products * -requires $requiredPackageIds -property installationPath" } @@ -1003,7 +1003,7 @@ function Locate-VsInstallPath if ($null -eq $vsInstallPath -or 0 -eq @($vsInstallPath).Count) { throw "Failed to find VS installation with requirements: $requiredPackageIds" } - else { + else { Write-Verbose "Found VS installation with requirements '$($requiredPackageIds -join "','")' : '$($vsInstallPath -join "','")'." } @@ -1024,7 +1024,7 @@ function Update-VsixVersion($vsixProjectDir) $vsixVersion = "$vsixVersion.$($vsixVersionSuffix[0])$($vsixVersionSuffix[1])" } - $manifestContentWithVersion = Get-Content "$vsixProjectDir\source.extension.vsixmanifest" -raw | ForEach-Object {$_.ToString().Replace("`$version`$", "$vsixVersion") } + $manifestContentWithVersion = Get-Content "$vsixProjectDir\source.extension.vsixmanifest" -raw | ForEach-Object {$_.ToString().Replace("`$version`$", "$vsixVersion") } Set-Content -path "$vsixProjectDir\source.extension.vsixmanifest" -value $manifestContentWithVersion Write-Log "Update-VsixVersion: Completed." @@ -1047,14 +1047,14 @@ function Build-SpecificProjects { Write-Log "Build-SpecificProjects: Started for pattern: $ProjectNamePatterns" # FrameworksAndOutDirs format ("", ""). - $FrameworksAndOutDirs = ( - ("net451", "net451\win7-x64"), - ("netstandard1.0", "netstandard1.0"), - ("netstandard1.3", "netstandard1.3"), - ("netstandard2.0", "netcoreapp2.1"), + $FrameworksAndOutDirs = ( + ("net451", "net451\win7-x64"), + ("netstandard1.0", "netstandard1.0"), + ("netstandard1.3", "netstandard1.3"), + ("netstandard2.0", "netcoreapp2.1"), ("netcoreapp2.1", "netcoreapp2.1") ) - + $dotnetPath = Get-DotNetPath # Get projects to build. @@ -1122,7 +1122,7 @@ if ($Force -or $Steps -contains "InstallDotnet") { if ($Force -or $Steps -contains "Restore") { Clear-Package - Restore-Package + Restore-Package } if ($Force -or $Steps -contains "UpdateLocalization") { @@ -1141,7 +1141,7 @@ if ($Force -or $Steps -contains "Publish") { if ($Force -or $Steps -contains "Publish" -or $Steps -contains "Manifest") { Generate-Manifest -PackageFolder $TPB_PackageOutDir - if (Test-Path $TPB_SourceBuildPackageOutDir) + if (Test-Path $TPB_SourceBuildPackageOutDir) { Generate-Manifest -PackageFolder $TPB_SourceBuildPackageOutDir } @@ -1152,12 +1152,12 @@ if ($Force -or $Steps -contains "PrepareAcceptanceTests") { Publish-PatchedDotnet Invoke-TestAssetsBuild Publish-Tests -} +} if ($Script:ScriptFailed) { Write-Log "Build failed. {$(Get-ElapsedTime($timer))}" -Level "Error" - Exit 1 -} else { + Exit 1 +} else { Write-Log "Build succeeded. {$(Get-ElapsedTime($timer))}" - Exit 0 -} \ No newline at end of file + Exit 0 +} diff --git a/scripts/build.sh b/scripts/build.sh index 2cc0cf4c09..40f6c644b4 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -125,7 +125,7 @@ function ReadGlobalVersion { # # Dotnet configuration # -# Disable first run since we want to control all package sources +# Disable first run since we want to control all package sources export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712 export NUGET_PACKAGES=$TP_PACKAGES_DIR @@ -266,7 +266,7 @@ function invoke_build() log "invoke_build: Start build." local start=$SECONDS log ".. .. Build: Source: $TPB_Solution" - + # Workaround for https://github.com/dotnet/sdk/issues/335 export FrameworkPathOverride=$TP_PACKAGES_DIR/microsoft.targetingpack.netframework.v4.7.2/1.0.0/lib/net472/ if [ -z "$PROJECT_NAME_PATTERNS" ] @@ -296,7 +296,7 @@ function publish_package() log "publish_package: Started." local start=$SECONDS - + local packageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFramework/$TPB_TargetRuntime local coreCLRPackageDir=$TP_OUT_DIR/$TPB_Configuration/$TPB_TargetFrameworkCore local frameworkPackageDirMap=( \ @@ -360,13 +360,13 @@ function publish_package() mkdir -p $extensionsDir #*************************************************************************************************************# - # Note Note: If there are some dependencies for the logger assemblies, those need to be moved too. + # Note Note: If there are some dependencies for the logger assemblies, those need to be moved too. # Ideally we should just be publishing the loggers to the Extensions folder. loggers=( \ "Microsoft.TestPlatform.Extensions.TrxLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" \ "Microsoft.TestPlatform.Extensions.TrxLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.pdb" \ "Microsoft.TestPlatform.Extensions.HtmlLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" \ - "Microsoft.TestPlatform.Extensions.HtmlLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb" + "Microsoft.TestPlatform.Extensions.HtmlLogger/bin/$TPB_Configuration/$current_tfn/Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.pdb" ) for i in ${loggers[@]}; do @@ -388,7 +388,7 @@ function publish_package() "DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.EventLogCollector.dll" \ "DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.Extensions.EventLogCollector.pdb" ) - + for i in ${blame[@]}; do if [[ $TP_USE_REPO_API = 1 ]]; then log ".. Package: ${i} (Source Build)" @@ -399,14 +399,14 @@ function publish_package() done # TODO: move loc files too #*************************************************************************************************************# - + #*************************************************************************************************************# # Note Note: If there are some dependencies for the TestHostRuntimeProvider assemblies, those need to be moved too. runtimeproviders=( \ "Microsoft.TestPlatform.TestHostProvider/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.TestHostRuntimeProvider.dll" \ "Microsoft.TestPlatform.TestHostProvider/bin/$TPB_Configuration/$current_tfn/Microsoft.TestPlatform.TestHostRuntimeProvider.pdb" ) - + for i in ${runtimeproviders[@]}; do if [[ $TP_USE_REPO_API = 1 ]]; then log ".. Package: ${i} (Source Build)" @@ -424,7 +424,7 @@ function publish_package() # "microsoft.internal.dia.interop/$TPB_EXTERNALS_VERSION/tools/net451" \ # no linux support (cp to $testhost) "microsoft.visualstudio.coverage.io/$TPB_CC_EXTERNALS_VERSION/lib/netstandard2.0/" ) - + for i in ${externals[@]}; do if [[ $TP_USE_REPO_API = 1 ]]; then log ".. Package: ${i} (Source Build)" @@ -450,9 +450,9 @@ function publish_package() # assemblies=( \ "Microsoft.TestPlatform.PlatformAbstractions/bin/$TPB_Configuration/$current_tfn" \ - "Microsoft.TestPlatform.ObjectModel/bin/$TPB_Configuration/$current_tfn" + "Microsoft.TestPlatform.ObjectModel/bin/$TPB_Configuration/$current_tfn" ) - + for i in ${assemblies[@]}; do if [[ $TP_USE_REPO_API = 1 ]]; then log ".. Package: ${i} (Source Build)" @@ -463,7 +463,7 @@ function publish_package() done # TODO: move loc files too #*************************************************************************************************************# - + log "publish_package: Complete. Elapsed $(( SECONDS - start ))s." } diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 8f5fa9f8a4..0db82b249d 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -5,12 +5,12 @@ - - + 17.2.0-dev 2.1.0 @@ -37,14 +37,14 @@ 17.1.0-preview-2-31925-026 17.1.0-preview-2-31925-026 - + 17.1.0-preview-2-31925-026 17.0.0-beta.21179.1 16.0.461 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - + 3.0.0-preview4-27615-11 1.1.1 diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets index 7fc01cbfb8..df4eb0ec58 100644 --- a/scripts/build/TestPlatform.targets +++ b/scripts/build/TestPlatform.targets @@ -6,5 +6,5 @@ $(NoWarn);CA1416 - + diff --git a/scripts/perf/perf.ps1 b/scripts/perf/perf.ps1 index feead07303..88c31e8cfa 100644 --- a/scripts/perf/perf.ps1 +++ b/scripts/perf/perf.ps1 @@ -273,14 +273,14 @@ function Invoke-PerformanceTests $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll" foreach($fx in $Script:TPT_TargetFrameworks) { - if ($Script:TPT_TargetFramework -ne "" -and $fx -ne $Script:TPT_TargetFramework) + if ($Script:TPT_TargetFramework -ne "" -and $fx -ne $Script:TPT_TargetFramework) { # Write-Log "Skipped framework $fx based on user setting." continue; } - + $testContainer = [System.String]::Format($testContainerPath, $fx) - + if (Test-Path $testContainer) { $adapter = $payload.adapter @@ -302,12 +302,12 @@ function Invoke-PerformanceTests $payload | Add-Member currentRunner $runner -Force $payload | Add-Member currentAdapter $null -Force $payload | Add-Member currentAdapterVersion $null -Force - + if($runner -eq "vstest.console") { $payload | Add-Member currentRunnerVersion (Get-ProductVersion($runnerPath)) -Force $payload.currentAdapter = $adapter - + Measure-DiscoveryTime {&$runnerPath $testContainer --listtests --testadapterpath:$testAdapterPath} $payload Measure-ExecutionTime {&$runnerPath $testContainer --testadapterpath:$testAdapterPath} $payload } @@ -328,7 +328,7 @@ function Invoke-PerformanceTests Write-Log "Specified runner $runner doesn't exist at $runnerPath" } } - + } else { @@ -358,19 +358,19 @@ function Invoke-DisplayResults "`n" "Machine Configuration" $osDetails | Format-List 'MachineName', 'OSName', 'OSVersion', 'MachineType' , 'Processor', 'LogicalCores', 'RAMSize' - + if($DefaultAction -eq "Both" -or $DefaultAction -eq "Discovery") { $Script:TPT_Results | Where-Object {$_.Action -like "Discovery"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize } - + if($DefaultAction -eq "Both" -or $DefaultAction -eq "Execution") { $Script:TPT_Results | Where-Object {$_.Action -like "Execution"} | Format-Table 'Runner', 'Adapter', 'Action', 'ElapsedTime', 'Goal', 'Delta', 'Status', 'PayLoad', 'RunnerVersion', 'AdapterVersion' -AutoSize } - + $Host.UI.RawUI.ForegroundColor = $currentColor - + if($ExportResults -ne $null -and $ExportResults -eq "csv") { $Script:TPT_Results | Export-Csv -Path "PerformanceResults.csv" -Force -NoTypeInformation @@ -389,4 +389,4 @@ else } Invoke-PerformanceTests -Invoke-DisplayResults \ No newline at end of file +Invoke-DisplayResults diff --git a/scripts/test.ps1 b/scripts/test.ps1 index 62dd097e33..ce05418dcf 100644 --- a/scripts/test.ps1 +++ b/scripts/test.ps1 @@ -19,8 +19,8 @@ Param( [System.String] $TargetFramework, # Only test sources matching the pattern are run. - # Use End2End to run E2E tests. Or to run any one assembly tests, use the - # assembly name. E.g. test -p Microsoft.TestPlatform.CoreUtilities.UnitTests + # Use End2End to run E2E tests. Or to run any one assembly tests, use the + # assembly name. E.g. test -p Microsoft.TestPlatform.CoreUtilities.UnitTests [Parameter(Mandatory=$false)] [Alias("p")] [System.String] $Pattern = "Unit", @@ -71,8 +71,8 @@ ${env:DOTNET_ROOT(x86)} = "${env:DOTNET_ROOT}_x86" # disable looking up other dotnets in programfiles $env:DOTNET_MULTILEVEL_LOOKUP = 0 -# Disable first run since we want to control all package sources -$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 +# Disable first run since we want to control all package sources +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 # list what we have set and what is available "---- dotnet environment variables" @@ -185,7 +185,7 @@ function Invoke-Test $testContainerName = $_.BaseName $testOutputPath = Join-Path $_.Directory.FullName "bin/$($Script:TPT_Configuration)/{0}" $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll" - + $skip = "False" foreach ($project in $Script:TPT_SkipProjects) @@ -265,7 +265,7 @@ function Invoke-Test { Remove-Item $fullTrxFilePath } - + Set-TestEnvironment if($fx -eq $TPT_TargetFrameworkFullCLR) { diff --git a/scripts/test.sh b/scripts/test.sh index 31ee9d3fee..56789e7f7a 100644 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -66,7 +66,7 @@ TP_OUT_DIR="$TP_ROOT_DIR/artifacts" # # Dotnet configuration # -# Disable first run since we want to control all package sources +# Disable first run since we want to control all package sources export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 # Dotnet build doesnt support --packages yet. See https://github.com/dotnet/cli/issues/2712 export NUGET_PACKAGES=$TP_PACKAGES_DIR diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index d5ab7b5cff..adcc29326a 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -60,4 +60,4 @@ function Verify-Nuget-Packages($packageDirectory, $version) } Write-Log "Completed Verify-Nuget-Packages." -} \ No newline at end of file +} diff --git a/scripts/verify-sign.ps1 b/scripts/verify-sign.ps1 index a0f6acdafb..136e5e6364 100644 --- a/scripts/verify-sign.ps1 +++ b/scripts/verify-sign.ps1 @@ -21,7 +21,7 @@ $ErrorActionPreference = "Continue" Write-Verbose "Setup environment variables." $env:TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts" -$env:TP_TOOLS_DIR = Join-Path $env:TP_ROOT_DIR "tools" +$env:TP_TOOLS_DIR = Join-Path $env:TP_ROOT_DIR "tools" $script:ErrorCount = 0 # @@ -32,11 +32,11 @@ Write-Verbose "Setup build configuration." $TPB_SignCertificate = $Certificate $TPB_Configuration = $Configuration $TPB_AssembliesPattern = @( - "*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe", - "QTAgent*.exe", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll", - "Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll", - "covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe", - "CodeCoverage.exe", "Microsoft.ShDocVw.dll", "UIAComwrapper.dll", "Interop.UIAutomationClient.dll", "SettingsMigrator.exe", + "*test*.dll", "*qualitytools*.dll", "*test*.exe", "*datacollector*.dll", "*datacollector*.exe", + "QTAgent*.exe", "Microsoft.VisualStudio*.dll", "Microsoft.TestPlatform.Build.dll", "Microsoft.DiaSymReader.dll", + "Microsoft.IntelliTrace*.dll", "concrt140.dll", "msvcp140.dll", "vccorlib140.dll", "vcruntime140.dll", "codecoveragemessages.dll", + "covrun32.dll", "msdia140.dll", "covrun64.dll", "IntelliTrace.exe", "ProcessSnapshotCleanup.exe", "TDEnvCleanup.exe", + "CodeCoverage.exe", "Microsoft.ShDocVw.dll", "UIAComwrapper.dll", "Interop.UIAutomationClient.dll", "SettingsMigrator.exe", "Newtonsoft.Json.dll", "DumpMinitool*.exe" ) @@ -104,7 +104,7 @@ function Verify-Assemblies } } } - + Write-Debug "Verify-Assemblies: Complete" } @@ -116,25 +116,25 @@ function Verify-NugetPackages $nugetInstallDir = Join-Path $env:TP_TOOLS_DIR "nuget" $nugetInstallPath = Join-Path $nugetInstallDir "nuget.exe" - if(![System.IO.File]::Exists($nugetInstallPath)) + if(![System.IO.File]::Exists($nugetInstallPath)) { # Create the directory for nuget.exe if it does not exist New-Item -ItemType Directory -Force -Path $nugetInstallDir Invoke-WebRequest https://dist.nuget.org/win-x86-commandline/v4.6.1/nuget.exe -OutFile $nugetInstallPath } - + Write-Debug "Using nuget.exe installed at $nugetInstallPath" $artifactsDirectory = Join-Path $env:TP_OUT_DIR $TPB_Configuration $packagesDirectory = Join-Path $artifactsDirectory "packages" - + Get-ChildItem -Filter *.nupkg $packagesDirectory | % { & $nugetInstallPath verify -signature -CertificateFingerprint "3F9001EA83C560D712C24CF213C3D312CB3BFF51EE89435D3430BD06B5D0EECE;AA12DA22A49BCE7D5C1AE64CC1F3D892F150DA76140F210ABD2CBFFCA2C18A27;" $_.FullName if($LASTEXITCODE -eq 1) { $script:ErrorCount = $script:ErrorCount + 1 } } - + Write-Debug "Verify-NugetPackages: Complete" } @@ -179,4 +179,4 @@ Verify-NugetPackages if ($script:ErrorCount -gt 0) { Write-ToCI -message "Verification failed, $($script:ErrorCount) errors found!" -type "task.logissue" -vso -} \ No newline at end of file +} diff --git a/scripts/vsts-prebuild.ps1 b/scripts/vsts-prebuild.ps1 index 9fe4025d54..13ca42da99 100644 --- a/scripts/vsts-prebuild.ps1 +++ b/scripts/vsts-prebuild.ps1 @@ -1,11 +1,11 @@ # Sets variables which are used across the build tasks. -param ( - [Parameter(Mandatory)] +param ( + [Parameter(Mandatory)] [string] $BuildSuffix, - [Parameter(Mandatory)] + [Parameter(Mandatory)] [string] $IsRtmBuild, - [Parameter(Mandatory)] + [Parameter(Mandatory)] $Branch ) @@ -15,15 +15,15 @@ $TP_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullN $TpVersion = [string](([xml](Get-Content $TP_ROOT_DIR\scripts\build\TestPlatform.Settings.targets)).Project.PropertyGroup.TPVersionPrefix) $buildPrefix = $TpVersion.Trim() -if ($IsRtmBuild.ToLower() -eq "false") -{ +if ($IsRtmBuild.ToLower() -eq "false") +{ if ($null -ne $Branch -and $Branch -like "refs/heads/rel/*") - { + { $BuildSuffix = $BuildSuffix -replace "preview", "release" } $packageVersion = $buildPrefix+"-"+$buildSuffix -} +} else { $packageVersion = $buildPrefix diff --git a/scripts/write-release-notes.ps1 b/scripts/write-release-notes.ps1 index ea5463dd51..3b16b6eb90 100644 --- a/scripts/write-release-notes.ps1 +++ b/scripts/write-release-notes.ps1 @@ -1,6 +1,6 @@ [CmdletBinding()] param -( +( [string] $Path = ".", # if this is a pre-release or stable version [switch] $Stable, @@ -10,29 +10,29 @@ param [switch] $EndWithLatestCommit ) -if ($EndWithLatestCommit -and [string]::IsNullOrWhiteSpace($PackageVersion)) { +if ($EndWithLatestCommit -and [string]::IsNullOrWhiteSpace($PackageVersion)) { throw "EndWithLatestCommit was enabled, provide PackageVersion in this format 16.8.0-preview-20200924-01, or this format 16.8.0." } $repoUrl = $(if ((git -C $Path remote -v) -match "upstream") { git -C $Path remote get-url --push upstream } - else { + else { git -C $Path remote get-url --push origin - })-replace "\.git$" + })-replace "\.git$" -# list all tags on this branch ordered by creator date to get the latest, stable or pre-release tag. +# list all tags on this branch ordered by creator date to get the latest, stable or pre-release tag. # For stable release we choose only tags without any dash, for pre-release we choose all tags. $tags = git -C $Path tag -l --sort=creatordate | Where-Object { $_ -match "v\d+\.\d+\.\d+.*" -and (-not $Stable -or $_ -notlike '*-*') } -if ($EndWithLatestCommit) { +if ($EndWithLatestCommit) { # in CI we don't have the tag yet, so we show changes between the most recent tag, and this commit # we figure out the tag from the package version that is set by vsts-prebuild $start = $tags | Select-Object -Last 1 $end = git -C $Path rev-parse HEAD $tag = "v$PackageVersion" } -else { +else { # normally we show changes between the latest two tags $start, $end = $tags | Select-Object -Last 2 $tag = $end @@ -46,16 +46,16 @@ else { Write-Host "Generating release notes for $start..$end$(if ($EndWithLatestCommit) { " (expected tag: $tag)" })" $sourceBranch = $branch = git -C $Path rev-parse --abbrev-ref HEAD -if ($sourceBranch -eq "HEAD") { +if ($sourceBranch -eq "HEAD") { # when CI checks out just the single commit, https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml - $sourceBranch = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/" + $sourceBranch = $env:BUILD_SOURCEBRANCH -replace "^refs/heads/" } -if ([string]::IsNullOrWhiteSpace($branch)) { +if ([string]::IsNullOrWhiteSpace($branch)) { throw "Branch is null or empty!" } -if ([string]::IsNullOrWhiteSpace($sourceBranch)) { +if ([string]::IsNullOrWhiteSpace($sourceBranch)) { throw "SourceBranch is null or empty!" } @@ -63,14 +63,14 @@ Write-Host "Branch is $branch" Write-Host "SourceBranch is $sourceBranch" $branchesWithStartTag = git -C $Path branch --contains tags/$start -if (-not $branchesWithStartTag -or -not ($branchesWithStartTag -match $branch)) { +if (-not $branchesWithStartTag -or -not ($branchesWithStartTag -match $branch)) { Write-Host "This branch $branch$(if($branch -ne $sourceBranch){" ($sourceBranch)"}), does not contain the starting tag $start. Skipping generating release notes." if ($branchesWithStartTag) { Write-Host "The tag is present on branches:`n$($branchesWithStartTag)." } - return + return } -else { +else { Write-Host "Branch $branch$(if($branch -ne $sourceBranch){" ($sourceBranch)"}) has tag $start, getting log since that." } diff --git a/src/AttachVS/AttachVS.csproj b/src/AttachVS/AttachVS.csproj index d0ec423143..19a51edfb3 100644 --- a/src/AttachVS/AttachVS.csproj +++ b/src/AttachVS/AttachVS.csproj @@ -1,10 +1,10 @@ - ..\..\ - true + ..\..\ + true - + Exe net472 diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj index 799ca0b054..f4d02a4fa3 100644 --- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj +++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj index 90110d4e9d..4310e73d10 100644 --- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj +++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj @@ -22,6 +22,6 @@ - + diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj index 444d5d3977..970d3ad6af 100644 --- a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj +++ b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/Microsoft.TestPlatform.Extensions.EventLogCollector.csproj @@ -1,9 +1,9 @@ - + ..\..\..\ - + Microsoft.TestPlatform.Extensions.EventLogCollector net451 diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 4531a45427..6200be4cb0 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj index 3db6db965c..2c97cd9ca8 100644 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -44,4 +44,3 @@ - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj index 016642c437..38f7e83900 100644 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj index 3a3f83a250..082a9f6e98 100644 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj index 959ae622c7..9efc100047 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj index 2dfba0ea0e..631819d485 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -64,19 +64,19 @@ - + - + - - - - - - - - - + + + + + + + + + Microsoft.VisualStudio.TestPlatform.CoreUtilities diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index 391d2d99fe..fc3c82019e 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj index 956d0f205d..3af8da8c36 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/Microsoft.TestPlatform.Extensions.BlameDataCollector.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj index 2323bd3612..38dd67e1ec 100644 --- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj @@ -1,56 +1,56 @@ - + - - ..\..\ - - - - Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger - true - netstandard2.0;net451 - net6.0 - false - + + ..\..\ + + + + Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger + true + netstandard2.0;net451 + net6.0 + false + - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger - - - - - - - - - - + + + + + + + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.Extensions.HtmlLogger + + + + + + + + + + diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj index 96f6bbaec5..769bfc64c5 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -21,7 +21,7 @@ - + diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj index 04e0aa6fcb..6566aac5c4 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -1,130 +1,130 @@ - + - - ..\..\ - - - - Microsoft.VisualStudio.TestPlatform.ObjectModel - net45;net451;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 - $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 - Microsoft.TestPlatform.ObjectModel - - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - false - $(DefineConstants);WINDOWS_UWP - - - - + + ..\..\ + + + + Microsoft.VisualStudio.TestPlatform.ObjectModel + net45;net451;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 + $(TargetFrameworks);uap10.0;netstandard1.0 + net6.0 + Microsoft.TestPlatform.ObjectModel + + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + false + $(DefineConstants);WINDOWS_UWP + + + + - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - + + - - - - + + + + - - - - - + + + + + - + - - - - + + + + - - - + + + - - TextTemplatingFileGenerator - Resources\CommonResources.resx - - - - - True - True - CommonResources.resx - - - True - True - Resources.resx - - - - - ResXFileCodeGenerator - Resources\CommonResources.tt - CommonResources.Designer.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - Microsoft.VisualStudio.TestPlatform.ObjectModel - + + TextTemplatingFileGenerator + Resources\CommonResources.resx + + + + + True + True + CommonResources.resx + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources\CommonResources.tt + CommonResources.Designer.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.ObjectModel + - - - - - - - - - - - + + + + + + + + + + + - + diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index b8d5dd5a4f..63ab3fa9a7 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -1,66 +1,66 @@ - + - - ..\..\ - - - - Microsoft.TestPlatform.PlatformAbstractions - Microsoft.TestPlatform.PlatformAbstractions - net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 - $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 - true - false - - NU1605 - + + ..\..\ + + + + Microsoft.TestPlatform.PlatformAbstractions + Microsoft.TestPlatform.PlatformAbstractions + net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 + $(TargetFrameworks);uap10.0;netstandard1.0 + net6.0 + true + false + + NU1605 + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP - + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index 5bf1c6a31e..50bd7707ee 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj index 6e21ecf7d9..2e368260da 100644 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj index 927daa1655..2c0eb7cc01 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index 58c4939172..8181948b2e 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index 299ffc945b..d848d085c8 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index 6ece47948b..7efc9c0738 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 235d4a9dc9..4e5f0dd952 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index 1396d492b4..2cf36dc3d5 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj index 4a2f963a12..fb71c37d48 100644 --- a/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj +++ b/test/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests/Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ @@ -14,7 +14,7 @@ net451 - Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests + Microsoft.TestPlatform.Extensions.EventLogCollector.UnitTests true diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj index 0c45e2c35c..31d535775e 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj index 0e9bc56646..a8e30e81d5 100644 --- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/Microsoft.TestPlatform.AdapterUtilities.UnitTests.csproj @@ -20,17 +20,17 @@ - + - + PreserveNewest - + diff --git a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj index b8922d576d..4dbf373b44 100644 --- a/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Build.UnitTests/Microsoft.TestPlatform.Build.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj index 29dcd973cd..cd47aeb6bf 100644 --- a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj b/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj index 63e3b0c9f6..8d5a10be07 100644 --- a/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.Common.PlatformTests/Microsoft.TestPlatform.Common.PlatformTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj index 463037ec3e..f72b78c876 100644 --- a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj index b2ddb8c50a..ff761ad417 100644 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests/Microsoft.TestPlatform.CommunicationUtilities.PlatformTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj index 77cbe1b6c6..34439c5bbd 100644 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj index 04479c1fae..afe4bf2809 100644 --- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj index 34239e46b1..7b93a09a65 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj index 2c7b43a296..46748bafad 100644 --- a/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests/Microsoft.TestPlatform.Extensions.BlameDataCollector.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -30,7 +30,7 @@ - + diff --git a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj index c4f3325d64..24df075ceb 100644 --- a/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests/Microsoft.TestPlatform.Extensions.HtmlLogger.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -15,7 +15,7 @@ - + diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj index 2984bca87b..b40a252773 100644 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -21,7 +21,7 @@ - + diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj index 129135fbe7..3e84049474 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ true @@ -12,7 +12,7 @@ Microsoft.TestPlatform.ObjectModel.PlatformTests - + diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj index 0081392c81..eca84c2c95 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj b/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj index ce245f448d..f5c20febb5 100644 --- a/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj +++ b/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj index f54a5ce17a..9948d46e82 100644 --- a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj +++ b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj index f0ae08cbd3..3053b68552 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Microsoft.TestPlatform.TestHostProvider.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj index 01553250c2..aea121fece 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj +++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj index f87f3be25f..b1ada1e9c5 100644 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj @@ -1,41 +1,41 @@ - + - ..\..\ - true - true - true + ..\..\ + true + true + true - netcoreapp2.1;net451 - netcoreapp3.1 - Exe - Microsoft.TestPlatform.Utilities.UnitTests + netcoreapp2.1;net451 + netcoreapp3.1 + Exe + Microsoft.TestPlatform.Utilities.UnitTests - + - - 1.0.3 - - + + 1.0.3 + + - - - - - + + + + + - - Always - + + Always + - + diff --git a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj index 0c0c7f839c..fb9c94aea1 100644 --- a/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj +++ b/test/SettingsMigrator.UnitTests/SettingsMigrator.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ @@ -8,7 +8,7 @@ net451 - true + true true SettingsMigrator.UnitTests @@ -17,8 +17,8 @@ - - + + diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj index f156940b22..daee3d4ce4 100644 --- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj +++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1;net451 diff --git a/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj index 4d423c4575..403d1415cc 100644 --- a/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj +++ b/test/TestAssets/ArchitectureSwitch/ArchitectureSwitch.csproj @@ -1,4 +1,4 @@ - + net6.0;net5.0 net6.0;netcoreapp3.1 diff --git a/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj b/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj index 91ccb29a37..e55d776f0b 100644 --- a/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj +++ b/test/TestAssets/AttachmentProcessorDataCollector/AttachmentProcessorDataCollector.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index d4f7755a51..41d7abeecd 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj index 17d4ea6f56..70b39811b1 100644 --- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj +++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ netcoreapp3.1 false - + $(MSTestFrameworkVersion) diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj index 5a7cfc1b43..b7c384a034 100644 --- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj +++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj index 2a49271788..a203d55d41 100644 --- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj +++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj b/test/TestAssets/CrashingOnDebugAssertTestProject/CrashingOnDebugAssertTestProject.csproj index 722ad2858ebd08e693393d85241ab422ba3d0087..17e396c656f1b3f82b7f586c32c4b83dfcd93def 100644 GIT binary patch literal 1258 zcmcgsO^?$s5WVMD7^_m+LlO!S7m}>HZFkiJOVxHc_2Nw?!8Eb0u>&mXkH=2a(#=u? z(h4cEl=<*`Z#*;c)%Ut0Uja3jBBA5(H6*1a0ggj&#>1Gz_*gl)KT|HVjKJH^^%ECUK`z0Vb0OOsO~F zIF6qAf1hT#i=3ObAjBUGXVTn(xpsVRP}XbNUw{hS|l!{sY(bahnA>+IOSqoCxj+$AS0Ht2n9S)VP({!6 zLhryap|XbQ?Hx~s-0F79eabjyzKTbHHukw!u+ErC+&fdks;pi;IID)f5IaVTO%M#$ zuu?~#5mu%s$}<6lz**x_51;pP^atw diff --git a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj index 78f8ba77c7..73c2dfd6c0 100644 --- a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj +++ b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj index e60a9a4041..3958ae816a 100644 --- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj +++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj @@ -1,4 +1,4 @@ - + @@ -9,7 +9,7 @@ netcoreapp3.1 x64 - + diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj index 70e6228436..0c993562cb 100644 --- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj +++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj @@ -1,4 +1,4 @@ - + net451;netcoreapp2.1 diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index 81a3800789..5bbf0915fe 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 776b6f86a7..3628f42f22 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj index 264e952756648439c263b1ec8fc7b49630ab92f4..b21d0c9ba29568ca1926f3e358f75276e571d9a3 100644 GIT binary patch literal 991 zcmaizTaTJR7>4it6;ooOUI5~eq`=0w+s2DFM%|_t-VE?Tr@{=GgS)2ozjrva>SEi3 zFyY~y_dCsa53hNKj=%+B)HfV!Xds{wiwRAAL&?N+X2wI%@z$Juhe)DreDIA=B;ri4 zL|UJpc9up)&_T$1XPRi07mQ1RmMqU1MLQ63Ap~era8?KlnP#P}b*QoR4a?fskBB%a zq}YdwWbyv8->UW-$PPMXEWNP+E>9mhQ$^{h*$(p*3IYs9I+A zyJoYR%_}yq*}P`1XSdv%AiAO^>p*e^T6jfj%}QLeT6N3H66{tDw^ivL(wN9mHmJ^t4<*_o_kZ*pHA93ffXgOr;2R zo5k|Uv)|%-X_jmyA;0eY8b=45!UhuH`uG4^(I`_f_{OWEL>lPJ?-SPTe|^^E&yboQ zgKDtV6#wI8aYZR`>qvycnUE?btnI&uaUp@X-S4EhJqcZowNX@(94?9cRr*iK80GjvB_j&Y3Lku!|OQ}^dR_v&Dk Imo@180@6c7?f?J) literal 2034 zcmbuA-ER^>6vfZ8iT?vOCY1-a))r_YrD^aZJZMNk;{z|tc0nv`39wpY{nypsongan zrL;{$vdqq$d-vRPKj!bBhE8;)sU|AvyJF3?&{&sBbgUiiE6_{+OPnN%*gxkq(a4>q zT56~Ys2Z3PHT6_a)KCX6m->cH1frxaRu|6V1J;o{U4R&J8t9|ms>i=a?X0|%uxscU z-YcxyFq~mA$6~>Ii}jSB@ho8-v%AzO&jo9bnYr)G*a^UxAJ5Nw&U-A~U~G{G{Q8CG z!Z9Di!~FL(P)altV(V{Y5P&otjDab*xB9+mN#A!;ICf59g(3uV!w-97I7Af z&sMQYny{avXuR^d8B_GsCh{!z+q`YVWgab(`{X05?oC`BqF_-`)is7)4By&~?I@<7~a- zXH!g9wP75gPf8AAH*v05Cq%Y%J@}d3;)Juzd_fhD`M_s0Y*4D%d7b ze!i_$dAQ%l_}O%~w76BiqQ@LXZu+)L-d1yst*1WkU6(P-SHx;l{r%DrGc#13{yJoR u&OLNMmsYt~E9?xIuQ98E!`bQpwB^w3_CZDLRC)XTpa|CUEW3yOo$?PJcStY* diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj index d62f6e4c34..b073d9b864 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.csproj +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj index b7bddcb34c..7a30726cdf 100644 --- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj +++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/NuGet.config b/test/TestAssets/NuGet.config index 6f8bd3e5a2..d72335f747 100644 --- a/test/TestAssets/NuGet.config +++ b/test/TestAssets/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj index f172b1ecb5..56e18fdd4a 100644 --- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj +++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1;net451 netcoreapp3.1 diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj index 5f7d6ec0d02224bee620f773ac71e02a229adecc..d1b8286e65a1840356b7cb3e6c338b961661b4a6 100644 GIT binary patch literal 1219 zcmb_cO>dh(5WV|XY*8d92NvUx)>45eb(6}6T2`=n@?}{DhZ-M7|lF!0tWz5-VyjQ76v zIprv%NEBV&Z>SDg!GI9&jct=f;#d|KyQ#0dt5ODC3q>hK9gRho)AW{C1AJFHj^!J46dDNKJrY^tZidA7$xvYhLt>o}PG~>V;tBZvUSyp{f`nxfJg4v2=;d?-GqI(D{8Ya+ z<9oJ)M@Rs*34kmMo>ejEg@;B$YJOf-s&`)N{-v=`aCP0_ULozljpw{T8pWJ0Q@g-! z_+kThF)I~dKYa`MkK|`|ua$W5d}n@r9n7&l{U>(MIa|eXFJcn8W2s3*e>UK5F%+fmzh70`2iYZPrYOoS({T^ zNS>-n^a*ljQ0Z{hhid9O`}L7W`MZelVzI5vGk@lVvwY?7{4hG>-rd3tF_pmHu(qs7 zp{n@Z)k`qj)!QL&Uqx1S>S}A7o$hm> zn(jKeHkPk|Ljq2VGt%!>d^)SfW z$jACW#lLt8jPql59xTrVKSwfsul;Wku)11SDbXD6s=l?nPv(1-?@hkPS`VAfnP|(HT&=)>Cc5Oir#b{_EBIq}{)|neg6Y0F_E1B diff --git a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj index 47c125a329..29bae20cfc 100644 --- a/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/MSTestAdapterPerfTestProject/MSTestAdapterPerfTestProject.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj index 02e49fa350..41341a99bb 100644 --- a/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/NUnitAdapterPerfTestProject/NUnitAdapterPerfTestProject.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj index 72c1aa7187..95fd688edb 100644 --- a/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj +++ b/test/TestAssets/PerfAssets/XUnitAdapterPerfTestProject/XUnitAdapterPerfTestProject.csproj @@ -1,7 +1,7 @@ - + - + netcoreapp2.1;net451 netcoreapp3.1 diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj index 94c7a09f4102d093be59f4280009c55a5d7f65fe..3f1bc239e07dc2fd6c3d1b7117e4c2678c286a65 100644 GIT binary patch literal 1192 zcmb_cO>dh(5WV|XtX7e*4=lzXDN=!`O`OVyI##jNi!Xc(4)wyK-64%t^}lz)v<6yB zm0F1lGmm+1-pt_Mz2=;}fK-_%JZiHkB~Zj7$%=zVD@;xMmfrazcPqsgh>--z(W4); zSPCUlWSiBF=@9itgw&W4B%VG$9AA_%R@|s%s&Z%h7H@zc$l3K&m)FG zea80Z$F+u-ZsD^iA7uqCu#KF_*Q)urhw8^_+178m-F03HiKK1XqkmAUVwshw_EDAb zWZxCZ0zlOMDTbju04hqX>;5#5M;YeuRmh|A3&2=N2+MND?6>-Dv9xt>Ls;wXAl!AA z7&qewfg8a0wZum$@<3EFhKbR*T$^SP+98~?>r77-mKE+!CG zxb$L7CYoyXs>gJx)K2pL8RFwg@IfU%4Y|_zYw5EC@05Z(;-`%^(BFbgI}>-UUiQkY zd(-bVrwtrvYOTBUrDs%oc-Ha&QFW*-^6TvhBd*n7V*iz1FNMC6A#GZ5{uh*MguHvB z0mzpu2C^<4e!()s>#t*u_Yf4m*N PJ-<$-xy<^nNMV|DJd`6Lng%D8At->*Am&e-f_;-d2z&h;rx$M2p{Mnr!V} zqAJ5YtT8S!&$j9}+VSx*f3N$Tj#me7*V^Dy)@D}5BAr<3f;~Zzl}uYJlZ!3dsXl|{ zac`?jd{;zu?c$rwy0PbWu?-y~CRmCB%V2CaWDq>j9a$f!-Gg4Kwr)Ey9!pTV#9Spzw@<~=hO8XJ;JK>u_<~> zSlLUl?00T-=xG5`;r4{PYG;}70y}1DPEE{++3A*v9qQ9M^*B`@>6*9v6zj%k+`i6> zyFqaVJr~QPmE~U^-+WEQjEp_^b#hD$tXEuK@u>r=d^ZYQ#C(?X-! netcoreapp1.0;netcoreapp1.1;netcoreapp2.1 netcoreapp3.1 - true + true false diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj index ea770a0731..f45cf4c574 100644 --- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index 6aa9b4cc10884e905f70b71ade83e074546f78ad..0611d66af52f0dd94023ec3e595daa5b573b7343 100644 GIT binary patch literal 1213 zcmb_cU2mH(6n)RH@KB|+515dT4rxHuW$l!QMpcRSlow-eQWlIY+jNbl{rA~Gn}mf) zlO`b~?mgGXKIfS5=9Lxb1*FP(896>4IS5M1v%K6!PNg@lf9>4FgYZ%E??5$5vR&jn zsm@Qytw?r^%C@Fdy;#} zS;8wx;cAGY2o1HYV2GR}!U^tYnm+^G-SMKck$6K21)aF)e{|Y(W{CV_hC$r$!xz+1D+h0*U_zn9Ai$VYZ literal 2496 zcmd6pU2hUm5Qg7t6aT~7nABddS}AJcmZoAgT(oJV@roN*7F!FHEYNCzVB-(I8o#{juyuH-U*h+w2q$gM} zKvjvbk4B2dfOQ4B%g^Er&`#JL>X_#M+ROBvpFTSwGG@oe=PgfL3}zy>%tLluJp8I+U zPWyU0<{hZS%Dk?(ww-r>?mbt7L-Nk5G|;Y|>Y3iNGXxup@ZJ6CSRPg_HJ&5r82%m_ z0Tp@3a~J6pPU7~g{ubp}bU8jGtBNkM9n%3PM9^7-N|~-`AZ2xI-nP}w5H;OR>T4oj z1&0KjmRI39ky#!MS0SH}Zu7S~u-TA+Wz|s~&}^}`J~{>WtS-ZQYQDCn``&8N*W+hr zKbuHpcgoWi=k4S*_8f-!z1iL}oL1*GtFcaga~zJr$$H3;PeCj1X)_G+HuAatPx&vO z{FC~azXMj+g1e?z*|PdQRqNm7h(1#@Y;_4BHwR2=b6bNq%&ULd2&1-gtC7i!CERAQZ@tPLA;< z2^rxe7S_hwTQX$09fTI|OcQN!c)~|O5m3k@33a}pb7Y!2O+ry%;{1t`f~trt-2)ff z6pNU!Y)6PdE0RZv(4@Nk_SXS&9MtO>u4Ns{-(uL#sRNhXUBL>d601nre9d)nBdZxx z>V|K4Yr*S`5+=ALoMj|O3TeqX$Ox4>xph%p=Ap_*$M{Q~hb*CjAA%xDqrnfIjjBYw(IjJveio$X4bH&zlZ>WN^JlymHWI4& zY20TfOMVh|;%*KiBn&X6W6OS!|E4ordf!gFU0t6(>UH~1L~KBOR0cgWlKG@yAq;wY z3)E11$fz}(Sob@vzC(EONZKOe#yI72H|~8dX?`sPEyVszp-!;dm)urT>ypwM>^Esc zxu+L~-mC0z#n5AIFO{0fT0mBR8$Pg?Bm}h1!?cLNF@DX*_(MFMN9H7$jm&9agBi@n zU`}v^=VN;mPGZEfv!t2b9uu9>HH zsG4uNI`XZz+r~wj{%=cpW#Z&mFsv?3)o=$XV6J!S(lSnRkf~hYTyR(JBQzp|hn@G? kTl$`&)A(|8#%jd+Xk3rM{nuPO3zz%Yc*NReb(!7HA5QV`YybcN literal 3046 zcmc(h+fNfg6vof9iT}e&Oq2(T+|Le zkf_q<_wQUWlm&oi{#U9%uE87WHM)nn*1`?5-q1AI5AJJ~O)d>=9R!eqlRjcv#QY+V1 zBJ|4k1nX;zPOOezkN*x)?Gz=mnX7kJVIRJInVr;ZT(I= z#XhI`ui$NLGknV0%*rToLhjKYfjvQyl}uY(Bo{1d*JXH5qJ0FnY0HbBxO|| zs9x4n8CABs_Fpb*vOcY+d@9Zr)s;9>j;e0O&ydL9EfY1LFM){xKJ}@q zV|Ey@Z-w2vE}DJ50&iLVH(g#9TL}L6ooXrH-+{vK^UY;T4>T1}3a@%q%&1O8##<;=yDjG?b2sNiU z^@}`=TMpwxP#xG8c2s|@;z6G{En=lYFRUY_+S6|L)y^{d3B*$(r2iV3quyM^q8Rkt zsrM?n`!2fq{(g2cJ(w)!vC7%!QRMlN^w(v3Siq)=pJI8i;Dk|K#++F?5rz4Ps5anr z=1wlV(G<6;y%RISYY1v3V1b?XV{Co^ODqGpU zl6^<=cY)w(G3GWL^m&Bke`EExpf*|D!7KISa2v|vJS8@YPu=y6(8q3Ll_hcF?dk?r z=UeAg<+_8msD>h$ReJm>UF-wDefnv2&QY<>{j2=%oagy>jGOn*MW=U?+u`o*vHbx> Cv-G0? diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj index 68d44a12b0..02e4825ff7 100644 --- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj +++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj @@ -1,4 +1,4 @@ - + diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj index 659d4e1984ae901f54f790f373da35286669f415..726e0369e30a16b9687301dfa0f351fe2d9ff031 100644 GIT binary patch literal 1103 zcma)6O^=%}5WVMDxK<>x2b`u~mjbIa%~pHZG}=V!B^MSZDGkP!J+zyDzk?lifo{}F zTo}K3^Ze#Pbp0qx_8W{XR2B1?c*_}7naYdm5c3-M;p`K?PDat%s9%sF+vLZX-xZlr zR_#%&mRmt3o{Sia-h?4rr`a(*0Lwu`l@ryeWw$I09gL_n7(9J5s@6?~TDM?vU8cBK zM&2uhY@w>WKqqQE8J=FTIA%e>6Crl~iKatLm)L7h(A01So-2O%t#!>kRKMnNt-x(+ z4uHx0{w|shY96@w3E6R}N)Nm-sf0hu9Fu)oT2gT7n3{=j=#I1XR%&I?k}XoIiZy!Y z)&f;D;jL)B^*DCkR?MFbvY9C~+TBB4l=<$ZU$}nGrfxOE_E)Sw6HOga&vmf@M9Pg7 z=nS$g>t9!*dp7FjLwQ<}H_4`ux`fUWoV7iOH+EpCO)9`l8A!E$CuX1N?Zd|zt=P?f z_T9Ew7?isqW5IaxRpAQoOXJXuQF5bdlfhNs!q#LbV7xQ%y|_H-(uV&X0J7$Ljk?C| zNkdoQctYA1bl17oo%{WuT=~zTRk(blh`n&Qy}pvF|6g?{Gi};?8+Ms(eh$g#3B&$* A9smFU literal 2252 zcmcJROK;Oa6ot<(Gt-}Y`QUNQbHb%YzOF{hkkb^uI)B< z69ls4naq96x#vEdKfhZ#(l5<4RiGalDpsPgBF%NE9qp^37pwu2xdxnHBAx5XNta4B z(jHoG&^c0DkM&3`_3#quJ2nF}0-a+uaTcdo51ceXV}!J!Gj-Kx^;$bCF9CKfJ;D1P zyPiVqCcLlk8sKlJg~Mb!Lw3z+8GpiwS$kC8pGRhvF?V0)s4Yn|O~EN)UqdG(%vW8qMw-0mx9#+lVmaLaQCnPKxf z3ou7mB~-=zIxc#&?kHx+`u2W3C9dzrcr^bP`btHNVdIj0mgypb2AUZH>;Gn{3ejHy|`R9*WvCyXQOIh#YqPg=-(;-*y@?Izjsb)PXX1Iv{8aJH(UHn)yl7N^{v z@m1zMuigzRu@wtoD=5EX`Bqs~KB;tL&UCCbQHNSjk*HyoH+wS(N31?Hw z^7|fCDGXUQ-rZJ{^<4y0=e(Ef2grA^$R}PlKkUqA-?|tNT#SDc)wW&zZ)Sqe=O-dg z$&kJKRF8dUs#r7zJ$LpUvFvtScGuU$7pF6U$!Z?Ee8>HaUxy>l{^s-Re{}i!$#Zw= O*Y$LcKl_K_W4i%txqLYQ diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj index 6606fa6add297196eb5b19dfbe776d076bc8e9dd..986e9cef3bcc887108f81ac427602431b989e4b8 100644 GIT binary patch literal 1043 zcma)5!ET#C5WV{=wku0G2bQ{RqDp~{QrD?+sB6`ha`A=0*r8_G)$Y*Rf8S--BtRS~ z5*LOyZ{ECl#5V^~lE0u$A*+N=*+)vC%4A+tyM)%b4X0Q1hL7T5$%`s`)?s!`RrJ}T%698ava rncekPsSfRfwZTWaRX9J`2`?P(uxDcR{#$oK(zRoY`# literal 2132 zcmcJQTW`}q5QWb(692(eNYIBSl$(%nU6m40A1D!x#7kd7+LVy1YzNvu4}7!Rt?f2; zQY2)_yYZfxJ#*%gKfhz`>rzuq6zQkVl`7LnbIr7;E$ynMXRHw?GY$BD#_3EK?sTbK zL+yZi4Q5}79_oQ&b@4LS4{Qb?BAsA0b{3zo9=OvC#E{dLj@40*)uXnqy+qi>dW82K zc3t(c8}q)vYlOdZEgUD?8M7BAt`}54qGUe_oeRN!w_$p8y*#nb->7q=Z zbqL=SoxZTn`5ozyb>{TQONu?#Q=)0M-Nt&4C(;uhi@3#eT6xE6uk};UxvYNz+f++9 zRee@5mN|>uM}I`@MHE$J*;^B?>hZRYJycCyHgn>?)EjEZ_%-8#PmeTS&ABWp=!o1c zz+2v}GAw&j9?M~L6YBwI8A^G~0<_(bk(s--RQ6~UT2{$==Wb3jSNkJ8n*URMBP%27 z>x_L+yUd^kGBB_nY?rDu*1G#QtHdg&c8ODc{aLS?MppMW3rwH9l+VmfjKH?Y+2-9B zRG7kNLZ2Sveaf8)H;-H$8`7#V_As>%86X_PR-9)5CK79#%OD8N+us6=iW)g`epi>ezSdPmKNE3IhV0#=dTd72 zsb~s%?Q9}gb`M;3SM&YqFk_Ug*RjJi^HHqgQOxYkXW0Mf^wrbn_VjJ)>w + diff --git a/test/TestAssets/child-crash/child-crash.csproj b/test/TestAssets/child-crash/child-crash.csproj index be91e37289..e0221378ae 100644 --- a/test/TestAssets/child-crash/child-crash.csproj +++ b/test/TestAssets/child-crash/child-crash.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ @@ -7,7 +7,7 @@ - + net5.0 child_crash diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj index 318d5f6204..bf57e6358c 100644 --- a/test/TestAssets/child-hang/child-hang.csproj +++ b/test/TestAssets/child-hang/child-hang.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ true @@ -6,7 +6,7 @@ - + net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 @@ -22,6 +22,6 @@ - + diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj index f6a159698a..3ab7ca5e47 100644 --- a/test/TestAssets/crash/crash.csproj +++ b/test/TestAssets/crash/crash.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ true @@ -6,7 +6,7 @@ - + net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 diff --git a/test/TestAssets/hanging-child/hanging-child.csproj b/test/TestAssets/hanging-child/hanging-child.csproj index ad2be3e645..0b4db786aa 100644 --- a/test/TestAssets/hanging-child/hanging-child.csproj +++ b/test/TestAssets/hanging-child/hanging-child.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ @@ -7,7 +7,7 @@ - + net5.0 Exe diff --git a/test/TestAssets/problematic-child/problematic-child.csproj b/test/TestAssets/problematic-child/problematic-child.csproj index 7b87f7f0c3..cd12b0cde9 100644 --- a/test/TestAssets/problematic-child/problematic-child.csproj +++ b/test/TestAssets/problematic-child/problematic-child.csproj @@ -7,7 +7,7 @@ - + net5.0 Exe diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj index 2ec2b2ff9d..fb101d612a 100644 --- a/test/TestAssets/timeout/timeout.csproj +++ b/test/TestAssets/timeout/timeout.csproj @@ -1,4 +1,4 @@ - + ..\..\..\ @@ -7,7 +7,7 @@ - + net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 diff --git a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj index bebc846f8b..1b33ca81a5 100644 --- a/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj +++ b/test/TranslationLayer.UnitTests/TranslationLayer.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/coverlet.collector/coverlet.collector.csproj b/test/coverlet.collector/coverlet.collector.csproj index 97574d9587..7966d51861 100644 --- a/test/coverlet.collector/coverlet.collector.csproj +++ b/test/coverlet.collector/coverlet.collector.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.1;net451 netcoreapp3.1 diff --git a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj index 025c98867e..0b8bfdcc3b 100644 --- a/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj +++ b/test/datacollector.PlatformTests/datacollector.PlatformTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ true diff --git a/test/datacollector.UnitTests/datacollector.UnitTests.csproj b/test/datacollector.UnitTests/datacollector.UnitTests.csproj index 8837003249..5e89f02902 100644 --- a/test/datacollector.UnitTests/datacollector.UnitTests.csproj +++ b/test/datacollector.UnitTests/datacollector.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/testhost.UnitTests/testhost.UnitTests.csproj b/test/testhost.UnitTests/testhost.UnitTests.csproj index 48525ba029..b434796078 100644 --- a/test/testhost.UnitTests/testhost.UnitTests.csproj +++ b/test/testhost.UnitTests/testhost.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj b/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj index e2dd910ffa..3a69649de1 100644 --- a/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj +++ b/test/vstest.console.PlatformTests/vstest.console.PlatformTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj index 307a79b2fd..57bf788102 100644 --- a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj +++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj @@ -1,4 +1,4 @@ - + ..\..\ From 2bfe5ffebd64df49b8d67d93ebfb67f50885ba9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Fri, 28 Jan 2022 15:59:26 +0100 Subject: [PATCH 2/2] Reformat file --- scripts/PortableToFullPdb.ps1 | 47 +++++++++++++++-------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/scripts/PortableToFullPdb.ps1 b/scripts/PortableToFullPdb.ps1 index 0cb245465d..320620a36c 100644 --- a/scripts/PortableToFullPdb.ps1 +++ b/scripts/PortableToFullPdb.ps1 @@ -3,7 +3,7 @@ [CmdletBinding()] Param( - [Parameter(Mandatory=$false)] + [Parameter(Mandatory = $false)] [ValidateSet("Debug", "Release")] [System.String] $Configuration = "Release" ) @@ -18,54 +18,47 @@ $TP_OUT_DIR = Join-Path $TP_ROOT_DIR "artifacts" $PdbConverterToolVersion = "1.1.0-beta2-21075-01" -function Locate-PdbConverterTool -{ +function Locate-PdbConverterTool { $pdbConverter = Join-Path -path $TP_PACKAGES_DIR -ChildPath "Microsoft.DiaSymReader.Pdb2Pdb\$PdbConverterToolVersion\tools\Pdb2Pdb.exe" if (!(Test-Path -path $pdbConverter)) { - throw "Unable to locate Pdb2Pdb converter exe in path '$pdbConverter'." - } + throw "Unable to locate Pdb2Pdb converter exe in path '$pdbConverter'." + } Write-Verbose "Pdb2Pdb converter path is : $pdbConverter" return $pdbConverter } -function ConvertPortablePdbToWindowsPdb -{ - $allPdbs = Get-ChildItem -path $TP_OUT_DIR\$Configuration *.pdb -Recurse | % {$_.FullName} +function ConvertPortablePdbToWindowsPdb { + $allPdbs = Get-ChildItem -path $TP_OUT_DIR\$Configuration *.pdb -Recurse | % { $_.FullName } $portablePdbs = New-Object System.Collections.Generic.List[System.Object] - foreach($pdb in $allPdbs) - { - # First four bytes should be 'BSJB' for portable pdb - $bytes = [char[]](Get-Content $pdb -Encoding byte -TotalCount 4) -join '' + foreach ($pdb in $allPdbs) { + # First four bytes should be 'BSJB' for portable pdb + $bytes = [char[]](Get-Content $pdb -Encoding byte -TotalCount 4) -join '' - if( $bytes -eq "BSJB") - { - $portablePdbs.Add($pdb) - } + if ( $bytes -eq "BSJB") { + $portablePdbs.Add($pdb) + } } $pdbConverter = Locate-PdbConverterTool - foreach($portablePdb in $portablePdbs) - { - # First check if corresponding dll exists - $dllOrExePath = $portablePdb -replace ".pdb",".dll" + foreach ($portablePdb in $portablePdbs) { + # First check if corresponding dll exists + $dllOrExePath = $portablePdb -replace ".pdb", ".dll" - if(!(Test-Path -path $dllOrExePath)) - { + if (!(Test-Path -path $dllOrExePath)) { # If no corresponding dll found, check if exe exists - $dllOrExePath = $portablePdb -replace ".pdb",".exe" + $dllOrExePath = $portablePdb -replace ".pdb", ".exe" - if(!(Test-Path -path $dllOrExePath)) - { + if (!(Test-Path -path $dllOrExePath)) { throw "Unable to locate dll/exe corresponding to $portablePdb" - } + } } - $fullpdb = $portablePdb -replace ".pdb",".pdbfull" + $fullpdb = $portablePdb -replace ".pdb", ".pdbfull" Write-Verbose "$pdbConverter $dll /pdb $portablePdb /out $fullpdb" & $pdbConverter $dllOrExePath /pdb $portablePdb /out $fullpdb