diff --git a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj index 2814dca8ca..3d620e060c 100644 --- a/playground/TestPlatform.Playground/TestPlatform.Playground.csproj +++ b/playground/TestPlatform.Playground/TestPlatform.Playground.csproj @@ -36,7 +36,7 @@ - + diff --git a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj index 0152be5498..ecc29fbadf 100644 --- a/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj @@ -6,7 +6,7 @@ 15.0.0 - net451 + net462 Microsoft.TestPlatform.E2ETest Exe win7-x64 @@ -19,7 +19,7 @@ PreserveNewest - + diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj index 356b39a61c..3e4941ffc2 100644 --- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj +++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj @@ -1,7 +1,7 @@ - net451 + net462 Microsoft.TestPlatform.TranslationLayer.E2ETest Exe win7-x64 @@ -14,7 +14,7 @@ PreserveNewest - + diff --git a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json index 228592a185..09dce23302 100644 --- a/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json +++ b/samples/Microsoft.TestPlatform.TranslationLayer.E2ETest/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "Microsoft.TestPlatform.TranslationLayer.E2ETest": { "commandName": "Project", - "commandLineArgs": "--runner:\"bin\\Debug\\net451\\win7-x64\\vstest.console.exe\" --testadapterpath:\"bin\\Debug\\net451\\win7-x64\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll\" --testassembly:\"bin\\Debug\\net451\\win7-x64\\UnitTestProject.dll\"" + "commandLineArgs": "--runner:\"bin\\Debug\\net462\\win7-x64\\vstest.console.exe\" --testadapterpath:\"bin\\Debug\\net462\\win7-x64\\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll\" --testassembly:\"bin\\Debug\\net462\\win7-x64\\UnitTestProject.dll\"" } } -} \ No newline at end of file +} diff --git a/samples/UnitTestProject/UnitTestProject.csproj b/samples/UnitTestProject/UnitTestProject.csproj index fc06eb77ff..b4c0478330 100644 --- a/samples/UnitTestProject/UnitTestProject.csproj +++ b/samples/UnitTestProject/UnitTestProject.csproj @@ -2,9 +2,9 @@ - netcoreapp1.0;net451 + netcoreapp1.0;net462 netcoreapp3.1 - Exe + Exe UnitTestProject false false @@ -20,7 +20,7 @@ - + diff --git a/scripts/build.ps1 b/scripts/build.ps1 index c2a4fee981..c9e9cce891 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -79,8 +79,7 @@ $TPB_TestAssets = Join-Path $env:TP_ROOT_DIR "test\TestAssets\" $TPB_Solution = Join-Path $env:TP_ROOT_DIR "TestPlatform.sln" $TPB_TestAssets_Solution = Join-Path $TPB_TestAssets "TestAssets.sln" $TPB_TestAssets_CILAssets = Join-Path $TPB_TestAssets "CILProject\CILProject.proj" -$TPB_TargetFramework45 = "net45" -$TPB_TargetFramework451 = "net451" +$TPB_TargetFramework462 = "net462" $TPB_TargetFramework472 = "net472" $TPB_TargetFramework48 = "net48" $TPB_TargetFrameworkCore10 = "netcoreapp1.0" @@ -176,22 +175,22 @@ function Invoke-TestAssetsBuild { $vstestConsoleVersionProperties = @( "VSTestConsoleLatestVersion" "VSTestConsoleLatestPreviewVersion" - "VSTestConsoleLatestStableVersion" - "VSTestConsoleRecentStableVersion" + "VSTestConsoleLatestStableVersion" + "VSTestConsoleRecentStableVersion" "VSTestConsoleMostDownloadedVersion" "VSTestConsolePreviousStableVersion" "VSTestConsoleLegacyStableVersion" ) foreach ($propertyName in $vstestConsoleVersionProperties) { - if ("VSTestConsoleLatestVersion" -eq $propertyName) { + if ("VSTestConsoleLatestVersion" -eq $propertyName) { # NETTestSdkVersion has the version of the locally built package. $vsTestConsoleVersion = $dependenciesXml.Project.PropertyGroup."NETTestSdkVersion" } - else { + else { $vsTestConsoleVersion = $dependenciesXml.Project.PropertyGroup.$propertyName } - + # The command line tool does not like the package ranges. $vsTestConsoleVersion = $vsTestConsoleVersion -replace "(\[|\])" if (-not $vsTestConsoleVersion) { @@ -220,40 +219,40 @@ function Invoke-TestAssetsBuild { "MSTestFrameworkPreviousStableVersion" "MSTestFrameworkLegacyStableVersion" ) - + foreach ($project in $projects) { # We use the same version properties for NET.Test.Sdk as for VSTestConsole, for now. foreach ($sdkPropertyName in $vstestConsoleVersionProperties) { - if ("VSTestConsoleLatestVersion" -eq $sdkPropertyName) { + if ("VSTestConsoleLatestVersion" -eq $sdkPropertyName) { # NETTestSdkVersion has the version of the locally built package. $netTestSdkVersion = $dependenciesXml.Project.PropertyGroup."NETTestSdkVersion" } - else { + else { $netTestSdkVersion = $dependenciesXml.Project.PropertyGroup.$sdkPropertyName } - + if (-not $netTestSdkVersion) { throw "NetTestSdkVersion for $sdkPropertyName is empty." } - - $dirNetTestSdkVersion = $netTestSdkVersion -replace "\[|\]" + + $dirNetTestSdkVersion = $netTestSdkVersion -replace "\[|\]" $dirNetTestSdkPropertyName = $sdkPropertyName -replace "Framework" -replace "Version" -replace "VSTestConsole", "NETTestSdk" - - foreach ($propertyName in $msTestVersionProperties) { + + foreach ($propertyName in $msTestVersionProperties) { $mstestVersion = $dependenciesXml.Project.PropertyGroup.$propertyName if (-not $mstestVersion) { throw "MSTestVersion for $propertyName is empty." } - - $dirMSTestVersion = $mstestVersion -replace "\[|\]" + + $dirMSTestVersion = $mstestVersion -replace "\[|\]" $dirMSTestPropertyName = $propertyName -replace "Framework" -replace "Version" Invoke-Exe $dotnetExe -Arguments "build $project --configuration $TPB_Configuration -v:minimal -p:CIBuild=$TPB_CIBuild -p:LocalizedBuild=$TPB_LocalizedBuild -p:MSTestFrameworkVersion=$mstestVersion -p:MSTestAdapterVersion=$mstestVersion -p:NETTestSdkVersion=$netTestSdkVersion -p:BaseOutputPath=""bin\$dirNetTestSdkPropertyName-$dirNetTestSdkVersion\$dirMSTestPropertyName-$dirMSTestVersion\\"" -bl:""$env:TP_OUT_DIR\log\$Configuration\perm.binlog""" } } } - # end + # end } finally { Write-Log ".. .. Build: Source: $TPB_TestAssets_Solution -- remove NuGet source" @@ -295,10 +294,8 @@ function Publish-PatchedDotnet { function Publish-Package { $timer = Start-Timer Write-Log "Publish-Package: Started." - $fullCLRPackage451Dir = Get-FullCLRPackageDirectory - $fullCLRPackage45Dir = Get-FullCLRPackageDirectory45 + $net462PackageDir = Get-FullCLR462PackageDirectory $uap100PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkUap100"); - $net45PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\net45"); $netstandard10PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS10"); $netstandard13PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS13"); $netstandard20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFrameworkNS20"); @@ -310,7 +307,7 @@ function Publish-Package { $testHostx86Project = Join-Path $env:TP_ROOT_DIR "src\testhost.x86\testhost.x86.csproj" $testHostarm64Project = Join-Path $env:TP_ROOT_DIR "src\testhost.arm64\testhost.arm64.csproj" - $testhostFullPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFramework451\$TPB_TargetRuntime") + $testhostFullPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFramework462\$TPB_TargetRuntime") $testhostCore20PackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20") $testhostCore20PackageX64Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X64_Runtime") $testhostCore20PackageX86Dir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore20\$TPB_X86_Runtime") @@ -333,7 +330,7 @@ function Publish-Package { $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj" Write-Log "Package: Publish src\package\package\package.csproj" - Publish-PackageInternal $packageProject $TPB_TargetFramework451 $fullCLRPackage451Dir + Publish-PackageInternal $packageProject $TPB_TargetFramework462 $net462PackageDir Publish-PackageInternal $packageProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir @@ -342,23 +339,23 @@ function Publish-Package { Write-Log "Package: Publish src\vstest.console\vstest.console.csproj" # We build vstest.console.arm64.exe before building vstest.console.exe and we put it in the same folder, so they end up shipping together. - Publish-PackageWithRuntimeInternal $vstestConsoleProject $TPB_TargetFramework451 $TPB_ARM64_Runtime false $fullCLRPackage451Dir - Publish-PackageWithRuntimeInternal $vstestConsoleProject $TPB_TargetFramework451 $TPB_X64_Runtime false $fullCLRPackage451Dir + Publish-PackageWithRuntimeInternal $vstestConsoleProject $TPB_TargetFramework462 $TPB_ARM64_Runtime false $net462PackageDir + Publish-PackageWithRuntimeInternal $vstestConsoleProject $TPB_TargetFramework462 $TPB_X64_Runtime false $net462PackageDir Publish-PackageInternal $vstestConsoleProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir Write-Log "Package: Publish src\SettingsMigrator\SettingsMigrator.csproj" - Publish-PackageInternal $settingsMigratorProject $TPB_TargetFramework451 $fullCLRPackage451Dir + Publish-PackageInternal $settingsMigratorProject $TPB_TargetFramework462 $net462PackageDir Write-Log "Package: Publish src\datacollector\datacollector.csproj" # We build datacollector.arm64.exe before building datacollector.exe and we put it in the same folder, so they end up shipping together. - Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_ARM64_Runtime false $fullCLRPackage451Dir - Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_X64_Runtime false $fullCLRPackage451Dir + Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_ARM64_Runtime false $net462PackageDir + Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_X64_Runtime false $net462PackageDir Publish-PackageInternal $dataCollectorProject $TPB_TargetFrameworkCore20 $coreCLR20PackageDir ################################################################################ # Publish testhost Write-Log "Package: Publish testhost\testhost.csproj" - Publish-PackageInternal $testHostProject $TPB_TargetFramework451 $testhostFullPackageDir + Publish-PackageInternal $testHostProject $TPB_TargetFramework462 $testhostFullPackageDir Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore20 $testhostCore20PackageDir Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore10 $testhostCore10PackageDir Publish-PackageInternal $testHostProject $TPB_TargetFrameworkCore20 $testhostUapPackageDir @@ -366,34 +363,29 @@ function Publish-Package { 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-PackageInternal $testHostx86Project $TPB_TargetFramework462 $testhostFullPackageDir Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore20 $TPB_X86_Runtime false $testhostCore20PackageTempX86Dir Publish-PackageWithRuntimeInternal $testHostx86Project $TPB_TargetFrameworkCore10 $TPB_X86_Runtime true $testhostCore10PackageTempX86Dir Write-Log "Package: Publish testhost.arm64\testhost.arm64.csproj" - Publish-PackageInternal $testHostarm64Project $TPB_TargetFramework451 $testhostFullPackageDir + Publish-PackageInternal $testHostarm64Project $TPB_TargetFramework462 $testhostFullPackageDir Publish-PackageWithRuntimeInternal $testHostarm64Project $TPB_TargetFrameworkCore20 $TPB_ARM64_Runtime false $testhostCore20PackageTempARM64Dir Publish-PackageWithRuntimeInternal $testHostarm64Project $TPB_TargetFrameworkCore10 $TPB_ARM64_Runtime true $testhostCore10PackageTempARM64Dir - # 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 the .NET multitarget testhost exes to destination folder (except for net462 which is the default) + foreach ($tfm in "net47;net471;net472;net48" -split ";") { + # testhost 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 ";") { + # testhost.x86 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 multitarget testhost.arm64 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 $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.exe" $testhostFullPackageDir\testhost.$tfm.arm64.exe -Force - Copy-Item "$(Split-Path $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.pdb" $testhostFullPackageDir\testhost.$tfm.arm64.pdb -Force - Copy-Item "$(Split-Path $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.exe.config" $testhostFullPackageDir\testhost.$tfm.arm64.exe.config -Force + # testhost.arm64 + Copy-Item "$(Split-Path $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.exe" $testhostFullPackageDir\testhost.$tfm.arm64.exe -Force + Copy-Item "$(Split-Path $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.pdb" $testhostFullPackageDir\testhost.$tfm.arm64.pdb -Force + Copy-Item "$(Split-Path $testHostarm64Project)\bin\$TPB_Configuration\$tfm\$TPB_ARM64_Runtime\testhost.$tfm.arm64.exe.config" $testhostFullPackageDir\testhost.$tfm.arm64.exe.config -Force } # Copy the .NET core x86, x64 and arm64 testhost exes from tempPublish to required folder @@ -430,9 +422,9 @@ function Publish-Package { # Copy over the Full CLR built datacollector package assemblies to the Core CLR package folder along with testhost Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_ARM64_Runtime false $fullDestDir Publish-PackageWithRuntimeInternal $dataCollectorProject $TPB_TargetFramework472 $TPB_X64_Runtime false $fullDestDir - - New-Item -ItemType directory -Path $fullCLRPackage451Dir -Force | Out-Null - Copy-Item $testhostFullPackageDir\* $fullCLRPackage451Dir -Force -Recurse + + New-Item -ItemType directory -Path $net462PackageDir -Force | Out-Null + Copy-Item $testhostFullPackageDir\* $net462PackageDir -Force -Recurse ################################################################################ # Publish Microsoft.TestPlatform.ObjectModel @@ -442,8 +434,7 @@ function Publish-Package { Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.ObjectModel\bin\$TPB_Configuration") ` -files @{ - $TPB_TargetFramework45 = $fullCLRPackage45Dir # net45 - $TPB_TargetFramework451 = $fullCLRPackage451Dir # net451 + $TPB_TargetFramework462 = $net462PackageDir # net462 $TPB_TargetFrameworkCore10 = $coreCLR10PackageDir # netcoreapp1.0 $TPB_TargetFrameworkCore20 = $coreCLR20PackageDir # netcoreapp2.1 $TPB_TargetFrameworkNS10 = $netstandard10PackageDir # netstandard1_0 @@ -461,8 +452,7 @@ function Publish-Package { # Publish Microsoft.TestPlatform.PlatformAbstractions Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.PlatformAbstractions\bin\$TPB_Configuration") ` -files @{ - $TPB_TargetFramework45 = $fullCLRPackage45Dir # net45 - $TPB_TargetFramework451 = $fullCLRPackage451Dir # net451 + $TPB_TargetFramework462 = $net462PackageDir # net462 $TPB_TargetFrameworkCore20 = $coreCLR20PackageDir # netcoreapp2.1 $TPB_TargetFrameworkNS10 = $netstandard10PackageDir # netstandard1_0 $TPB_TargetFrameworkNS13 = $netstandard13PackageDir # netstandard1_3 @@ -478,8 +468,7 @@ function Publish-Package { # Publish Microsoft.TestPlatform.CoreUtilities Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.CoreUtilities\bin\$TPB_Configuration") ` -files @{ - $TPB_TargetFramework45 = $fullCLRPackage45Dir # net45 - $TPB_TargetFramework451 = $fullCLRPackage451Dir # net451 + $TPB_TargetFramework462 = $net462PackageDir # net462 $TPB_TargetFrameworkNS10 = $netstandard10PackageDir # netstandard1_0 $TPB_TargetFrameworkNS13 = $netstandard13PackageDir # netstandard1_3 $TPB_TargetFrameworkNS20 = $netstandard20PackageDir # netstandard2_0 @@ -495,11 +484,10 @@ function Publish-Package { # Publish Microsoft.TestPlatform.AdapterUtilities Copy-Bulk -root (Join-Path $env:TP_ROOT_DIR "src\Microsoft.TestPlatform.AdapterUtilities\bin\$TPB_Configuration") ` -files @{ - # "net20" = $net20PackageDir # net20 - "net45/any" = $net45PackageDir # $net4 - $TPB_TargetFrameworkNS10 = $netstandard10PackageDir # netstandard1_0 - $TPB_TargetFrameworkNS20 = $netstandard20PackageDir # netstandard2_0 - $TPB_TargetFrameworkUap100 = $uap100PackageDir # uap10.0 + "$TPB_TargetFramework462/any" = $net462PackageDir # net462 + $TPB_TargetFrameworkNS10 = $netstandard10PackageDir # netstandard1_0 + $TPB_TargetFrameworkNS20 = $netstandard20PackageDir # netstandard2_0 + $TPB_TargetFrameworkUap100 = $uap100PackageDir # uap10.0 } ################################################################################ @@ -521,7 +509,7 @@ function Publish-Package { # Copy over the logger assemblies to the Extensions folder. $extensions_Dir = "Extensions" - $fullCLRExtensionsDir = Join-Path $fullCLRPackage451Dir $extensions_Dir + $fullCLRExtensionsDir = Join-Path $net462PackageDir $extensions_Dir $coreCLRExtensionsDir = Join-Path $coreCLR20PackageDir $extensions_Dir # Create an extensions directory. @@ -536,8 +524,8 @@ function Publish-Package { ) foreach ($file in $loggers) { - Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force" - Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force + Write-Verbose "Move-Item $net462PackageDir\$file $fullCLRExtensionsDir -Force" + Move-Item $net462PackageDir\$file $fullCLRExtensionsDir -Force Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force" Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force @@ -545,9 +533,9 @@ function Publish-Package { # Move logger resource dlls if ($TPB_LocalizedBuild) { - Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" + Move-Loc-Files $net462PackageDir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" - Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" + Move-Loc-Files $net462PackageDir $fullCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.resources.dll" } @@ -601,7 +589,7 @@ function Publish-Package { # Copy Event Log Datacollector to Extensions folder. $eventLogDataCollector = Join-Path $env:TP_ROOT_DIR "src\DataCollectors\Microsoft.TestPlatform.Extensions.EventLogCollector\bin\$TPB_Configuration" - $eventLogDataCollectorNetFull = Join-Path $eventLogDataCollector $TPB_TargetFramework451 + $eventLogDataCollectorNetFull = Join-Path $eventLogDataCollector $TPB_TargetFramework462 Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.dll $fullCLRExtensionsDir -Force Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.pdb $fullCLRExtensionsDir -Force Copy-Item $eventLogDataCollectorNetFull\Microsoft.TestPlatform.Extensions.EventLogCollector.dll $coreCLRExtensionsDir -Force @@ -624,8 +612,8 @@ function Publish-Package { # If there are some dependencies for the TestHostRuntimeProvider assemblies, those need to be moved too. $runtimeproviders = @("Microsoft.TestPlatform.TestHostRuntimeProvider.dll", "Microsoft.TestPlatform.TestHostRuntimeProvider.pdb") foreach ($file in $runtimeproviders) { - Write-Verbose "Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force" - Move-Item $fullCLRPackage451Dir\$file $fullCLRExtensionsDir -Force + Write-Verbose "Move-Item $net462PackageDir\$file $fullCLRExtensionsDir -Force" + Move-Item $net462PackageDir\$file $fullCLRExtensionsDir -Force Write-Verbose "Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force" Move-Item $coreCLR20PackageDir\$file $coreCLRExtensionsDir -Force @@ -633,23 +621,23 @@ function Publish-Package { # Move TestHostRuntimeProvider resource dlls if ($TPB_LocalizedBuild) { - Move-Loc-Files $fullCLRPackage451Dir $fullCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" + Move-Loc-Files $net462PackageDir $fullCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" Move-Loc-Files $coreCLR20PackageDir $coreCLRExtensionsDir "Microsoft.TestPlatform.TestHostRuntimeProvider.resources.dll" } # Copy dependency of Microsoft.TestPlatform.TestHostRuntimeProvider $newtonsoftJsonVersion = ([xml](Get-Content $env:TP_ROOT_DIR\eng\Versions.props)).Project.PropertyGroup.NewtonsoftJsonVersion $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\$newtonsoftJsonVersion\lib\net45\Newtonsoft.Json.dll" - Write-Verbose "Copy-Item $newtonsoft $fullCLRPackage451Dir -Force" - Copy-Item $newtonsoft $fullCLRPackage451Dir -Force + Write-Verbose "Copy-Item $newtonsoft $net462PackageDir -Force" + Copy-Item $newtonsoft $net462PackageDir -Force $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\$newtonsoftJsonVersion\lib\netstandard1.0\Newtonsoft.Json.dll" Write-Verbose "Copy-Item $newtonsoft $coreCLR20PackageDir -Force" Copy-Item $newtonsoft $coreCLR20PackageDir -Force # Copy .NET Standard CPP Test adapter - New-Item "$fullCLRPackage451Dir\TestHost" -ItemType Directory -Force | Out-Null - $fullCLRTestHostDir = "$fullCLRPackage451Dir\TestHost" + New-Item "$net462PackageDir\TestHost" -ItemType Directory -Force | Out-Null + $fullCLRTestHostDir = "$net462PackageDir\TestHost" $testPlatformRemoteExternalsVersion = ([xml](Get-Content "$env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props")).Project.PropertyGroup.TestPlatformRemoteExternalsVersion $testPlatformRemoteExternalsSourceDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.Internal.TestPlatform.Remote\$testPlatformRemoteExternalsVersion\tools\netstandard\Extensions\*" @@ -715,20 +703,20 @@ function Publish-Tests { Write-Log "Publish-Tests: Started." # 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" + $fullCLRTestDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework462" + $fullCLRPerfTestAssetDir = Join-Path $env:TP_TESTARTIFACTS "$TPB_Configuration\$TPB_TargetFramework462\TestAssets\PerfAssets" $mstest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "MSTest10kPassing" $mstest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\MSTest10kPassing" - Publish-PackageInternal $mstest10kPerfProject $TPB_TargetFramework451 $mstest10kPerfProjectDir + Publish-PackageInternal $mstest10kPerfProject $TPB_TargetFramework462 $mstest10kPerfProjectDir $nunittest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "NUnit10kPassing" $nunittest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\NUnit10kPassing" - Publish-PackageInternal $nunittest10kPerfProject $TPB_TargetFramework451 $nunittest10kPerfProjectDir + Publish-PackageInternal $nunittest10kPerfProject $TPB_TargetFramework462 $nunittest10kPerfProjectDir $xunittest10kPerfProjectDir = Join-Path $fullCLRPerfTestAssetDir "XUnit10kPassing" $xunittest10kPerfProject = Join-Path $env:TP_ROOT_DIR "test\TestAssets\PerfAssets\XUnit10kPassing" - Publish-PackageInternal $xunittest10kPerfProject $TPB_TargetFramework451 $xunittest10kPerfProjectDir + Publish-PackageInternal $xunittest10kPerfProject $TPB_TargetFramework462 $xunittest10kPerfProjectDir $testPerfProject = Join-Path $env:TP_ROOT_DIR "test\Microsoft.TestPlatform.PerformanceTests" Publish-PackageInternal $testPerfProject $TPB_TargetFramework48 $fullCLRTestDir @@ -771,7 +759,7 @@ function Publish-VsixPackage { Write-Log "Publish-VsixPackage: Started." $timer = Start-Timer - $packageDir = Get-FullCLRPackageDirectory + $packageDir = Get-FullCLR462PackageDirectory $extensionsPackageDir = Join-Path $packageDir "Extensions" $testImpactComComponentsDir = Join-Path $extensionsPackageDir "TestImpact" $legacyTestImpactComComponentsDir = Join-Path $extensionsPackageDir "V1\TestImpact" @@ -782,7 +770,7 @@ function Publish-VsixPackage { $interopExternalsVersion = ([xml](Get-Content $env:TP_ROOT_DIR\scripts\build\TestPlatform.Dependencies.props)).Project.PropertyGroup.InteropExternalsVersion # Copy Microsoft.VisualStudio.IO to root - $codeCoverageIOPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.CodeCoverage.IO\$codeCoverageExternalsVersion\lib\$TPB_TargetFramework451" + $codeCoverageIOPackageDirectory = Join-Path $env:TP_PACKAGES_DIR "Microsoft.CodeCoverage.IO\$codeCoverageExternalsVersion\lib\net451" Copy-Item $codeCoverageIOPackageDirectory\Microsoft.CodeCoverage.IO.dll $packageDir -Force if ($TPB_LocalizedBuild) { Copy-Loc-Files $codeCoverageIOPackageDirectory $packageDir "Microsoft.CodeCoverage.IO.resources.dll" @@ -828,7 +816,7 @@ function Publish-VsixPackage { Copy-Item -Recurse $comComponentsDirectoryTIA\* $legacyTestImpactComComponentsDir -Force Copy-Item (Join-Path $env:TP_PACKAGE_PROJ_DIR "ThirdPartyNotices.txt") $packageDir -Force - + Write-Log "Publish-VsixPackage: Complete. {$(Get-ElapsedTime($timer))}" } @@ -905,17 +893,17 @@ function Create-NugetPackages { "Microsoft.TestPlatform.Build.csproj" ) - $dependencies = @( + $dependencies = @( "TestPlatform.Build.nuspec", "TestPlatform.CLI.nuspec", ## .target and .props Files - "Microsoft.NET.Test.Sdk.props", + "Microsoft.NET.Test.Sdk.props", "Microsoft.CodeCoverage.props", "Microsoft.CodeCoverage.targets", - + ## Content Directories - "netcoreapp", + "netcoreapp", "netfx" ) @@ -1047,8 +1035,8 @@ function Copy-CodeCoverage-Package-Artifacts { function Copy-PackageItems($packageName) { # Packages published separately are copied into their own artifacts directory - # E.g. src\Microsoft.TestPlatform.ObjectModel\bin\Debug\net451\* is copied - # to artifacts\Debug\Microsoft.TestPlatform.ObjectModel\net451 + # E.g. src\Microsoft.TestPlatform.ObjectModel\bin\Debug\net462\* is copied + # to artifacts\Debug\Microsoft.TestPlatform.ObjectModel\net462 $binariesDirectory = [System.IO.Path]::Combine($env:TP_ROOT_DIR, "src", "$packageName", "bin", "$TPB_Configuration") $binariesDirectory = $(Join-Path $binariesDirectory "*") $publishDirectory = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$packageName") @@ -1087,12 +1075,8 @@ function Get-DotNetPath { return $dotnetPath } -function Get-FullCLRPackageDirectory { - return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFramework451\$TPB_TargetRuntime") -} - -function Get-FullCLRPackageDirectory45 { - return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFramework45\$TPB_TargetRuntime") +function Get-FullCLR462PackageDirectory { + return $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\$TPB_TargetFramework462\$TPB_TargetRuntime") } function Get-CoreCLR20PackageDirectory { @@ -1191,7 +1175,7 @@ function Build-SpecificProjects { Write-Log "Build-SpecificProjects: Started for pattern: $ProjectNamePatterns" # FrameworksAndOutDirs format ("", ""). $FrameworksAndOutDirs = ( - ("net451", "net451\win7-x64"), + ("net462", "net462\win7-x64"), ("netstandard1.0", "netstandard1.0"), ("netstandard1.3", "netstandard1.3"), ("netstandard2.0", "netcoreapp2.1"), @@ -1280,7 +1264,7 @@ if ($Force -or $Steps -contains "Publish") { Publish-VsixPackage } -if ($Force -or $Steps -contains "Pack") { +if ($Force -or $Steps -contains "Pack") { Create-VsixPackage Create-NugetPackages } diff --git a/scripts/build.sh b/scripts/build.sh index 329a71cdfd..d105eecb6f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -140,7 +140,7 @@ DOTNET_CLI_VERSION=$_ReadGlobalVersion # TPB_Solution="TestPlatform.sln" TPB_Build_From_Source_Solution="TestPlatform_BuildFromSource.sln" -TPB_TargetFramework="net451" +TPB_TargetFramework="net462" TPB_TargetFrameworkCore="netcoreapp2.1" TPB_Configuration=$CONFIGURATION TPB_TargetRuntime=$TARGET_RUNTIME @@ -340,8 +340,8 @@ function publish_package() mkdir -p $testhost if [[ $TP_USE_REPO_API = 0 ]]; then - cp -r src/testhost/bin/$TPB_Configuration/net451/win7-x64/* $testhost - cp -r src/testhost.x86/bin/$TPB_Configuration/net451/win7-x86/* $testhost + cp -r src/testhost/bin/$TPB_Configuration/net462/win7-x64/* $testhost + cp -r src/testhost.x86/bin/$TPB_Configuration/net462/win7-x86/* $testhost else cp -r src/testhost/bin/$TPB_Configuration/net6.0/* $testhost cp -r src/testhost.x86/bin/$TPB_Configuration/net6.0/* $testhost diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 1f0c83c63b..fcefff2c1b 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -15,8 +15,8 @@ - 2.3.0-preview-20220613-02 - 2.3.0-preview-20220613-02 + 2.3.0-preview-20220711-02 + 2.3.0-preview-20220711-02 1.0.3-preview 2.3.1 @@ -65,7 +65,7 @@ 17.3.32621.448 17.3.32621.448 17.3.32621.448 - + 17.0.0-beta.21179.1 16.0.461 $(MicrosoftBuildPackageVersion) diff --git a/scripts/perf/perf.ps1 b/scripts/perf/perf.ps1 index 348a738ef9..754c6b222c 100644 --- a/scripts/perf/perf.ps1 +++ b/scripts/perf/perf.ps1 @@ -11,7 +11,7 @@ Param( [System.String] $TargetRuntime = "win7-x64", [Parameter(Mandatory=$false)] - [ValidateSet("netcoreapp2.1", "net451", "net452")] + [ValidateSet("netcoreapp2.1", "net462")] [Alias("f")] [System.String] $TargetFramework, @@ -39,12 +39,12 @@ $env:TP_OUT_DIR = Join-Path $env:TP_ROOT_DIR "artifacts" # # Test configuration # -$TPT_TargetFrameworkFullCLR = "net451" +$TPT_TargetFrameworkFullCLR = "net462" $TPT_TargetFramework20Core = "netcoreapp2.1" Write-Verbose "Setup build configuration." $Script:TPT_Configuration = $Configuration $Script:TPT_SourceFolders = @(Join-Path $env:TP_ROOT_DIR "test\TestAssets") -$Script:TPT_TargetFrameworks =@($TPT_TargetFramework20Core, $TPT_TargetFrameworkFullCLR, "net452") +$Script:TPT_TargetFrameworks =@($TPT_TargetFramework20Core, $TPT_TargetFrameworkFullCLR) $Script:TPT_TargetFramework = $TargetFramework $Script:TPT_TargetRuntime = $TargetRuntime $Script:TPT_Pattern = $Pattern diff --git a/scripts/test.ps1 b/scripts/test.ps1 index c6e30a6113..75c580b103 100644 --- a/scripts/test.ps1 +++ b/scripts/test.ps1 @@ -94,7 +94,7 @@ $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR # # Test configuration # -$TPT_TargetFrameworkNet451 = "net451" +$TPT_TargetFrameworkNet462 = "net462" $TPT_TargetFrameworkNet48 = "net48" $TPT_TargetFrameworkCore21 = "netcoreapp2.1" $TPT_TargetFrameworkNet60 = "net6.0" @@ -237,7 +237,7 @@ function Invoke-Test { $vstestConsoleFileName = "vstest.console.exe" $targetRunTime = $Script:TPT_TargetRuntime - $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkNet451 $targetRuntime) $vstestConsoleFileName + $vstestConsolePath = Join-Path (Get-PackageDirectory $TPT_TargetFrameworkNet462 $targetRuntime) $vstestConsoleFileName } if (!(Test-Path $vstestConsolePath)) diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index 458d975938..fea60c54c5 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -13,14 +13,14 @@ function Verify-Nuget-Packages($packageDirectory, $version) Write-Log "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ "Microsoft.CodeCoverage" = 57; - "Microsoft.NET.Test.Sdk" = 27; - "Microsoft.TestPlatform" = 623; + "Microsoft.NET.Test.Sdk" = 24; + "Microsoft.TestPlatform" = 599; "Microsoft.TestPlatform.Build" = 21; - "Microsoft.TestPlatform.CLI" = 426; + "Microsoft.TestPlatform.CLI" = 498; "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; - "Microsoft.TestPlatform.ObjectModel" = 238; + "Microsoft.TestPlatform.ObjectModel" = 209; "Microsoft.TestPlatform.AdapterUtilities" = 62; - "Microsoft.TestPlatform.Portable" = 646; + "Microsoft.TestPlatform.Portable" = 598; "Microsoft.TestPlatform.TestHost" = 208; "Microsoft.TestPlatform.TranslationLayer" = 123; "Microsoft.TestPlatform.Internal.Uwp" = 86; @@ -64,7 +64,7 @@ function Verify-Nuget-Packages($packageDirectory, $version) } } - if ($errors) { + if ($errors) { Write-Error "There are $($errors.Count) errors:`n$($errors -join "`n")" } diff --git a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj index bea0257eeb..22f83286a3 100644 --- a/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj +++ b/src/DataCollectors/DumpMinitool.arm64/DumpMinitool.arm64.csproj @@ -6,7 +6,7 @@ - net451 + net462 net6.0 AnyCPU false @@ -15,7 +15,7 @@ win10-arm64 false - + @@ -26,6 +26,6 @@ - + diff --git a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj index b4a2538573..0b9af2c937 100644 --- a/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj +++ b/src/DataCollectors/DumpMinitool.x86/DumpMinitool.x86.csproj @@ -6,7 +6,7 @@ - net451 + net462 net6.0 AnyCPU true diff --git a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj index c8c2eaae8c..193cdc7331 100644 --- a/src/DataCollectors/DumpMinitool/DumpMinitool.csproj +++ b/src/DataCollectors/DumpMinitool/DumpMinitool.csproj @@ -6,7 +6,7 @@ - net451 + net462 net6.0 AnyCPU false 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 f9cda2f89a..d70c335c9c 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 @@ -6,7 +6,7 @@ Microsoft.TestPlatform.Extensions.EventLogCollector - net451 + net462 net6.0 false true diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net451/PublicAPI.Shipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/DataCollectors/Microsoft.TestPlatform.Extensions.EventLogCollector/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs index 39c300fe43..ab47587eb3 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs +++ b/src/Microsoft.TestPlatform.AdapterUtilities/ManagedNameUtilities/ManagedNameHelper.Reflection.cs @@ -5,9 +5,7 @@ using System; using System.Globalization; -#if !NET20 using System.Linq; -#endif using System.Reflection; using System.Text; diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index f13e7bc8fe..db394bd085 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -5,7 +5,7 @@ - netstandard1.0;netstandard2.0;net45 + netstandard1.0;netstandard2.0;net462 $(TargetFrameworks);uap10.0 net6.0 Microsoft.TestPlatform.AdapterUtilities @@ -24,11 +24,11 @@ .NETFramework - v4.5.1 + v4.6.2 false - + any false diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj index e100e5c959..691cfe18d0 100644 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Client - netstandard2.0;net451 + netstandard2.0;net462 net6.0 false @@ -24,7 +24,7 @@ true - + @@ -54,8 +54,5 @@ - - - diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Client/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.Client/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Client/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.Client/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj index 9c9018c74d..e7c93252e9 100644 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Common - net6.0;netstandard2.0;netstandard1.3;net451 + net6.0;netstandard2.0;netstandard1.3;net462 net6.0 false true @@ -17,7 +17,7 @@ - + diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Common/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.Common/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Common/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.Common/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj index ba888529f8..6bf95f4807 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -5,7 +5,7 @@ Microsoft.TestPlatform.CommunicationUtilities - net6.0;netstandard2.0;netstandard1.3;net451 + net6.0;netstandard2.0;netstandard1.3;net462 net6.0 false @@ -20,7 +20,7 @@ $(JsonNetVersion) - + diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.CommunicationUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs index c55a499398..770eb71ba5 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs +++ b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs @@ -6,28 +6,16 @@ [assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] @@ -37,6 +25,7 @@ [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CommunicationUtilities, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.ObjectModel, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Common, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] +[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.Client, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("datacollector.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj index d348abafbc..4a252abfd1 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.CoreUtilities - net6.0;netstandard2.0;netstandard1.3;net451;net45 + net6.0;netstandard2.0;netstandard1.3;net462 false $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 @@ -23,14 +23,14 @@ .NETFramework - v4.5.1 + v4.6.2 - + @@ -39,7 +39,7 @@ - + diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt deleted file mode 100644 index 32196d81df..0000000000 --- a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Shipped.txt +++ /dev/null @@ -1,15 +0,0 @@ -#nullable enable -Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput -Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Write(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void -Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.WriteLine(string? message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level) -> void -Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void -static Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput.Instance.get -> Microsoft.VisualStudio.TestPlatform.Utilities.ConsoleOutput! -static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Error(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void -static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void -static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Information(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, System.ConsoleColor foregroundColor, string! format, params object?[]? args) -> void -static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Warning(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, bool appendPrefix, string! format, params object?[]? args) -> void -static Microsoft.VisualStudio.TestPlatform.Utilities.OutputExtensions.Write(this Microsoft.VisualStudio.TestPlatform.Utilities.IOutput! output, string! message, Microsoft.VisualStudio.TestPlatform.Utilities.OutputLevel level, System.ConsoleColor foregroundColor) -> void diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net45/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs index cdd135e2d6..d1097ebe8e 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/AttachmentsProcessing/TestRunAttachmentsProcessingManager.cs @@ -118,7 +118,7 @@ private async Task> ProcessAttachmentsAsync(string? ru var dataCollectorAttachmentsProcessors = _dataCollectorAttachmentsProcessorsFactory.Create(invokedDataCollector?.ToArray(), logger); for (int i = 0; i < dataCollectorAttachmentsProcessors.Length; i++) { - // We need to dispose the DataCollectorAttachmentProcessor to unload the AppDomain for net451 + // We need to dispose the DataCollectorAttachmentProcessor to unload the AppDomain for net462 using DataCollectorAttachmentProcessor dataCollectorAttachmentsProcessor = dataCollectorAttachmentsProcessors[i]; int attachmentsHandlerIndex = i + 1; diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs index 9689194297..296a849c7f 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs @@ -10,28 +10,16 @@ [assembly: InternalsVisibleTo("datacollector.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("datacollector.PlatformTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net48, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net48.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net452.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net46.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net461.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("testhost.net462.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net47.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net471.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] [assembly: InternalsVisibleTo("testhost.net472.arm64, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj index f3315934ec..d470a416cc 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.CrossPlatEngine - net6.0;netstandard2.0;netstandard1.3;net451 + net6.0;netstandard2.0;netstandard1.3;net462 net6.0 false @@ -28,7 +28,7 @@ - + diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.CrossPlatEngine/PublicAPI/net462/PublicAPI.Unshipped.txt 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 9780016e5c..25be4eb501 100644 --- a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/Microsoft.TestPlatform.Extensions.HtmlLogger.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger - netstandard2.0;net451 + netstandard2.0;net462 net6.0 false true @@ -15,7 +15,7 @@ - + diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.Extensions.HtmlLogger/PublicAPI/net462/PublicAPI.Unshipped.txt 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 22566329ba..54c0ae2e93 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -6,14 +6,14 @@ Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger - net6.0;netstandard2.0;net451 + net6.0;netstandard2.0;net462 net6.0 false - + diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.Extensions.TrxLogger/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj index 6566aac5c4..456beb6244 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -6,7 +6,7 @@ Microsoft.VisualStudio.TestPlatform.ObjectModel - net45;net451;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 + net462;netcoreapp2.1;netcoreapp1.0;netstandard2.0;netstandard1.3 $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 Microsoft.TestPlatform.ObjectModel @@ -26,7 +26,7 @@ - + diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt deleted file mode 100644 index 4019bb762c..0000000000 --- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Shipped.txt +++ /dev/null @@ -1,17 +0,0 @@ -#nullable enable -Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestCanceledException.TestCanceledException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.TestPlatformFormatException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.SettingsException.SettingsException(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage -Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.Dispose() -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.SuspendCodeCoverage.SuspendCodeCoverage() -> void -override Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter.TestPlatformFormatException.GetObjectData(System.Runtime.Serialization.SerializationInfo! info, System.Runtime.Serialization.StreamingContext context) -> void -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities) -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities) -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel (forwarded, contained in Microsoft.TestPlatform.CoreUtilities) -static Microsoft.VisualStudio.TestPlatform.ObjectModel.EqtTrace.TraceLevel.set -> void (forwarded, contained in Microsoft.TestPlatform.CoreUtilities) -static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.DoesReferencesAssembly(string! source, System.Reflection.AssemblyName! referenceAssembly) -> bool? -static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetFrameworkVersionAndArchitectureForSource(string! testSource) -> System.Collections.Generic.KeyValuePair -static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.GetReferencedAssemblies(string! source) -> string![]? -static Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities.AssemblyHelper.SetAppDomainFrameworkVersionBasedOnTestSource(System.AppDomainSetup! setup, string! testSource) -> void -static Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework.DefaultFramework.get -> Microsoft.VisualStudio.TestPlatform.ObjectModel.Framework! diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt deleted file mode 100644 index ab058de62d..0000000000 --- a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net451/PublicAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.CoreUtilities/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs index 40be3a5e2a..8ea7d31d22 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/TraitCollection.cs @@ -19,7 +19,7 @@ public class TraitCollection : IEnumerable internal const string TraitPropertyId = "TestObject.Traits"; private static readonly TestProperty TraitsProperty = TestProperty.Register( TraitPropertyId, -#if !NET451 +#if !NET462 // TODO: Fix this with proper resourcing for UWP and Win 8.1 Apps // Trying to access resources will throw "MissingManifestResourceException" percolated as "TypeInitialization" exception "Traits", diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index 6c50686456..edc0aedc74 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -7,7 +7,7 @@ Microsoft.TestPlatform.PlatformAbstractions Microsoft.TestPlatform.PlatformAbstractions - net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net6.0 + net462;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0;net6.0 $(TargetFrameworks);uap10.0;netstandard1.0 net6.0 false @@ -36,7 +36,7 @@ - + diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt deleted file mode 100644 index ab058de62d..0000000000 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt deleted file mode 100644 index 0d7e7074c9..0000000000 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Shipped.txt +++ /dev/null @@ -1,26 +0,0 @@ -#nullable enable -Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.IPlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.InitializeTrace(string? customLogFile, Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel platformTraceLevel) -> bool -Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.MapPlatformTraceToTrace(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel traceLevel) -> System.Diagnostics.TraceLevel -Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupListener(System.Diagnostics.TraceListener? listener) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.SetupRemoteEqtTraceListeners(System.AppDomain? childDomain) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.WriteLine(Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformTraceLevel level, string? message) -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace -Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.RemoteEqtTrace() -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel -Microsoft.VisualStudio.TestPlatform.ObjectModel.RemoteEqtTrace.TraceLevel.set -> void -Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener -Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.RollingFileTraceListener(string! fileName, string! name, int rollSizeKB) -> void -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.Dispose(bool disposing) -> void -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformAssemblyResolver.~PlatformAssemblyResolver() -> void -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformThread.Run(System.Action? action, Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.PlatformApartmentState apartmentState, bool waitForCompletion) -> void -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.LaunchProcess(string! processPath, string? arguments, string? workingDirectory, System.Collections.Generic.IDictionary? envVariables, System.Action? errorCallback, System.Action? exitCallBack, System.Action? outputCallBack) -> object! -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessHelper.SetExitCallback(int processId, System.Action? callbackAction) -> void -Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions -override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.Dispose(bool disposing) -> void -override Microsoft.VisualStudio.TestPlatform.ObjectModel.RollingFileTraceListener.WriteLine(string? message) -> void -static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.LogFile.get -> string? -static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.get -> System.Diagnostics.TraceLevel -static Microsoft.VisualStudio.TestPlatform.ObjectModel.PlatformEqtTrace.TraceLevel.set -> void -static Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.ProcessStartInfoExtensions.AddEnvironmentVariable(this System.Diagnostics.ProcessStartInfo! startInfo, string! name, string? value) -> void diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt deleted file mode 100644 index ab058de62d..0000000000 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net451/PublicAPI.Unshipped.txt +++ /dev/null @@ -1 +0,0 @@ -#nullable enable diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net45/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.ObjectModel/PublicAPI/net45/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.PlatformAbstractions/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Interfaces/Tracing/IPlatformEqtTrace.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Interfaces/Tracing/IPlatformEqtTrace.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Interfaces/Tracing/IPlatformEqtTrace.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyExtensions.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyExtensions.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyExtensions.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyLoadContext.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyLoadContext.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyLoadContext.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyResolver.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Runtime/PlatformAssemblyResolver.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Runtime/PlatformAssemblyResolver.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformEnvironment.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformEnvironment.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformEnvironment.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformThread.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/PlatformThread.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/PlatformThread.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessHelper.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessHelper.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessHelper.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessStartInfoExtensions.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/System/ProcessStartInfoExtensions.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/System/ProcessStartInfoExtensions.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/PlatformEqtTrace.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/PlatformEqtTrace.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/PlatformEqtTrace.cs diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs b/src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/RemoteEqtTrace.cs similarity index 100% rename from src/Microsoft.TestPlatform.PlatformAbstractions/net451/Tracing/RemoteEqtTrace.cs rename to src/Microsoft.TestPlatform.PlatformAbstractions/net462/Tracing/RemoteEqtTrace.cs diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs index 5a4f1cb205..75092f376f 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs +++ b/src/Microsoft.TestPlatform.TestHostProvider/Hosting/DefaultTestHostManager.cs @@ -48,9 +48,9 @@ public class DefaultTestHostManager : ITestRuntimeProvider2 private const string DefaultTestHostFriendlyName = "DefaultTestHost"; private const string TestAdapterEndsWithPattern = @"TestAdapter.dll"; - // Any version (older or newer) that is not in this list will use the default testhost.exe that is built using net451. + // Any version (older or newer) that is not in this list will use the default testhost.exe that is built using net462. // TODO: Add net481 when it is published, if it uses a new moniker. - private static readonly ImmutableArray SupportedTargetFrameworks = ImmutableArray.Create("net452", "net46", "net461", "net462", "net47", "net471", "net472", "net48"); + private static readonly ImmutableArray SupportedTargetFrameworks = ImmutableArray.Create("net47", "net471", "net472", "net48"); private readonly IProcessHelper _processHelper; private readonly IFileHelper _fileHelper; diff --git a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj index c668c50106..792d131a56 100644 --- a/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj +++ b/src/Microsoft.TestPlatform.TestHostProvider/Microsoft.TestPlatform.TestHostProvider.csproj @@ -6,13 +6,13 @@ Microsoft.TestPlatform.TestHostRuntimeProvider - net6.0;netstandard2.0;net451 + net6.0;netstandard2.0;net462 net6.0 $(DefineConstants);DOTNET_BUILD_FROM_SOURCE false true - + diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.TestHostProvider/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj index 6ae57a14d3..d71de7ce57 100644 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -6,11 +6,11 @@ Microsoft.TestPlatform.Utilities - netstandard2.0;netstandard1.3;net451 + netstandard2.0;netstandard1.3;net462 net6.0 false - + diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.Utilities/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.Utilities/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.Utilities/PublicAPI/net462/PublicAPI.Unshipped.txt 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 87a74b793d..d4d0ed500b 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -6,7 +6,7 @@ Microsoft.TestPlatform.VsTestConsole.TranslationLayer - netstandard2.0;net451;net6.0 + net6.0;netstandard2.0;net462 net6.0 false @@ -19,7 +19,7 @@ - + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net451/PublicAPI.Shipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/SettingsMigrator/SettingsMigrator.csproj b/src/SettingsMigrator/SettingsMigrator.csproj index f28f01d98a..5d7a8c3869 100644 --- a/src/SettingsMigrator/SettingsMigrator.csproj +++ b/src/SettingsMigrator/SettingsMigrator.csproj @@ -6,20 +6,20 @@ SettingsMigrator - net451 + net462 net6.0 Exe AnyCPU false true - + win7-x64 - + diff --git a/src/datacollector/PublicAPI/net451/PublicAPI.Shipped.txt b/src/datacollector/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/datacollector/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/datacollector/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/datacollector/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/datacollector/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/datacollector/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/datacollector/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj index a2605928ed..c0e86f9928 100644 --- a/src/datacollector/datacollector.csproj +++ b/src/datacollector/datacollector.csproj @@ -13,7 +13,7 @@ datacollector.arm64 netcoreapp2.1 $(TargetFrameworks);net472 - $(TargetFrameworks);net451 + $(TargetFrameworks);net462 net6.0 AnyCPU Exe diff --git a/src/package/VSIXProject/TestPlatform.csproj b/src/package/VSIXProject/TestPlatform.csproj index ea378d7ce7..b9ea2074ec 100644 --- a/src/package/VSIXProject/TestPlatform.csproj +++ b/src/package/VSIXProject/TestPlatform.csproj @@ -27,7 +27,7 @@ false False true - $(TestPlatformRoot)artifacts\$(Configuration)\net451\win7-x64 + $(TestPlatformRoot)artifacts\$(Configuration)\net462\win7-x64 $(TestPlatformRoot)artifacts\$(Configuration)\VSIX TestPlatform [installDir]\Common7\IDE\Extensions\TestPlatform @@ -93,7 +93,7 @@ zh-Hant - + cs @@ -192,7 +192,7 @@ Extensions\Cpp\arm64 - + Extensions\TestImpact\ComComponents\x64 @@ -240,32 +240,20 @@ - - - - - - - - - + + + + + - - - - - + - - - - @@ -279,7 +267,7 @@ Always true - + Designer @@ -294,7 +282,7 @@ - diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec index 7727e08372..9c91ae2e56 100644 --- a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec +++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec @@ -14,9 +14,9 @@ © Microsoft Corporation. All rights reserved. https://github.com/microsoft/vstest/ vstest visual-studio unittest testplatform mstest microsoft test testing - @@ -35,8 +35,7 @@ - - + @@ -47,20 +46,17 @@ - - + - - + - - + diff --git a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec index 9ac341631d..99eed9ea98 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.AdapterUtilities.nuspec @@ -16,9 +16,9 @@ https://github.com/microsoft/vstest/ © Microsoft Corporation. All rights reserved. vstest visual-studio unittest testplatform mstest microsoft test testing - @@ -34,12 +34,12 @@ - + - - + + @@ -52,11 +52,11 @@ - + - - - + + + diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec index 124ba9a879..c0ec204bcd 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec @@ -26,297 +26,273 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -505,14 +481,6 @@ - - - - - - - - @@ -524,14 +492,6 @@ - - - - - - - - @@ -543,14 +503,6 @@ - - - - - - - - diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec index 475fbd6bc8..c60e443ab3 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -24,645 +24,620 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - - - + + + + - - - + + + diff --git a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec index 802ce1eba2..d7069eb693 100644 --- a/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec +++ b/src/package/nuspec/TestPlatform.Extensions.TrxLogger.nuspec @@ -14,13 +14,13 @@ https://github.com/microsoft/vstest/ © Microsoft Corporation. All rights reserved. vstest visual-studio unittest testplatform mstest microsoft test testing - - + - + @@ -43,23 +43,23 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec index b7291894c0..7b5d08c1a0 100644 --- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec +++ b/src/package/nuspec/TestPlatform.ObjectModel.nuspec @@ -14,18 +14,13 @@ https://github.com/microsoft/vstest/ © Microsoft Corporation. All rights reserved. vstest visual-studio unittest testplatform mstest microsoft test testing - - + - - - - - - + @@ -34,12 +29,12 @@ - + - + @@ -47,7 +42,7 @@ - + @@ -62,7 +57,7 @@ - + @@ -79,7 +74,7 @@ - + @@ -91,77 +86,43 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -251,39 +212,39 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/package/nuspec/TestPlatform.TestHost.nuspec b/src/package/nuspec/TestPlatform.TestHost.nuspec index ba71b977fe..1300db90af 100644 --- a/src/package/nuspec/TestPlatform.TestHost.nuspec +++ b/src/package/nuspec/TestPlatform.TestHost.nuspec @@ -14,11 +14,11 @@ https://github.com/microsoft/vstest/ © Microsoft Corporation. All rights reserved. vstest visual-studio unittest testplatform mstest microsoft test testing - - + @@ -43,8 +43,8 @@ - - + + @@ -54,8 +54,8 @@ - - + + @@ -64,7 +64,7 @@ - + @@ -79,16 +79,16 @@ - - @@ -97,7 +97,7 @@ - + @@ -193,7 +193,7 @@ - + diff --git a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec index 420efde67c..8e9bb47802 100644 --- a/src/package/nuspec/TestPlatform.TranslationLayer.nuspec +++ b/src/package/nuspec/TestPlatform.TranslationLayer.nuspec @@ -14,13 +14,13 @@ https://github.com/microsoft/vstest/ © Microsoft Corporation. All rights reserved. vstest visual-studio unittest testplatform mstest microsoft test testing - - + @@ -40,77 +40,77 @@ - - - - - - - + + + + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/package/package/PublicAPI/net451/PublicAPI.Shipped.txt b/src/package/package/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/package/package/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/package/package/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/package/package/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/package/package/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/package/package/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/package/package/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/package/package/package.csproj b/src/package/package/package.csproj index d848d085c8..091c9800e4 100644 --- a/src/package/package/package.csproj +++ b/src/package/package/package.csproj @@ -5,7 +5,7 @@ - net451;netcoreapp2.1 + net462;netcoreapp2.1 net6.0 package false @@ -28,10 +28,10 @@ false - + win7-x64 - + diff --git a/src/package/sign/sign.csproj b/src/package/sign/sign.csproj index 114c57375f..5bd7e31bcb 100644 --- a/src/package/sign/sign.csproj +++ b/src/package/sign/sign.csproj @@ -1,6 +1,6 @@  - net451 + net462 sign win7-x64 @@ -11,7 +11,7 @@ - + diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj index 8bd02a617a..e31ef32bdd 100644 --- a/src/package/sign/sign.proj +++ b/src/package/sign/sign.proj @@ -8,7 +8,7 @@ $(MSBuildThisFileDirectory)..\..\..\ Release - net451 + net462 win7-x64 False @@ -16,26 +16,26 @@ $(RootDirectory)artifacts\$(BuildConfiguration)\ - $(ArtifactsBaseDirectory)net45\ + $(ArtifactsBaseDirectory)net462\ $(ArtifactsBaseDirectory)$(TargetFramework)\$(TargetRuntime)\ $(ArtifactsBaseDirectory)netcoreapp2.1\ - + $(ArtifactsBaseDirectory)netcoreapp1.0\ - + $(ArtifactsBaseDirectory)netstandard1.0\ - + $(ArtifactsBaseDirectory)netstandard1.3\ - + $(ArtifactsBaseDirectory)netstandard2.0\ - + $(ArtifactsBaseDirectory)uap10.0\ @@ -50,7 +50,7 @@ - + @@ -67,21 +67,21 @@ - + - + - - - - - + + + + + - - + + @@ -101,30 +101,18 @@ - - - - - - - - - - - - @@ -167,7 +155,7 @@ - + @@ -194,30 +182,18 @@ - - - - - + - - - - - - - - @@ -317,64 +293,64 @@ - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + @@ -382,17 +358,17 @@ Microsoft400 StrongName - + Microsoft400 StrongName - + Microsoft400 StrongName - + Microsoft400 StrongName @@ -475,7 +451,7 @@ diff --git a/src/testhost.arm64/testhost.arm64.csproj b/src/testhost.arm64/testhost.arm64.csproj index d3e4c7da5c..d7820dbb0b 100644 --- a/src/testhost.arm64/testhost.arm64.csproj +++ b/src/testhost.arm64/testhost.arm64.csproj @@ -11,7 +11,7 @@ testhost.arm64 - netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 net6.0 Exe false @@ -20,7 +20,7 @@ win10-arm64 false - $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 + $(AssemblyName.Replace('.arm64', '')).$(TargetFramework).arm64 diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index 304fccdd4b..2fb16047c9 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -11,7 +11,7 @@ testhost.x86 - netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 net6.0 AnyCPU true @@ -22,7 +22,7 @@ win7-x86 false - $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 + $(AssemblyName.Replace('.x86', '')).$(TargetFramework).x86 diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 19f0c9705b..4d52d6cee9 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -11,7 +11,7 @@ testhost - netcoreapp2.1;netcoreapp1.0;net451;net452;net46;net461;net462;net47;net471;net472;net48 + netcoreapp2.1;netcoreapp1.0;net462;net47;net471;net472;net48 net6.0 Exe false @@ -20,7 +20,7 @@ win7-x64 false - $(AssemblyName).$(TargetFramework) + $(AssemblyName).$(TargetFramework) diff --git a/src/vstest.console/PublicAPI/net451/PublicAPI.Shipped.txt b/src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt similarity index 100% rename from src/vstest.console/PublicAPI/net451/PublicAPI.Shipped.txt rename to src/vstest.console/PublicAPI/net462/PublicAPI.Shipped.txt diff --git a/src/vstest.console/PublicAPI/net451/PublicAPI.Unshipped.txt b/src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt similarity index 100% rename from src/vstest.console/PublicAPI/net451/PublicAPI.Unshipped.txt rename to src/vstest.console/PublicAPI/net462/PublicAPI.Unshipped.txt diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj index aca26c8837..5ff29872dc 100644 --- a/src/vstest.console/vstest.console.csproj +++ b/src/vstest.console/vstest.console.csproj @@ -8,23 +8,28 @@ vstest.console vstest.console.arm64 - netcoreapp2.1;net451 + netcoreapp2.1;net462 net6.0 Exe Major false - AnyCPU + AnyCPU app.manifest Microsoft.VisualStudio.TestPlatform.CommandLine true + + false - + win7-x64;win10-arm64 - + @@ -86,4 +91,4 @@ - \ No newline at end of file + diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs index d88979b837..8bae251d1e 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs @@ -11,26 +11,18 @@ namespace Microsoft.TestPlatform.AcceptanceTests; public class AcceptanceTestBase : IntegrationTestBase { - public const string Net451TargetFramework = "net451"; - public const string Net452TargetFramework = "net452"; - public const string Net46TargetFramework = "net46"; - public const string Net461TargetFramework = "net461"; + public const string DesktopTargetFramework = Net462TargetFramework; public const string Net462TargetFramework = "net462"; public const string Net47TargetFramework = "net47"; public const string Net471TargetFramework = "net471"; public const string Net472TargetFramework = "net472"; public const string Net48TargetFramework = "net48"; - public const string DesktopTargetFramework = "net451"; public const string Core21TargetFramework = "netcoreapp2.1"; public const string Core31TargetFramework = "netcoreapp3.1"; public const string Core50TargetFramework = "net5.0"; public const string Core60TargetFramework = "net6.0"; - public const string DesktopFrameworkArgValue = ".NETFramework,Version=v4.5.1"; - public const string Net451FrameworkArgValue = ".NETFramework,Version=v4.5.1"; - public const string Net452FrameworkArgValue = ".NETFramework,Version=v4.5.2"; - public const string Net46FrameworkArgValue = ".NETFramework,Version=v4.6"; - public const string Net461FrameworkArgValue = ".NETFramework,Version=v4.6.1"; + public const string DesktopFrameworkArgValue = Net462FrameworkArgValue; public const string Net462FrameworkArgValue = ".NETFramework,Version=v4.6.2"; public const string Net47FrameworkArgValue = ".NETFramework,Version=v4.7"; public const string Net471FrameworkArgValue = ".NETFramework,Version=v4.7.1"; @@ -46,17 +38,16 @@ public class AcceptanceTestBase : IntegrationTestBase public const string CoreRunnerTargetRuntime = ""; public const string InIsolation = "/InIsolation"; - public const string NETFX452_48 = "net452;net461;net472;net48"; - public const string NETFX451_48 = "net452;net461;net472;net48"; + public const string NETFX462_48 = "net462;net472;net48"; public const string NETCORE21_50 = "netcoreapp2.1;netcoreapp3.1;net5.0"; - public const string NETFX452_NET50 = "net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0"; - public const string NETFX452_NET31 = "net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1"; - public const string DEFAULT_RUNNER_NETFX = "net451"; + public const string NETFX462_NET50 = "net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0"; + public const string NETFX462_NET31 = "net462;net472;net48;netcoreapp2.1;netcoreapp3.1"; + public const string DEFAULT_RUNNER_NETFX = Net462TargetFramework; /// /// Our current defaults for .NET and .NET Framework. /// public const string DEFAULT_RUNNER_NETFX_AND_NET = $"{DEFAULT_RUNNER_NETFX};netcoreapp2.1"; - public const string DEFAULT_HOST_NETFX_AND_NET = "net451;netcoreapp2.1"; + public const string DEFAULT_HOST_NETFX_AND_NET = "net462;netcoreapp2.1"; public const string LATEST_TO_LEGACY = "Latest;LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable"; public const string LATESTPREVIEW_TO_LEGACY = "LatestPreview;LatestStable;RecentStable;MostDownloaded;PreviousStable;LegacyStable"; public const string LATEST = "Latest"; @@ -89,10 +80,6 @@ protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testE Core31TargetFramework => Core31FrameworkArgValue, Core50TargetFramework => Core50FrameworkArgValue, Core60TargetFramework => Core60FrameworkArgValue, - Net451TargetFramework => Net451FrameworkArgValue, - Net452TargetFramework => Net452FrameworkArgValue, - Net46TargetFramework => Net46FrameworkArgValue, - Net461TargetFramework => Net461FrameworkArgValue, Net462TargetFramework => Net462FrameworkArgValue, Net47TargetFramework => Net47FrameworkArgValue, Net471TargetFramework => Net471FrameworkArgValue, diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs index 06d07bf62f..91554eef45 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs @@ -23,7 +23,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests; [TestCategory("Windows-Review")] public class BlameDataCollectorTests : AcceptanceTestBase { - public const string NETCOREANDFX = "net452;net472;netcoreapp3.1"; + public const string NETCOREANDFX = "net462;net472;netcoreapp3.1"; public const string NET50 = "net5.0"; private readonly string _procDumpPath; @@ -132,9 +132,9 @@ public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlw } [TestMethod] - [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")] + [NetCoreRunner("net462;net472;netcoreapp3.1;net5.0")] // should make no difference, keeping for easy debug - // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] + // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net5.0")] public void HangDumpOnTimeout(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); @@ -155,9 +155,9 @@ public void HangDumpOnTimeout(RunnerInfo runnerInfo) [TestMethod] // net5.0 does not support dump on exit - [NetCoreRunner("net452;net472;netcoreapp3.1")] + [NetCoreRunner("net462;net472;netcoreapp3.1")] // should make no difference, keeping for easy debug - // [NetFrameworkRunner("net452;net472;netcoreapp3.1")] + // [NetFrameworkRunner("net462;net472;netcoreapp3.1")] public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo) { @@ -179,9 +179,9 @@ public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo) [TestMethod] // net5.0 does not support dump on exit - [NetCoreRunner("net452;net472;netcoreapp3.1")] + [NetCoreRunner("net462;net472;netcoreapp3.1")] // should make no difference, keeping for easy debug - // [NetFrameworkRunner("net452;net472;netcoreapp3.1")] + // [NetFrameworkRunner("net462;net472;netcoreapp3.1")] public void CrashDumpOnExit(RunnerInfo runnerInfo) { @@ -202,9 +202,9 @@ public void CrashDumpOnExit(RunnerInfo runnerInfo) } [TestMethod] - [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")] + [NetCoreRunner("net462;net472;netcoreapp3.1;net5.0")] // should make no difference, keeping for easy debug - // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] + // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net5.0")] public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); @@ -240,9 +240,9 @@ public void CrashDumpChildProcesses(RunnerInfo runnerInfo) } [TestMethod] - [NetCoreRunner("net452;net472;netcoreapp3.1;net5.0")] + [NetCoreRunner("net462;net472;netcoreapp3.1;net5.0")] // should make no difference, keeping for easy debug - // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] + // [NetFrameworkRunner("net462;net472;netcoreapp3.1;net5.0")] public void HangDumpChildProcesses(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs index 87e23f5397..96f8da27c6 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs @@ -27,8 +27,7 @@ private void CuitRunAll(RunnerInfo runnerInfo) return; } - var assemblyAbsolutePath = _testEnvironment.GetTestAsset("CUITTestProject.dll", "net451"); - + var assemblyAbsolutePath = _testEnvironment.GetTestAsset("CUITTestProject.dll", "net462"); var arguments = PrepareArguments(assemblyAbsolutePath, string.Empty, string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path); arguments += " -- RunConfiguration.TargetPlatform=x86"; diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs index 21f578cb77..fd3aa89090 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageAcceptanceTestBase.cs @@ -28,7 +28,7 @@ protected static string GetNetStandardAdapterPath() protected static string GetNetFrameworkAdapterPath() { - return Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, "net451", "win7-x64", "Extensions"); + return Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "artifacts", IntegrationTestEnvironment.BuildConfiguration, DEFAULT_RUNNER_NETFX, "win7-x64", "Extensions"); } protected static string GetCodeCoverageExePath() diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs index f64f6cf1d5..2e4386a5eb 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DeprecateExtensionsPathWarningTests.cs @@ -68,6 +68,6 @@ public override string GetConsoleRunnerPath() { DirectoryInfo currentDirectory = new DirectoryInfo(typeof(DeprecateExtensionsPathWarningTests).GetTypeInfo().Assembly.GetAssemblyLocation()).Parent!.Parent!.Parent!.Parent!.Parent!.Parent!; - return Path.Combine(currentDirectory.FullName, "artifacts", BuildConfiguration, "net451", "win7-x64", "vstest.console.exe"); + return Path.Combine(currentDirectory.FullName, "artifacts", BuildConfiguration, DEFAULT_RUNNER_NETFX, "win7-x64", "vstest.console.exe"); } } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs index 3c374ee9e5..826c0442c2 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs @@ -169,17 +169,7 @@ public void XUnitRunAllTestExecution(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); - string testAssemblyPath; - // Xunit >= 2.2 won't support net451, Minimum target framework it supports is net452. - if (_testEnvironment.TargetFramework.Equals("net451")) - { - testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll", "net46"); - } - else - { - testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll"); - } - + string testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll"); var arguments = PrepareArguments( testAssemblyPath, GetTestAdapterPath(UnitTestFramework.XUnit), diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs index 430fcdf16b..ba8b103749 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DisableAppdomainTests.cs @@ -21,8 +21,8 @@ public void DisableAppdomainTest(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); - var diableAppdomainTest1 = _testEnvironment.GetTestAsset("DisableAppdomainTest1.dll", "net451"); - var diableAppdomainTest2 = _testEnvironment.GetTestAsset("DisableAppdomainTest2.dll", "net451"); + var diableAppdomainTest1 = _testEnvironment.GetTestAsset("DisableAppdomainTest1.dll", Net462TargetFramework); + var diableAppdomainTest2 = _testEnvironment.GetTestAsset("DisableAppdomainTest2.dll", Net462TargetFramework); RunTests(runnerInfo, $"{diableAppdomainTest1}\" \"{diableAppdomainTest2}", 2); } @@ -34,7 +34,7 @@ public void NewtonSoftDependencyWithDisableAppdomainTest(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); - var newtonSoftDependnecyTest = _testEnvironment.GetTestAsset("NewtonSoftDependency.dll", "net451"); + var newtonSoftDependnecyTest = _testEnvironment.GetTestAsset("NewtonSoftDependency.dll", Net462TargetFramework); RunTests(runnerInfo, newtonSoftDependnecyTest, 1); } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs index 4b6df159a1..20b87a7eb2 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs @@ -95,9 +95,7 @@ public void RunMultipleTestAssembliesWithoutTestAdapterPath(RunnerInfo runnerInf SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll"); - var xunitAssemblyPath = _testEnvironment.TargetFramework.Equals("net451") ? - _testEnvironment.GetTestAsset("XUTestProject.dll", "net46") : - _testEnvironment.GetTestAsset("XUTestProject.dll"); + var xunitAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll"); assemblyPaths = string.Join(" ", assemblyPaths, xunitAssemblyPath.AddDoubleQuote()); InvokeVsTestForExecution(assemblyPaths, testAdapterPath: string.Empty, FrameworkArgValue, string.Empty); @@ -257,7 +255,7 @@ public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleWhenGivenInco { SetTestEnvironment(_testEnvironment, runnerInfo); - var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X64 platform. SimpleTestProjectx86.dll would use Framework .NETFramework,Version=v4.5.1 and Platform X86"; + var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X64 platform. SimpleTestProjectx86.dll would use Framework .NETFramework,Version=v4.6.2 and Platform X86"; var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject3.dll", "SimpleTestProjectx86.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path); @@ -279,7 +277,7 @@ public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsoleWhenGivenSi { SetTestEnvironment(_testEnvironment, runnerInfo); - var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProjectx86 would use Framework .NETFramework,Version=v4.5.1 and Platform X86"; + var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProjectx86 would use Framework .NETFramework,Version=v4.6.2 and Platform X86"; var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProjectx86.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path); @@ -299,7 +297,7 @@ public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleOnlyWhenRunni { SetTestEnvironment(_testEnvironment, runnerInfo); - var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProject2.dll would use Framework .NETFramework,Version=v4.5.1 and Platform X64"; + var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.6.2 framework and X86 platform. SimpleTestProject2.dll would use Framework .NETFramework,Version=v4.6.2 and Platform X64"; var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject2.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: TempDirectory.Path); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CompatibilityRowsBuilder.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CompatibilityRowsBuilder.cs index 272b2ce6fb..9a0ac43d3e 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CompatibilityRowsBuilder.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CompatibilityRowsBuilder.cs @@ -291,9 +291,9 @@ private void AddRow(List dataRows, string batch, // The order in which we add them matters. We end up both modifying the same path // and adding to it. So the first one added will be later in the path. E.g.: // Adding testSdk first: - // C:\p\vstest\test\TestAssets\MSTestProject1\bin\MSTestLatestPreview-2.2.9-preview-20220210-07\NETTestSdkLatest-17.2.0-dev\Debug\net451\MSTestProject1.dll + // C:\p\vstest\test\TestAssets\MSTestProject1\bin\MSTestLatestPreview-2.2.9-preview-20220210-07\NETTestSdkLatest-17.2.0-dev\Debug\net462\MSTestProject1.dll // versus adding testSdk second: - // C:\p\vstest\test\TestAssets\MSTestProject1\bin\NETTestSdkLatest-17.2.0-dev\MSTestLatestPreview-2.2.9-preview-20220210-07\Debug\net451\MSTestProject1.dll + // C:\p\vstest\test\TestAssets\MSTestProject1\bin\NETTestSdkLatest-17.2.0-dev\MSTestLatestPreview-2.2.9-preview-20220210-07\Debug\net462\MSTestProject1.dll runnerInfo.TestHostInfo = GetNetTestSdkInfo(hostVersion); runnerInfo.AdapterInfo = GetMSTestInfo(adapterVersion); dataRows.Add(runnerInfo); @@ -362,16 +362,14 @@ private static VSTestConsoleInfo GetVSTestConsoleInfo(string vstestConsoleVersio // And we can easily find out what is going on because --WRONG-VERSION-- sticks out, and is easy to find in the codebase. XmlNode? node = depsXml.DocumentElement?.SelectSingleNode($"PropertyGroup/{propertyName}"); var version = node?.InnerText.Replace("[", "").Replace("]", "") ?? "--WRONG-VERSION--"; - var vstestConsolePath = runnerInfo.IsNetFrameworkRunner - ? Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "packages", packageName, version, - "tools", "net451", "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe") - : Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "packages", packageName, version, - "contentFiles", "any", "netcoreapp2.1", "vstest.console.dll"); - - if (version.StartsWith("15.")) + var vstestConsolePath = runnerInfo.IsNetFrameworkRunner switch { - vstestConsolePath = vstestConsolePath.Replace("netcoreapp2.1", "netcoreapp2.0"); - } + true when NuGetVersion.TryParse(version, out var v) + && new NuGetVersion(v.Major, v.Minor, v.Patch) < new NuGetVersion("17.3.0") => GetToolsPath("net451"), + true => GetToolsPath("net462"), + false when version.StartsWith("15.") => GetContentFilesPath("netcoreapp2.0"), + false => GetContentFilesPath("netcoreapp2.1"), + }; return new VSTestConsoleInfo { @@ -379,6 +377,12 @@ private static VSTestConsoleInfo GetVSTestConsoleInfo(string vstestConsoleVersio Version = version, Path = vstestConsolePath, }; + + string GetToolsPath(string fwkVersion) => Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "packages", + packageName, version, "tools", fwkVersion, "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe"); + + string GetContentFilesPath(string fwkVersion) => Path.Combine(IntegrationTestEnvironment.TestPlatformRootDirectory, "packages", + packageName, version, "contentFiles", "any", fwkVersion, "vstest.console.dll"); } private static NetTestSdkInfo GetNetTestSdkInfo(string testhostVersionType) diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunnerAttribute.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunnerAttribute.cs index 8f7afb2029..9873892dc4 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunnerAttribute.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetCoreRunnerAttribute.cs @@ -16,7 +16,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests; /// /// Runs tests using the dotnet vstest.console.dll built against .NET Core 2.1. /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as -/// AcceptanceTestBase.NETFX452_NET50 = "net452;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project +/// AcceptanceTestBase.NETFX462_NET50 = "net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj. /// [AttributeUsage(AttributeTargets.Method)] @@ -27,8 +27,8 @@ public class NetCoreRunnerAttribute : Attribute, ITestDataSource /// /// Initializes a new instance of the class. /// - /// To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net452TargetFramework or alike values. - public NetCoreRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX452_NET50) + /// To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values. + public NetCoreRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET50) { _targetFrameworks = targetFrameworks; } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunnerAttribute.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunnerAttribute.cs index fea04b9356..daa154f13b 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunnerAttribute.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFrameworkRunnerAttribute.cs @@ -15,7 +15,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests; /// /// Runs tests using the dotnet vstest.console.dll built against .NET Core 2.1. /// Provide a list of target frameworks to run the tests from given as a ';' separated list, or using a constant containing that range such as -/// AcceptanceTestBase.NETFX452_NET50 = "net452;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project +/// AcceptanceTestBase.NETFX462_NET50 = "net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0" to determine which target framework of the project /// to test. The target project must list those TFMs in the TargetFrameworks property in csproj. /// [AttributeUsage(AttributeTargets.Method)] @@ -24,8 +24,8 @@ public class NetFrameworkRunnerAttribute : Attribute, ITestDataSource /// /// Initializes a new instance of the class. /// - /// To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net452TargetFramework or alike values. - public NetFrameworkRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX452_NET50) + /// To run tests with desktop runner(vstest.console.exe), use AcceptanceTestBase.Net462TargetFramework or alike values. + public NetFrameworkRunnerAttribute(string targetFrameworks = AcceptanceTestBase.NETFX462_NET50) { _targetFrameworks = targetFrameworks; } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs index 10400d852a..0179019a1f 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/NetFullTargetFrameworkDataSourceAttribute.cs @@ -13,7 +13,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests; /// -/// The attribute defining runner framework and target framework for net451. +/// The attribute defining runner framework and target framework for net462. /// First Argument (Runner framework) = This decides who will run the tests. If runner framework is netcoreapp then "dotnet vstest.console.dll" will run the tests. /// If runner framework is net46 then vstest.console.exe will run the tests. /// Second argument (target framework) = The framework for which test will run diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestPlatformCompatibilityDataSource.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestPlatformCompatibilityDataSource.cs index 7836809f8e..6f48a5304d 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestPlatformCompatibilityDataSource.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/TestPlatformCompatibilityDataSource.cs @@ -11,7 +11,7 @@ namespace Microsoft.TestPlatform.AcceptanceTests; /// used only to test the most common scenarios, or special configurations that are candidates for their own /// specialized source. /// -/// By default net451 and netcoreapp2.1 are used for both runner and host. (4 combinations) +/// By default net462 and netcoreapp2.1 are used for both runner and host. (4 combinations) /// Then run with every version of runner is added. /// Then run with every version of test.sdk is added. /// Then run with every combination of testhost and adapter is added. diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs index ee16733189..17c5c689d4 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs @@ -15,8 +15,8 @@ public class MultitargetingTestHostTests : AcceptanceTestBase [TestCategory("Windows-Review")] // the underlying test is using xUnit to avoid AppDomain enhancements in MSTest that make this pass even without multitargetting // xUnit supports net452 onwards, so that is why this starts at net452, I also don't test all framework versions - [NetCoreRunner(NETFX452_48)] - [NetFrameworkRunner(NETFX452_48)] + [NetCoreRunner(NETFX462_48)] + [NetFrameworkRunner(NETFX462_48)] public void TestRunInATesthostThatTargetsTheirChosenNETFramework(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs index 20cc9c45d3..7cd87ea219 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs @@ -67,7 +67,7 @@ public override string GetConsoleRunnerPath() if (IsDesktopRunner()) { - consoleRunnerPath = Path.Combine(s_nugetPackageFolder, "tools", "net451", "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe"); + consoleRunnerPath = Path.Combine(s_nugetPackageFolder, "tools", Net462TargetFramework, "Common7", "IDE", "Extensions", "TestPlatform", "vstest.console.exe"); } Assert.IsTrue(File.Exists(consoleRunnerPath), "GetConsoleRunnerPath: Path not found: \"{0}\"", consoleRunnerPath); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs index a05cfda9b5..70222afd54 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs @@ -61,7 +61,7 @@ public void RunTestsWithCustomTestHostLauncherLaunchesTheProcessUsingTheProvided [TestMethod] [TestCategory("Windows-Review")] // [RunnerCompatibilityDataSource(BeforeFeature = Features.ATTACH_DEBUGGER_FLOW)] - [TestHostCompatibilityDataSource("net451", "netcoreapp2.1", "LegacyStable", BeforeFeature = Features.ATTACH_DEBUGGER_FLOW, DebugVSTestConsole = true)] + [TestHostCompatibilityDataSource("net462", "netcoreapp2.1", "LegacyStable", BeforeFeature = Features.ATTACH_DEBUGGER_FLOW, DebugVSTestConsole = true)] [Ignore("This is not working for any testhost prior 16.7.0 where the change was introduced. The launch testhost flow was replaced with AttachDebugger in runner, and the new callback to AttachDebugger happens in testhost." + "But any testhost prior 16.7.0 where the change was introduced does not know to call back AttachDebugger, and the call never happens.")] // You can confirm that the functionality broke between runner and testhost, past this point by using newer runners, against older testhosts. @@ -148,7 +148,7 @@ public void RunAllTestsWithMixedTFMsWillProvideAdditionalInformationToTheDebugge var vstestConsoleWrapper = GetVsTestConsoleWrapper(); var runEventHandler = new RunEventHandler(); - var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", "net451"); + var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_RUNNER_NETFX); var netDll = GetTestDllForFramework("MSTestProject1.dll", "netcoreapp2.1"); var testHostLauncher = new TestHostLauncherV3(); @@ -179,7 +179,7 @@ public void RunAllTestsCallsBackToTestHostLauncherV3EvenWhenRunnerDoesNotSupport var vstestConsoleWrapper = GetVsTestConsoleWrapper(); var runEventHandler = new RunEventHandler(); - var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", "net451"); + var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_RUNNER_NETFX); var netDll = GetTestDllForFramework("MSTestProject1.dll", "netcoreapp2.1"); var testHostLauncher = new TestHostLauncherV3(); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs index e0657ff25b..0f31084f84 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs @@ -84,10 +84,7 @@ public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo) SetTestEnvironment(_testEnvironment, runnerInfo); Setup(); - // Xunit >= 2.2 won't support net451, Minimum target framework it supports is net452. - string testAssemblyPath = _testEnvironment.TargetFramework!.Equals("net451") - ? _testEnvironment.GetTestAsset("XUTestProject.dll", "net46") - : _testEnvironment.GetTestAsset("XUTestProject.dll"); + string testAssemblyPath = _testEnvironment.GetTestAsset("XUTestProject.dll"); var sources = new List { testAssemblyPath }; var testAdapterPath = Directory.EnumerateFiles(GetTestAdapterPath(UnitTestFramework.XUnit), "*.TestAdapter.dll").ToList(); _vstestConsoleWrapper.InitializeExtensions(new List() { testAdapterPath.First() }); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs index ef7f030edf..5802c288de 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTests.cs @@ -71,7 +71,7 @@ public void RunAllTestsWithMixedTFMsWillFailToRunTestsFromTheIncompatibleTFMDll( var vstestConsoleWrapper = GetVsTestConsoleWrapper(); var runEventHandler = new RunEventHandler(); - var compatibleDll = GetTestDllForFramework("MSTestProject1.dll", "net451"); + var compatibleDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_RUNNER_NETFX); var incompatibleDll = GetTestDllForFramework("MSTestProject1.dll", "netcoreapp2.1"); // Act @@ -94,7 +94,7 @@ public void RunAllTestsWithMixedTFMsWillRunTestsFromAllProvidedDllEvenWhenTheyMi var vstestConsoleWrapper = GetVsTestConsoleWrapper(); var runEventHandler = new RunEventHandler(); - var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", "net451"); + var netFrameworkDll = GetTestDllForFramework("MSTestProject1.dll", DEFAULT_RUNNER_NETFX); var netDll = GetTestDllForFramework("MSTestProject1.dll", "netcoreapp2.1"); // Act @@ -196,7 +196,7 @@ public void RunTestsShouldThrowOnStackOverflowException(RunnerInfo runnerInfo) new TestPlatformOptions() { TestCaseFilter = "ExitWithStackoverFlow" }, _runEventHandler); - var errorMessage = runnerInfo.TargetFramework == "net451" + var errorMessage = runnerInfo.TargetFramework == "net462" ? $"The active test run was aborted. Reason: Test host process crashed : Process is terminated due to StackOverflowException.{Environment.NewLine}" : $"The active test run was aborted. Reason: Test host process crashed : Process is terminating due to StackOverflowException.{Environment.NewLine}"; @@ -205,8 +205,8 @@ public void RunTestsShouldThrowOnStackOverflowException(RunnerInfo runnerInfo) [TestMethod] [TestCategory("Windows-Review")] - [NetFullTargetFrameworkDataSourceAttribute(useCoreRunner: false)] - [NetCoreTargetFrameworkDataSourceAttribute(useCoreRunner: false)] + [NetFullTargetFrameworkDataSource(useCoreRunner: false)] + [NetCoreTargetFrameworkDataSource(useCoreRunner: false)] public void RunTestsShouldShowProperWarningOnNoTestsForTestCaseFilter(RunnerInfo runnerInfo) { SetTestEnvironment(_testEnvironment, runnerInfo); diff --git a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs index 410f5aaa60..c06cad461e 100644 --- a/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs +++ b/test/Microsoft.TestPlatform.AdapterUtilities.UnitTests/ManagedNameUtilities/SpecialNameTests.cs @@ -17,7 +17,7 @@ public class SpecialNameTests public void VerifyThatInvalidIdentifierNamesAreParsed() { var environment = new IntegrationTestEnvironment(); - var asset = environment.GetTestAsset("CILProject.dll", "net451"); + var asset = environment.GetTestAsset("CILProject.dll", "net462"); var assembly = Assembly.LoadFrom(asset); var types = assembly.GetTypes(); diff --git a/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs b/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs index 1c5134f515..4c470a4959 100644 --- a/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs +++ b/test/Microsoft.TestPlatform.Common.PlatformTests/AssemblyPropertiesTests.cs @@ -19,7 +19,7 @@ public AssemblyPropertiesTests() } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetAssemblyTypeForManagedDll(string framework) { @@ -41,7 +41,7 @@ public void GetAssemblyTypeForNativeDll() [TestMethod] public void GetAssemblyTypeForManagedExe() { - var assemblyPath = _testEnvironment.GetTestAsset("ConsoleManagedApp.exe", "net451"); + var assemblyPath = _testEnvironment.GetTestAsset("ConsoleManagedApp.exe", "net462"); var assemblyType = _assemblyProperties.GetAssemblyType(assemblyPath); Assert.AreEqual(AssemblyType.Managed, assemblyType); diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs index b1678cce6a..9ed67b2da8 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/TestEngineTests.cs @@ -435,7 +435,7 @@ public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfIn false false - .NETFramework, Version=v4.5 + .NETFramework, Version=v4.6.2 1 @@ -470,7 +470,7 @@ public void GetExecutionManagerShouldNotReturnInProcessProxyexecutionManagerIfru false false - .NETFramework, Version=v4.5 + .NETFramework, Version=v4.6.2 1 @@ -500,7 +500,7 @@ public void GetExecutionManagerShouldReturnInProcessProxyexecutionManager() false false - .NETFramework, Version=v4.5 + .NETFramework, Version=v4.6.2 1 "; @@ -532,7 +532,7 @@ public void GetExtensionManagerShouldCollectMetrics() false false - .NETFramework, Version=v4.5 + .NETFramework, Version=v4.6.2 1 "; diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs index 302456a319..0ab253cfa6 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs @@ -13,20 +13,14 @@ namespace Microsoft.TestPlatform.ObjectModel.PlatformTests; [TestClass] public class DiaSessionTests : IntegrationTestBase { -#if NETFRAMEWORK - private const string NET451 = "net451"; -#else - private const string NETCOREAPP21 = "netcoreapp2.1"; -#endif - public static string? GetAndSetTargetFrameWork(IntegrationTestEnvironment testEnvironment) { var currentTargetFrameWork = testEnvironment.TargetFramework; testEnvironment.TargetFramework = #if NETFRAMEWORK - NET451; + "net462"; #else - NETCOREAPP21; + "netcoreapp2.1"; #endif return currentTargetFrameWork; } diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs index 018c64d1c7..813ec85988 100644 --- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs +++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/FrameworkTests.cs @@ -59,9 +59,9 @@ public void FrameworkFromStringShouldTrimSpacesAroundFrameworkString() [TestMethod] public void FrameworkFromStringShouldWorkForShortNames() { - var fx = Framework.FromString("net451")!; - Assert.AreEqual(".NETFramework,Version=v4.5.1", fx.Name); - Assert.AreEqual("4.5.1.0", fx.Version); + var fx = Framework.FromString("net462")!; + Assert.AreEqual(".NETFramework,Version=v4.6.2", fx.Name); + Assert.AreEqual("4.6.2.0", fx.Version); var corefx = Framework.FromString("netcoreapp2.0")!; Assert.AreEqual(".NETCoreApp,Version=v2.0", corefx.Name); diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs index 2b0765f0cc..e0f352f562 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs @@ -29,7 +29,7 @@ namespace Microsoft.TestPlatform.TestUtilities; /// public class IntegrationTestBase { - public const string DesktopRunnerFramework = "net451"; + public const string DesktopRunnerFramework = "net462"; public const string CoreRunnerFramework = "netcoreapp2.1"; private const string TotalTestsMessage = "Total tests: {0}"; diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs index deaf25ecde..886ba29d34 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs @@ -32,8 +32,8 @@ public IntegrationTestEnvironment() // If the variables are not set, valid defaults are assumed. if (TargetFramework.IsNullOrEmpty()) { - // Run integration tests for net451 by default. - TargetFramework = "net451"; + // Run integration tests for net462 by default. + TargetFramework = "net462"; } if (TestPlatformRootDirectory.IsNullOrEmpty()) @@ -50,7 +50,7 @@ public IntegrationTestEnvironment() PackageDirectory = Path.Combine(TestPlatformRootDirectory, @"packages"); ToolsDirectory = Path.Combine(TestPlatformRootDirectory, @"tools"); TestArtifactsDirectory = Path.Combine(TestPlatformRootDirectory, "artifacts", "testArtifacts"); - RunnerFramework = "net451"; + RunnerFramework = "net462"; } /// @@ -106,7 +106,7 @@ public string PublishDirectory /// /// Gets the target framework. - /// Supported values = net451, netcoreapp1.0. + /// Supported values = net462, netcoreapp1.0. /// [NotNull] public string? TargetFramework { get; set; } @@ -162,7 +162,7 @@ public string? TargetRuntime /// /// Gets the application type. - /// Supported values = net451, netcoreapp1.0. + /// Supported values = net462, netcoreapp1.0. /// public string RunnerFramework { get; set; } @@ -182,7 +182,7 @@ public string? TargetRuntime /// (a) They are built for supported frameworks. See . /// (b) They are built for provided build configuration. /// (c) Name of the test asset matches the parent directory name. E.g. TestAssets\SimpleUnitTest\SimpleUnitTest.csproj must - /// produce TestAssets\SimpleUnitTest\bin\Debug\net451\SimpleUnitTest.dll + /// produce TestAssets\SimpleUnitTest\bin\Debug\net462\SimpleUnitTest.dll /// public string GetTestAsset(string assetName) { @@ -193,14 +193,14 @@ public string GetTestAsset(string assetName) /// Gets the full path to a test asset. /// /// Name of the asset with extension. E.g. SimpleUnitTest.dll - /// asset project target framework. E.g net451 + /// asset project target framework. E.g net462 /// Full path to the test asset. /// /// Test assets follow several conventions: /// (a) They are built for supported frameworks. See . /// (b) They are built for provided build configuration. /// (c) Name of the test asset matches the parent directory name. E.g. TestAssets\SimpleUnitTest\SimpleUnitTest.csproj must - /// produce TestAssets\SimpleUnitTest\bin\Debug\net451\SimpleUnitTest.dll + /// produce TestAssets\SimpleUnitTest\bin\Debug\net462\SimpleUnitTest.dll /// public string GetTestAsset(string assetName, string targetFramework) { diff --git a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj index daee3d4ce4..4ce8cbec45 100644 --- a/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj +++ b/test/TestAssets/AppDomainGetAssembliesTestProject/AppDomainGetAssembliesTestProject.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false diff --git a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj index 7857fd0c9d..a444e24919 100644 --- a/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj +++ b/test/TestAssets/BlameUnitTestProject/BlameUnitTestProject.csproj @@ -11,7 +11,7 @@ BlameUnitTestProject - netcoreapp2.1;net451 + netcoreapp2.1;net462 Exe diff --git a/test/TestAssets/CILProject/CILProject.proj b/test/TestAssets/CILProject/CILProject.proj index cefbd5f276..9d57990289 100644 --- a/test/TestAssets/CILProject/CILProject.proj +++ b/test/TestAssets/CILProject/CILProject.proj @@ -10,7 +10,7 @@ - net451 + net462 bin\$(Configuration) true false @@ -65,4 +65,4 @@ - \ No newline at end of file + diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj index 41d7abeecd..e67659f21a 100644 --- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj +++ b/test/TestAssets/CUITTestProject/CUITTestProject.csproj @@ -12,7 +12,7 @@ CUITTestProject - net451 + net462 Exe diff --git a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj index 70b39811b1..525a6ffbd0 100644 --- a/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj +++ b/test/TestAssets/CodeCoverageTest/CodeCoverageTest.csproj @@ -5,7 +5,7 @@ CodeCoverageTest - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj index b7c384a034..97fa077e53 100644 --- a/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj +++ b/test/TestAssets/ConsoleManagedApp/ConsoleManagedApp.csproj @@ -4,7 +4,7 @@ ConsoleManagedApp - netcoreapp2.1;net451 + netcoreapp2.1;net462 Exe netcoreapp3.1 false diff --git a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj index a203d55d41..0b0cc7004e 100644 --- a/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj +++ b/test/TestAssets/ConsoleRunners/ConsoleRunners.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net452 + netcoreapp2.1;net462 netcoreapp3.1 false diff --git a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj index 73c2dfd6c0..a8fcbcb9f7 100644 --- a/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj +++ b/test/TestAssets/DisableAppdomainTest1/DisableAppdomainTest1.csproj @@ -12,12 +12,12 @@ DisableAppdomainTest1 - net451 + net462 Exe - + diff --git a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj index bc1d297d64..5c99d8c237 100644 --- a/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj +++ b/test/TestAssets/DisableAppdomainTest2/DisableAppdomainTest2.csproj @@ -12,12 +12,12 @@ DisableAppDomainTest2 - net451 + net462 Exe - + diff --git a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj index 3958ae816a..4a06e6c07b 100644 --- a/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj +++ b/test/TestAssets/DiscoveryTestProject/DiscoveryTestProject.csproj @@ -5,7 +5,7 @@ DiscoveryTestProject - netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;net451 + netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;net462 netcoreapp3.1 x64 @@ -15,7 +15,7 @@ - + diff --git a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj index 0c993562cb..6e3afb30dd 100644 --- a/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj +++ b/test/TestAssets/EnvironmentVariablesTestProject/EnvironmentVariablesTestProject.csproj @@ -1,7 +1,7 @@ - net451;netcoreapp2.1 + net462;netcoreapp2.1 netcoreapp3.1 false diff --git a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj index 8a76f7e919..968982f918 100644 --- a/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj +++ b/test/TestAssets/EventLogUnitTestProject/EventLogUnitTestProject.csproj @@ -12,11 +12,11 @@ EventLogUnitTestProject - net451 + net462 Exe - + diff --git a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj index 5bbf0915fe..23ad79fbd4 100644 --- a/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj +++ b/test/TestAssets/LegacySettingsUnitTestProject/LegacySettingsUnitTestProject.csproj @@ -8,7 +8,7 @@ library - net451 + net462 LegacySettingsUnitTestProject diff --git a/test/TestAssets/MSTestProject1/MSTestProject1.csproj b/test/TestAssets/MSTestProject1/MSTestProject1.csproj index 6e15698454..4097865146 100644 --- a/test/TestAssets/MSTestProject1/MSTestProject1.csproj +++ b/test/TestAssets/MSTestProject1/MSTestProject1.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Preview @@ -20,7 +20,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/MSTestProject2/MSTestProject2.csproj b/test/TestAssets/MSTestProject2/MSTestProject2.csproj index 6e15698454..4097865146 100644 --- a/test/TestAssets/MSTestProject2/MSTestProject2.csproj +++ b/test/TestAssets/MSTestProject2/MSTestProject2.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Preview @@ -20,7 +20,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 3628f42f22..57fd203b1c 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -9,7 +9,7 @@ library - net451 + net462 MstestV1UnitTestProject diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj index b21d0c9ba2..5bab2d74ab 100644 --- a/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj +++ b/test/TestAssets/MultitargetedNetFrameworkProject/MultitargetedNetFrameworkProject.csproj @@ -4,11 +4,11 @@ - net451;net452;net46;net461;net462;net47;net471;net472;net48 + net462;net47;net471;net472;net48 true true - + TRACE diff --git a/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs b/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs index 7c34d745c0..587a62af3b 100644 --- a/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs +++ b/test/TestAssets/MultitargetedNetFrameworkProject/UnitTest1.cs @@ -9,23 +9,6 @@ namespace MultitargetedNetFrameworkProject { public class UnitTest1 { - -#if NET451 - public string TargetFramework { get; } = "NET451"; -#endif - -#if NET452 - public string TargetFramework { get; } = "NET452"; -#endif - -#if NET46 - public string TargetFramework { get; } = "NET46"; -#endif - -#if NET461 - public string TargetFramework { get; } = "NET461"; -#endif - #if NET462 public string TargetFramework { get; } = "NET462"; #endif diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj index b073d9b864..a3d65eca98 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.csproj +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -4,7 +4,7 @@ - net451;netcoreapp2.1 + net462;netcoreapp2.1 netcoreapp3.1 false NUTestProject diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj index 802266e3b9..90e3c62cfe 100644 --- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj +++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj @@ -11,12 +11,12 @@ NewtonSoftDependency - net451 + net462 Exe - + diff --git a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj index 56e18fdd4a..57df8960cf 100644 --- a/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj +++ b/test/TestAssets/OutOfProcDataCollector/OutOfProcDataCollector.csproj @@ -1,6 +1,6 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false 15.0.0.0 diff --git a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj index d1b8286e65..8882eb6de5 100644 --- a/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj +++ b/test/TestAssets/ParametrizedTestProject/ParametrizedTestProject.csproj @@ -5,7 +5,7 @@ ParametrizedTestProject - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj index 3f1bc239e0..771dee18e6 100644 --- a/test/TestAssets/PerfTestProject/PerfTestProject.csproj +++ b/test/TestAssets/PerfTestProject/PerfTestProject.csproj @@ -7,7 +7,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 Exe false @@ -16,7 +16,7 @@ portable - + full diff --git a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj index 1ad743626e..2afd99462e 100644 --- a/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj +++ b/test/TestAssets/ProjectFileRunSettingsTestProject/ProjectFileRunSettingsTestProject.csproj @@ -4,7 +4,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false x64 @@ -15,11 +15,11 @@ - + - \ No newline at end of file + diff --git a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj index f45cf4c574..e244a42139 100644 --- a/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj +++ b/test/TestAssets/SimpleClassLibrary/SimpleClassLibrary.csproj @@ -3,7 +3,7 @@ - netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;net451 + netcoreapp1.0;netcoreapp1.1;netcoreapp2.1;net462 netcoreapp3.1 false @@ -18,10 +18,10 @@ portable - + full - + portable - \ No newline at end of file + diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj index 34f0ad5b07..6813334fcc 100644 --- a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj +++ b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj @@ -10,7 +10,7 @@ 15.0.0.0 15.0.0.0 15.0.0.0 - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false true diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index 0611d66af5..d5879513e1 100644 --- a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj +++ b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj @@ -5,7 +5,7 @@ SimpleTestProject - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false @@ -21,7 +21,7 @@ $(NETTestSdkVersion) - + diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj index e9d9b7f855..c614311e87 100644 --- a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj +++ b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj @@ -12,7 +12,7 @@ SimpleTestProject2 - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Exe @@ -24,7 +24,7 @@ portable - + full diff --git a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj index 02e4825ff7..e8c6a2f138 100644 --- a/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj +++ b/test/TestAssets/SimpleTestProject3/SimpleTestProject3.csproj @@ -4,7 +4,7 @@ - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Exe @@ -16,11 +16,11 @@ - + - + diff --git a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj index 726e0369e3..0c86aaf484 100644 --- a/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj +++ b/test/TestAssets/SimpleTestProjectARM/SimpleTestProjectARM.csproj @@ -13,7 +13,7 @@ SimpleTestProjectARM - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Exe diff --git a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj index 986e9cef3b..da88e74f94 100644 --- a/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj +++ b/test/TestAssets/SimpleTestProjectx86/SimpleTestProjectx86.csproj @@ -13,7 +13,7 @@ SimpleTestProjectx86 - netcoreapp2.1;net451 + netcoreapp2.1;net462 netcoreapp3.1 false Exe diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj index 7fbe67a079..b6e2dba047 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.csproj +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -4,7 +4,7 @@ XUTestProject - netcoreapp2.1;net46 + netcoreapp2.1;net462 netcoreapp3.1 false diff --git a/test/TestAssets/child-hang/child-hang.csproj b/test/TestAssets/child-hang/child-hang.csproj index bf57e6358c..ace2f96a56 100644 --- a/test/TestAssets/child-hang/child-hang.csproj +++ b/test/TestAssets/child-hang/child-hang.csproj @@ -8,7 +8,7 @@ - net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 child_hang false diff --git a/test/TestAssets/crash/crash.csproj b/test/TestAssets/crash/crash.csproj index 3ab7ca5e47..def2e2b035 100644 --- a/test/TestAssets/crash/crash.csproj +++ b/test/TestAssets/crash/crash.csproj @@ -8,7 +8,7 @@ - net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 false diff --git a/test/TestAssets/timeout/timeout.csproj b/test/TestAssets/timeout/timeout.csproj index fb101d612a..d835f77aee 100644 --- a/test/TestAssets/timeout/timeout.csproj +++ b/test/TestAssets/timeout/timeout.csproj @@ -9,7 +9,7 @@ - net452;net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 + net462;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 netcoreapp3.1 false diff --git a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs index d5c93dbd75..c600193212 100644 --- a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs +++ b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkNames.cs @@ -15,13 +15,6 @@ internal static class KnownFrameworkNames public static FrameworkName Net5 = new(KnownFrameworkStrings.Net5); public static FrameworkName Net6 = new(KnownFrameworkStrings.Net6); public static FrameworkName Net7 = new(KnownFrameworkStrings.Net7); - - public static FrameworkName Net4 = new(KnownFrameworkStrings.Net4); - public static FrameworkName Net45 = new(KnownFrameworkStrings.Net45); - public static FrameworkName Net451 = new(KnownFrameworkStrings.Net451); - public static FrameworkName Net452 = new(KnownFrameworkStrings.Net452); - public static FrameworkName Net46 = new(KnownFrameworkStrings.Net46); - public static FrameworkName Net461 = new(KnownFrameworkStrings.Net461); public static FrameworkName Net462 = new(KnownFrameworkStrings.Net462); public static FrameworkName Net47 = new(KnownFrameworkStrings.Net47); public static FrameworkName Net471 = new(KnownFrameworkStrings.Net471); diff --git a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs index 7d3e4ef36a..cece400c9b 100644 --- a/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs +++ b/test/vstest.ProgrammerTests/Fakes/KnownFrameworkStrings.cs @@ -17,12 +17,6 @@ internal static class KnownFrameworkStrings public static string Net6 = NetCore(6); public static string Net7 = NetCore(7); - public static string Net4 = NetFramework(4, 0); - public static string Net45 = NetFramework(4, 5); - public static string Net451 = NetFramework(4, 5, 1); - public static string Net452 = NetFramework(4, 5, 2); - public static string Net46 = NetFramework(4, 6); - public static string Net461 = NetFramework(4, 6, 1); public static string Net462 = NetFramework(4, 6, 2); public static string Net47 = NetFramework(4, 7); public static string Net471 = NetFramework(4, 7, 1); diff --git a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs b/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs index 6a73dc511e..1e670e4000 100644 --- a/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs +++ b/test/vstest.console.PlatformTests/AssemblyMetadataProviderTests.cs @@ -55,7 +55,7 @@ public void Cleanup() } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framework) { @@ -63,7 +63,7 @@ public void GetArchitectureShouldReturnCorrentArchForx64Assembly(string framewor } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framework) { @@ -71,7 +71,7 @@ public void GetArchitectureShouldReturnCorrentArchForx86Assembly(string framewor } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetArchitectureShouldReturnCorrentArchForAnyCpuAssembly(string framework) { @@ -79,7 +79,7 @@ public void GetArchitectureShouldReturnCorrentArchForAnyCpuAssembly(string frame } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetArchitectureShouldReturnCorrentArchForArmAssembly(string framework) { @@ -108,7 +108,7 @@ public void GetArchitectureForNativeDll(string platform) } [TestMethod] - [DataRow("net451")] + [DataRow("net462")] [DataRow("netcoreapp2.1")] public void GetFrameWorkForDotNetAssembly(string framework) { @@ -119,11 +119,11 @@ public void GetFrameWorkForDotNetAssembly(string framework) var actualFx = _assemblyMetadataProvider.GetFrameworkName(assemblyPath); stopWatch.Stop(); - if (framework.Equals("net451")) + if (framework.Equals("net462")) { // Reason is unknown for why full framework it is taking more time. Need to investigate. expectedElapsedTime = 100; - Assert.AreEqual(Constants.DotNetFramework451, actualFx.FullName); + Assert.AreEqual(".NETFramework,Version=v4.6.2", actualFx.FullName); } else { diff --git a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs index 73ea2ea48c..ad790b6360 100644 --- a/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs +++ b/test/vstest.console.UnitTests/Internal/ConsoleLoggerTests.cs @@ -98,7 +98,7 @@ public void InitializeWithParametersShouldSetVerbosityLevel() var parameters = new Dictionary { { "verbosity", "minimal" }, - { DefaultLoggerParameterNames.TargetFramework , "net451"} + { DefaultLoggerParameterNames.TargetFramework , "net462"} }; _consoleLogger.Initialize(new Mock().Object, parameters); @@ -584,12 +584,12 @@ public void TestResultHandlerShouldShowPassedTestsForNormalVebosity() _mockProgressIndicator.Verify(pi => pi.Start(), Times.Exactly(5)); } - [DataRow(".NETFramework,version=v4.5.1", "(net451)", "quiet")] - [DataRow(".NETFramework,version=v4.5.1", "(net451)", "minimal")] + [DataRow(".NETFramework,version=v4.6.2", "(net462)", "quiet")] + [DataRow(".NETFramework,version=v4.6.2", "(net462)", "minimal")] [DataRow(null, null, "quiet")] [DataRow(null, null, "minimal")] [TestMethod] - public void TestResultHandlerShouldShowFailedTestsAndPassedTestsForQuietVebosity(string framework, string expectedFramework, string verbosityLevel) + public void TestResultHandlerShouldShowFailedTestsAndPassedTestsForQuietVerbosity(string framework, string expectedFramework, string verbosityLevel) { var loggerEvents = new InternalTestLoggerEvents(TestSessionMessageLogger.Instance); loggerEvents.EnableEvents(); @@ -648,7 +648,7 @@ public void TestResultHandlerShouldNotShowformattedFailedTestsAndPassedTestsForO var parameters = new Dictionary { { "verbosity", verbosityLevel }, - { DefaultLoggerParameterNames.TargetFramework , "net451"} + { DefaultLoggerParameterNames.TargetFramework , "net462"} }; _consoleLogger.Initialize(loggerEvents, parameters); @@ -665,8 +665,8 @@ public void TestResultHandlerShouldNotShowformattedFailedTestsAndPassedTestsForO loggerEvents.RaiseTestRunComplete(new TestRunCompleteEventArgs(new Mock().Object, false, false, null, new Collection(), new Collection(), TimeSpan.FromSeconds(1))); loggerEvents.WaitForEventCompletion(); - _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net451)"), OutputLevel.Information), Times.Never); - _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net451)"), OutputLevel.Information), Times.Never); + _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.PassedTestIndicator, 2, 1, 0, 1, "1 m 2 s", "TestSourcePassed", "(net462)"), OutputLevel.Information), Times.Never); + _mockOutput.Verify(o => o.WriteLine(string.Format(CultureInfo.CurrentCulture, CommandLineResources.TestRunSummary, CommandLineResources.FailedTestIndicator, 5, 1, 1, 1, "1 h 6 m", "TestSource", "(net462)"), OutputLevel.Information), Times.Never); } [TestMethod] @@ -731,7 +731,7 @@ public void TestResultHandlerShouldWriteToConsoleButSkipPassedTestsForMinimalVer var parameters = new Dictionary { { "verbosity", "minimal" }, - { DefaultLoggerParameterNames.TargetFramework , "net451"} + { DefaultLoggerParameterNames.TargetFramework , "net462"} }; _consoleLogger.Initialize(loggerEvents, parameters); @@ -757,7 +757,7 @@ public void TestResultHandlerShouldWriteToNoTestResultForQuietVerbosity() var parameters = new Dictionary { { "verbosity", "quiet" }, - { DefaultLoggerParameterNames.TargetFramework , "net451"} + { DefaultLoggerParameterNames.TargetFramework , "net462"} }; _consoleLogger.Initialize(loggerEvents, parameters);