From 6249f53095a209aa9793f41b9bda660db1864c0f Mon Sep 17 00:00:00 2001
From: Medeni Baykal <433724+Haplois@users.noreply.github.com>
Date: Sat, 15 May 2021 02:02:16 +0200
Subject: [PATCH] Moved projects to use PackageReference.
---
TestFx.sln | 4 +
.../FxExtensibility/FxExtensibility.csproj | 5 +-
scripts/Build.ps1 | 67 +------
scripts/PortableToFullPdb.ps1 | 11 +-
scripts/build/TestFx.Loc.targets | 30 ++--
scripts/build/TestFx.Settings.targets | 20 +--
scripts/build/TestFx.Versions.targets | 46 ++++-
scripts/build/TestFx.targets | 37 ++--
scripts/common.lib.ps1 | 84 +++++++--
scripts/test.ps1 | 17 +-
scripts/toolset/packages.config | 9 -
scripts/toolset/tools.proj | 51 ++++++
scripts/verify-sign.ps1 | 2 +-
.../Build/Desktop/MSTest.TestAdapter.targets | 14 +-
.../Universal/MSTest.TestAdapter.targets | 12 +-
.../Build/WinUI/MSTest.TestAdapter.targets | 12 +-
.../MSTest.CoreAdapter.csproj | 82 ++++-----
.../PlatformServices.Desktop.csproj | 112 ++++++------
.../PlatformServices.Desktop/packages.config | 15 --
.../PlatformServices.Interface.csproj | 60 +++----
.../packages.config | 21 ---
.../PlatformServices.NetCore.csproj | 79 ++++----
.../PlatformServices.Portable.csproj | 102 +++++------
.../PlatformServices.Portable/packages.config | 21 ---
.../PlatformServices.Universal.csproj | 168 +++++++-----------
.../PlatformServices.Universal/project.json | 20 ---
.../PlatformServices.WinUI.csproj | 80 +++++----
src/Package/sign/sign.proj | 17 +-
.../Extension.Core/Extension.Core.csproj | 24 ++-
.../Extension.Core/packages.config | 5 -
.../Extension.Desktop.csproj | 21 ++-
.../Extension.Desktop/packages.config | 5 -
.../Extension.UWP/Extension.UWP.csproj | 123 ++++---------
src/TestFramework/Extension.UWP/project.json | 19 --
.../Extension.WinUI/Extension.WinUI.csproj | 12 +-
.../MSTest.Core/MSTest.Core.csproj | 16 +-
src/TestFramework/MSTest.Core/packages.config | 5 -
.../App.config | 12 +-
.../DesktopTestSourceHostTests.cs | 36 ++--
...ormServices.Desktop.Component.Tests.csproj | 96 ++++------
.../packages.config | 12 --
.../SampleFrameworkExtensions.csproj | 27 +--
.../TestProjectForDiscovery.csproj | 64 +++----
.../TestProjectForAssemblyResolution.csproj | 10 +-
.../UnitTest1.cs | 2 +-
.../Automation.CLI/Automation.CLI.csproj | 66 +++----
.../Automation.CLI/CLITestBase.common.cs | 2 +-
test/E2ETests/Automation.CLI/packages.config | 15 --
.../DiscoveryAndExecutionTests.csproj | 24 +--
.../Smoke.E2E.Tests/Smoke.E2E.Tests.csproj | 35 ++--
test/E2ETests/Smoke.E2E.Tests/packages.config | 4 -
.../CompatTestProject.csproj | 11 +-
.../DataRowTestProject.csproj | 6 +-
.../DataSourceTestProject.csproj | 7 +-
.../DeploymentTestProject.csproj | 14 +-
.../DeploymentTestProjectNetCore.csproj | 8 +-
.../DesktopTestProjectx64Debug.csproj | 48 ++---
.../DesktopTestProjectx64Release.csproj | 49 ++---
.../DesktopTestProjectx86Debug.csproj | 52 ++----
.../DesktopTestProjectx86Release.csproj | 51 ++----
.../DoNotParallelizeTestProject.csproj | 6 +-
.../FSharpTestProject.fsproj | 2 +-
.../FxExtensibilityTestProject.csproj | 28 +--
.../ParallelClassesTestProject.csproj | 28 +--
.../ParallelMethodsTestProject.csproj | 27 +--
.../TimeoutTestProject.csproj | 2 +-
.../TimeoutTestProjectNetCore.csproj | 4 +-
.../MSTest.Core.Unit.Tests.csproj | 40 ++---
.../MSTest.Core.Unit.Tests/packages.config | 6 -
.../MSTest.CoreAdapter.TestUtilities.csproj | 16 +-
.../packages.config | 4 -
.../MSTest.CoreAdapter.Unit.Tests.csproj | 126 ++++++-------
.../packages.config | 13 --
.../App.config | 12 +-
...PlatformServices.Desktop.Unit.Tests.csproj | 131 ++++++--------
.../packages.config | 10 --
...PlatformServices.NetCore.Unit.Tests.csproj | 57 +++---
...latformServices.Portable.Unit.Tests.csproj | 118 ++++++------
.../packages.config | 10 --
...atformServices.Universal.Unit.Tests.csproj | 129 +++++++-------
.../app.config | 11 --
.../packages.config | 11 --
82 files changed, 1218 insertions(+), 1652 deletions(-)
delete mode 100644 scripts/toolset/packages.config
create mode 100644 scripts/toolset/tools.proj
delete mode 100644 src/Adapter/PlatformServices.Desktop/packages.config
delete mode 100644 src/Adapter/PlatformServices.Interface/packages.config
delete mode 100644 src/Adapter/PlatformServices.Portable/packages.config
delete mode 100644 src/Adapter/PlatformServices.Universal/project.json
delete mode 100644 src/TestFramework/Extension.Core/packages.config
delete mode 100644 src/TestFramework/Extension.Desktop/packages.config
delete mode 100644 src/TestFramework/Extension.UWP/project.json
delete mode 100644 src/TestFramework/MSTest.Core/packages.config
delete mode 100644 test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
delete mode 100644 test/E2ETests/Automation.CLI/packages.config
delete mode 100644 test/E2ETests/Smoke.E2E.Tests/packages.config
delete mode 100644 test/UnitTests/MSTest.Core.Unit.Tests/packages.config
delete mode 100644 test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config
delete mode 100644 test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
delete mode 100644 test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
delete mode 100644 test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
delete mode 100644 test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config
delete mode 100644 test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
diff --git a/TestFx.sln b/TestFx.sln
index 9a296bd667..95d070c953 100644
--- a/TestFx.sln
+++ b/TestFx.sln
@@ -119,6 +119,10 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Portable.Unit.Tests", "test\UnitTests\PlatformServices.Portable.Unit.Tests\PlatformServices.Portable.Unit.Tests.csproj", "{E3C630FE-AF89-4C95-B1B9-2409B1107208}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlatformServices.Universal.Unit.Tests", "test\UnitTests\PlatformServices.Universal.Unit.Tests\PlatformServices.Universal.Unit.Tests.csproj", "{FA7C719F-A400-45AF-8091-7C23435617A8}"
+ ProjectSection(ProjectDependencies) = postProject
+ {DF131865-84EE-4540-8112-E88ACEBDEA09} = {DF131865-84EE-4540-8112-E88ACEBDEA09}
+ {5D153CAA-80C2-4551-9549-6C406FCEEFB1} = {5D153CAA-80C2-4551-9549-6C406FCEEFB1}
+ EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSTest.Core.Unit.Tests", "test\UnitTests\MSTest.Core.Unit.Tests\MSTest.Core.Unit.Tests.csproj", "{0A4A76DD-FEE1-4D04-926B-38E1A24A7ED2}"
EndProject
diff --git a/samples/FxExtensibility/FxExtensibility.csproj b/samples/FxExtensibility/FxExtensibility.csproj
index 7085c3cff2..36f1cc24c4 100644
--- a/samples/FxExtensibility/FxExtensibility.csproj
+++ b/samples/FxExtensibility/FxExtensibility.csproj
@@ -1,9 +1,10 @@
- ..\..\
+ ..\..\
+
Debug
AnyCPU
@@ -39,7 +40,7 @@
-
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index c616c86d24..98ef3513de 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -82,22 +82,6 @@ $TFB_Solutions = @(
"TestFx.sln"
)
-$TFB_NetCoreProjects = @(
- "src\Adapter\PlatformServices.NetCore\PlatformServices.NetCore.csproj"
-
- "test\ComponentTests\TestAssets\TestProjectForAssemblyResolution\TestProjectForAssemblyResolution.csproj"
- "test\E2ETests\TestAssets\CompatTestProject\CompatTestProject.csproj"
- "test\E2ETests\TestAssets\DataRowTestProject\DataRowTestProject.csproj"
- "test\E2ETests\TestAssets\DataSourceTestProject\DataSourceTestProject.csproj"
- "test\E2ETests\TestAssets\DeploymentTestProject\DeploymentTestProject.csproj"
- "test\E2ETests\TestAssets\DeploymentTestProjectNetCore\DeploymentTestProjectNetCore.csproj"
- "test\E2ETests\TestAssets\DoNotParallelizeTestProject\DoNotParallelizeTestProject.csproj"
- "test\E2ETests\TestAssets\FSharpTestProject\FSharpTestProject.fsproj"
- "test\E2ETests\TestAssets\TimeoutTestProject\TimeoutTestProject.csproj"
- "test\E2ETests\TestAssets\TimeoutTestProjectNetCore\TimeoutTestProjectNetCore.csproj"
- "test\UnitTests\PlatformServices.NetCore.Unit.Tests\PlatformServices.NetCore.Unit.Tests.csproj"
-)
-
#
# Script Preferences
#
@@ -154,13 +138,13 @@ function Perform-Restore {
$toolset = Locate-Toolset
if ($TFB_ClearPackageCache) {
- Write-Log " Clearing local package cache..."
+ Write-Log "Clearing local package cache..."
& $nuget locals all -clear
}
- Write-Log " Starting toolset restore..."
- Write-Verbose "$nuget restore -msbuildVersion $msbuildVersion -verbosity normal -nonInteractive -configFile $nugetConfig $toolset"
- & $nuget restore -msbuildVersion $msbuildVersion -verbosity normal -nonInteractive -configFile $nugetConfig $toolset
+ Write-Log "Starting toolset restore..."
+ Write-Verbose "$nuget restore -verbosity normal -nonInteractive -configFile $nugetConfig $toolset"
+ & $nuget restore -verbosity normal -nonInteractive -configFile $nugetConfig $toolset
if ($lastExitCode -ne 0) {
throw "The restore failed with an exit code of '$lastExitCode'."
@@ -168,29 +152,20 @@ function Perform-Restore {
Write-Verbose "Locating MSBuild install path..."
$msbuildPath = Locate-MSBuildPath
+ Write-Verbose "MSBuild install path: $msbuildPath"
Write-Verbose "Starting solution restore..."
foreach ($solution in $TFB_Solutions) {
$solutionPath = Locate-Item -relativePath $solution
- Write-Verbose "$nuget restore -msbuildPath $msbuildPath -verbosity quiet -nonInteractive -configFile $nugetConfig $solutionPath"
- & $nuget restore -msbuildPath $msbuildPath -verbosity quiet -nonInteractive -configFile $nugetConfig $solutionPath
+ Write-Verbose "$nuget restore -msbuildPath $msbuildPath -verbosity normal -nonInteractive -configFile $nugetConfig $solutionPath"
+ & $nuget restore -msbuildPath $msbuildPath -verbosity normal -nonInteractive -configFile $nugetConfig $solutionPath
}
if ($lastExitCode -ne 0) {
throw "The restore failed with an exit code of '$lastExitCode'."
}
- $msbuild = Join-Path $msbuildPath "MSBuild.exe"
-
- Write-Verbose "Starting restore for NetCore Projects"
- foreach ($project in $TFB_NetCoreProjects) {
- $projectPath = Locate-Item -relativePath $project
-
- Write-Verbose "$msbuild /t:restore -verbosity:minimal $projectPath /m"
- & $msbuild /t:restore -verbosity:minimal $projectPath /m
- }
-
if ($lastExitCode -ne 0) {
throw "The restore failed with an exit code of '$lastExitCode'."
}
@@ -300,34 +275,6 @@ function Create-NugetPackages {
Write-Log "Create-NugetPackages: Complete. {$(Get-ElapsedTime($timer))}"
}
-function Replace-InFile($File, $RegEx, $ReplaceWith) {
- $content = Get-Content -Raw -Encoding utf8 $File
- $newContent = ($content -replace $RegEx, $ReplaceWith)
- if (-not $content.Equals($newContent)) {
- Write-Log "Updating TestPlatform version in $File"
- $newContent | Set-Content -Encoding utf8 $File -NoNewline
- }
-}
-
-function Sync-PackageVersions {
- $versionsRegex = '(?mi)<(TestPlatformVersion.*?)>(.*?)<\/TestPlatformVersion>'
- $packageRegex = '(?mi)$TestPlatformVersion"
- }
-
- (Get-ChildItem "$PSScriptRoot\..\src\*packages.config", "$PSScriptRoot\..\test\*packages.config" -Recurse) | ForEach-Object {
- Replace-InFile -File $_ -RegEx $packageRegex -ReplaceWith ('
-
-
-
+
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
- <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath)
+ <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\$(MsTestInternalTestFxLocalizedDocumentationVersion)\contentFiles\any\any\$(LocDocumentationSubPath)
<_LocalizedFiles Include="$(_SourcePath)\**\*.*" />
diff --git a/scripts/build/TestFx.Settings.targets b/scripts/build/TestFx.Settings.targets
index 2f53ecce34..03fee360f4 100644
--- a/scripts/build/TestFx.Settings.targets
+++ b/scripts/build/TestFx.Settings.targets
@@ -1,15 +1,13 @@
- ..\..\
- $(MSBuildThisFileDirectory)..\..\
- true
+ ..\..\
+ $(MSBuildThisFileDirectory)..\..\
+ true
-
-
-
+
Debug
@@ -19,11 +17,11 @@
true
$(MSBuildThisFileDirectory)key.snk
true
- true
+ true
- true
- $(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\
- $(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\obj\
+ true
+ $(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\
+ $(TestFxRoot)artifacts\$(Configuration)\$(MSBuildProjectName)\obj\
true
@@ -35,6 +33,6 @@
false
$(MSBuildThisFileDirectory)stylecop.ruleset
- $(MSBuildThisFileDirectory)stylecop.test.ruleset
+ $(MSBuildThisFileDirectory)stylecop.test.ruleset
\ No newline at end of file
diff --git a/scripts/build/TestFx.Versions.targets b/scripts/build/TestFx.Versions.targets
index 76c8afa9d1..94d50de873 100644
--- a/scripts/build/TestFx.Versions.targets
+++ b/scripts/build/TestFx.Versions.targets
@@ -1,7 +1,49 @@
-
+
- 16.10.0-release-20210421-08
+ 16.10.0-release-20210421-08
+
+
+ 0.2.0
+ 5.9.1
+ 2.5.2
+ 14.0.0
+ 1.1.0-beta2-21064-01
+ 1.0.0-build-20170420-1
+ 0.1.3
+ 16.9.0-preview-4267359
+
+
+
+ 4.3.0
+ 4.3.0
+ 4.3.0
+ 4.3.0
+ 4.3.0
+ 4.3.0
+ 4.3.0
+ 4.3.0
+
+
+ 1.6.0
+ 1.6.0
+
+
+ 5.3.0
+ 0.5.0
+
+
+ 4.8.2
+ 4.2.1
+ 5.10.3
+ 1.0.0
+
+
+ 15.7.0
+ 1.2.0
+ 1.2.0
+
+
11.0
\ No newline at end of file
diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index 3156375e22..c38e98cfb5 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -1,21 +1,18 @@
-
-
+
+
- ..\..\
- ..\..\
+ ..\..\
+ ..\..\
$(TestFxRoot)packages\
- true
+ true
-
-
-
-
+
@@ -25,19 +22,19 @@
-
+
stylecop.json
-
-
-
+
+
+
-
-
+
+
Microsoft400
StrongName
@@ -48,14 +45,6 @@
-
-
- This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
-
-
-
@@ -84,7 +73,7 @@
-
+
diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1
index d63a78aeb9..87a69ed8d2 100644
--- a/scripts/common.lib.ps1
+++ b/scripts/common.lib.ps1
@@ -3,26 +3,39 @@
# Common utilities for building solution and running tests
+$TF_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
+$TF_VERSIONS_FILE = "$TF_ROOT_DIR\scripts\build\TestFx.Versions.targets"
+$TF_OUT_DIR = Join-Path $TF_ROOT_DIR "artifacts"
+$TF_SRC_DIR = Join-Path $TF_ROOT_DIR "src"
+$TF_TEST_DIR = Join-Path $TF_ROOT_DIR "test"
+$TF_PACKAGES_DIR = Join-Path $TF_ROOT_DIR "packages"
+$TF_TOOLS_DIR = Join-Path $TF_ROOT_DIR "tools"
+
+function Get-PackageVersion ([string]$PackageName) {
+ $packages = ([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup
+
+ return $packages[$PackageName].InnerText;
+}
+
#
# Global Variables
#
-$global:msbuildVersion = "15.0"
-$global:nugetVersion = "5.8.1"
-$global:vswhereVersion = "2.0.2"
-$global:nugetUrl = "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/NuGet.exe"
+$global:nugetVersion = Get-PackageVersion -PackageName "NuGetFrameworksVersion"
+$global:vswhereVersion = Get-PackageVersion -PackageName "VsWhereVersion"
#
# Global Environment Variables
#
-$env:TF_ROOT_DIR = (Get-Item (Split-Path $MyInvocation.MyCommand.Path)).Parent.FullName
-$env:TF_OUT_DIR = Join-Path $env:TF_ROOT_DIR "artifacts"
-$env:TF_SRC_DIR = Join-Path $env:TF_ROOT_DIR "src"
-$env:TF_TEST_DIR = Join-Path $env:TF_ROOT_DIR "test"
-$env:TF_PACKAGES_DIR = Join-Path $env:TF_ROOT_DIR "packages"
+$env:TF_ROOT_DIR = $TF_ROOT_DIR
+$env:TF_OUT_DIR = $TF_OUT_DIR
+$env:TF_SRC_DIR = $TF_SRC_DIR
+$env:TF_TEST_DIR = $TF_TEST_DIR
+$env:TF_PACKAGES_DIR = $TF_PACKAGES_DIR
+$env:TF_TOOLS_DIR = $TF_TOOLS_DIR
+$env:DOTNET_CLI_VERSION = "6.0.100-alpha.1.21067.8"
-$TF_VERSIONS_FILE = "$PSScriptRoot\build\TestFx.Versions.targets"
if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) {
- $TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.TestPlatformVersion).InnerText
+ $TestPlatformVersion = Get-PackageVersion -PackageName "MicrosoftNetTestSdkVersion"
}
function Create-Directory([string[]] $path) {
@@ -50,7 +63,7 @@ function Locate-MSBuild($hasVsixExtension = "false") {
$msbuild = Join-Path -path $msbuildPath -childPath "MSBuild.exe"
if (!(Test-Path -path $msbuild)) {
- throw "The specified MSBuild version ($msbuildVersion) could not be located."
+ throw "The specified MSBuild could not be located."
}
return Resolve-Path -path $msbuild
@@ -66,7 +79,7 @@ function Locate-MSBuildPath($hasVsixExtension = "false") {
}
catch {
# Resolve-Path throws if the path does not exist, so use the VS2017 path as a fallback
- $msbuildPath = Join-Path -path $vsInstallPath -childPath "MSBuild\$msbuildVersion\Bin"
+ $msbuildPath = Join-Path -path $vsInstallPath -childPath "MSBuild\15.0\Bin"
$msbuildPath = Resolve-Path $msbuildPath
}
@@ -74,7 +87,7 @@ function Locate-MSBuildPath($hasVsixExtension = "false") {
}
function Locate-NuGet {
- $rootPath = $env:TF_ROOT_DIR
+ $rootPath = $env:TF_PACKAGES_DIR
$nuget = Join-Path -path $rootPath -childPath "nuget.exe"
if (Test-Path -path $nuget) {
@@ -88,7 +101,8 @@ function Locate-NuGet {
Remove-Item -path $nuget | Out-Null
}
- Download-File -address $nugetUrl -fileName $nuget
+ New-Item $rootPath -ItemType Directory | Out-Null
+ Download-File -address "https://dist.nuget.org/win-x86-commandline/v$nugetVersion/NuGet.exe" -fileName $nuget
if (!(Test-Path -path $nuget)) {
throw "The specified NuGet version ($nugetVersion) could not be downloaded."
@@ -105,7 +119,7 @@ function Locate-NuGetConfig {
function Locate-Toolset {
$rootPath = $env:TF_ROOT_DIR
- $toolset = Join-Path -path $rootPath -childPath "scripts\Toolset\packages.config"
+ $toolset = Join-Path -path $rootPath -childPath "scripts\Toolset\tools.proj"
return Resolve-Path -path $toolset
}
@@ -120,7 +134,7 @@ function Locate-PackagesPath {
function Locate-VsWhere {
$packagesPath = Locate-PackagesPath
- $vswhere = Join-Path -path $packagesPath -childPath "vswhere.$vswhereVersion\tools\vswhere.exe"
+ $vswhere = Join-Path -path $packagesPath -childPath "vswhere\$vswhereVersion\tools\vswhere.exe"
Write-Verbose "vswhere location is : $vswhere"
return $vswhere
@@ -162,6 +176,14 @@ function Locate-Item([string] $relativePath) {
return Resolve-Path -path $itemPath
}
+function Get-VSTestPath
+{
+ $TestPlatformVersion = Get-PackageVersion -PackageName "MicrosoftNetTestSdkVersion"
+ $vstestPath = Join-Path -path (Locate-PackagesPath) "Microsoft.TestPlatform\$TestPlatformVersion\tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe"
+
+ return Resolve-Path -path $vstestPath
+}
+
function Start-Timer {
return [System.Diagnostics.Stopwatch]::StartNew()
}
@@ -180,6 +202,34 @@ function Write-Log ([string] $message, $messageColor = "Green") {
$Host.UI.RawUI.ForegroundColor = $currentColor
}
+function Replace-InFile($File, $RegEx, $ReplaceWith) {
+ $content = Get-Content -Raw -Encoding utf8 $File
+ $newContent = ($content -replace $RegEx, $ReplaceWith)
+ if (-not $content.Equals($newContent)) {
+ Write-Log "Updating TestPlatform version in $File"
+ $newContent | Set-Content -Encoding utf8 $File -NoNewline
+ }
+}
+
+function Sync-PackageVersions {
+ $versionsRegex = '(?mi)<(MicrosoftNetTestSdkVersion.*?)>(.*?)<\/MicrosoftNetTestSdkVersion>'
+ $packageRegex = '(?mi)$TestPlatformVersion"
+ }
+
+ (Get-ChildItem "$PSScriptRoot\..\src\*packages.config", "$PSScriptRoot\..\test\*packages.config" -Recurse) | ForEach-Object {
+ Replace-InFile -File $_ -RegEx $packageRegex -ReplaceWith ('
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/scripts/toolset/tools.proj b/scripts/toolset/tools.proj
new file mode 100644
index 0000000000..5f4e61b46a
--- /dev/null
+++ b/scripts/toolset/tools.proj
@@ -0,0 +1,51 @@
+
+
+ $([MSBuild]::NormalizeDirectory('$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'LICENSE'))'))
+
+
+ <_NuGetRestoreTargets Condition="Exists('$(MSBuildToolsPath)\NuGet.targets')" >$(MSBuildToolsPath)\NuGet.targets
+ <_NuGetRestoreTargets Condition="'$([MSBuild]::IsRunningFromVisualStudio())' == 'true' And Exists('$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets')">$(MSBuildToolsPath32)\..\..\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets
+
+
+
+
+
+
+ true
+
+
+
+
+ net472
+
+ 5
+ .NETFramework
+ .NETFramework,Version=v4.7.2
+ $(RepoRoot)artifacts\toolset\
+ $(OutputPath)
+
+
+
+
+ $(RepoRoot)NuGet.config
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/scripts/verify-sign.ps1 b/scripts/verify-sign.ps1
index 14ac0a0e06..8da29e1374 100644
--- a/scripts/verify-sign.ps1
+++ b/scripts/verify-sign.ps1
@@ -33,7 +33,7 @@ function Verify-NugetPackages
$artifactsDirectory = Join-Path $rootDirectory "artifacts"
$artifactsConfigDirectory = Join-Path $artifactsDirectory $TPB_Configuration
$packagesDirectory = Join-Path $artifactsConfigDirectory "MSTestPackages"
- Get-ChildItem -Filter *.nupkg $packagesDirectory | % {
+ Get-ChildItem -Filter *.nupkg $packagesDirectory | ForEach-Object {
& $nugetInstallPath verify -signature -CertificateFingerprint "3F9001EA83C560D712C24CF213C3D312CB3BFF51EE89435D3430BD06B5D0EECE;AA12DA22A49BCE7D5C1AE64CC1F3D892F150DA76140F210ABD2CBFFCA2C18A27;" $_.FullName
}
diff --git a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
index 0649e3a2ac..1c80426d01 100644
--- a/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Desktop/MSTest.TestAdapter.targets
@@ -1,7 +1,7 @@
- true
+ true
@@ -10,21 +10,21 @@
So the below code should not break build in any case. -->
-
-
-
-
+
+
+
+
-
+
%(CurrentUICultureHierarchy.Identity)
-
+
%(MSTestV2ResourceFiles.CultureString)\%(Filename)%(Extension)
PreserveNewest
False
diff --git a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
index b0404380c6..8d11b49377 100644
--- a/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Universal/MSTest.TestAdapter.targets
@@ -1,7 +1,7 @@
- true
+ true
@@ -10,15 +10,15 @@
So the below code should not break build in any case. -->
-
-
-
-
+
+
+
+
-
+
%(CurrentUICultureHierarchy.Identity)
diff --git a/src/Adapter/Build/WinUI/MSTest.TestAdapter.targets b/src/Adapter/Build/WinUI/MSTest.TestAdapter.targets
index b0404380c6..8d11b49377 100644
--- a/src/Adapter/Build/WinUI/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/WinUI/MSTest.TestAdapter.targets
@@ -1,7 +1,7 @@
- true
+ true
@@ -10,15 +10,15 @@
So the below code should not break build in any case. -->
-
-
-
-
+
+
+
+
-
+
%(CurrentUICultureHierarchy.Identity)
diff --git a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
index 66c6afc6c0..5aacfd1dd9 100644
--- a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
+++ b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -29,6 +29,46 @@
prompt
4
+
+
+
+ C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll
+
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+ False
+
+
+ {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
+ PlatformServices.Portable
+ False
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ False
+
+
+ {6c9fe494-8315-4667-b3f6-75dc62a62319}
+ Extension.Core
+ False
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
@@ -90,37 +130,9 @@
Resource.resx
-
-
-
- {6c9fe494-8315-4667-b3f6-75dc62a62319}
- Extension.Core
- False
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- False
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
- False
-
-
- {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
- PlatformServices.Portable
- False
-
-
-
+
-
-
- C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll
-
-
ResXFileCodeGenerator
@@ -128,16 +140,6 @@
Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter
-
-
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
$(ProjectDir)..\Build
diff --git a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
index 0c04867a71..cb0bea9d8b 100644
--- a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
+++ b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -29,35 +29,12 @@
4
true
+
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net45\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
@@ -65,45 +42,78 @@
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+ False
+
+
+ {a7ea583b-a2b0-47da-a058-458f247c7575}
+ Extension.Desktop
+ False
+
+
+ {7252D9E3-267D-442C-96BC-C73AEF3241D6}
+ MSTest.Core
+ False
+
+
-
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
ns10RecursiveDirectoryPath.cs
-
+
Services\ns10MSTestSettingsProvider.cs
-
+
Services\ns10TestContextPropertyStrings.cs
-
+
Utilities\ns10Validate.cs
-
+
Extensions\ns13ExceptionExtensions.cs
-
+
Deployment\ns13DeploymentItem.cs
-
+
Resources\Resource.Designer.cs
True
True
Resource.resx
-
+
Services\ns13MSTestAdapterSettings.cs
-
+
Services\ns13TestDeployment.cs
-
+
Utilities\ns13DeploymentItemUtility.cs
-
+
Utilities\ns13DeploymentUtilityBase.cs
-
+
Utilities\ns13FileUtility.cs
@@ -122,10 +132,10 @@
-
+
Services\ns13TraceListener.cs
-
+
Services\ns13TraceListenerManager.cs
@@ -145,30 +155,11 @@
-
-
-
- {a7ea583b-a2b0-47da-a058-458f247c7575}
- Extension.Desktop
- False
-
-
- {7252D9E3-267D-442C-96BC-C73AEF3241D6}
- MSTest.Core
- False
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
- False
-
-
-
+
-
-
+
Resources\Resource.resx
ResXFileCodeGenerator
Resource.Designer.cs
@@ -176,6 +167,5 @@
Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Desktop/packages.config b/src/Adapter/PlatformServices.Desktop/packages.config
deleted file mode 100644
index ae181db396..0000000000
--- a/src/Adapter/PlatformServices.Desktop/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
index b7a861970b..09707173b6 100644
--- a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
+++ b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -30,6 +30,31 @@
4
true
+
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ False
+
+
+ {6c9fe494-8315-4667-b3f6-75dc62a62319}
+ Extension.Core
+ False
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
@@ -45,39 +70,8 @@
-
-
+
-
-
-
-
- {6c9fe494-8315-4667-b3f6-75dc62a62319}
- Extension.Core
- False
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- False
-
-
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\netstandard1.0\System.ComponentModel.TypeConverter.dll
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Interface/packages.config b/src/Adapter/PlatformServices.Interface/packages.config
deleted file mode 100644
index 46673e74c6..0000000000
--- a/src/Adapter/PlatformServices.Interface/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
index cedc665c7c..fbe28ddd23 100644
--- a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
+++ b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj
@@ -1,6 +1,6 @@
- ..\..\..\
+ ..\..\..\
NetCore
@@ -16,30 +16,43 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -47,7 +60,8 @@
-
+
+
Resources\Resource.Designer.cs
True
True
@@ -56,7 +70,7 @@
-
+
Resources\Resource.resx
ResXFileCodeGenerator
Resource.Designer.cs
@@ -65,18 +79,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
index 103ddb3173..535a3e8a22 100644
--- a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
+++ b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -30,95 +30,89 @@
4
true
+
-
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+ False
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ False
+
+
+ {6C9FE494-8315-4667-B3F6-75DC62A62319}
+ Extension.Core
+ False
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
Constants.cs
-
+
MarshalByRefObject.cs
-
+
SerializableAttribute.cs
-
+
Services\ns10DiaSessionOperations.cs
-
+
Services\ns10FileOperations.cs
-
+
Services\ns10ReflectionOperations.cs
-
+
Services\ns10SettingsProvider.cs
-
+
Services\ns10TestContextImplementation.cs
-
+
Services\ns10TestDataSource.cs
-
+
Services\ns10TestDeployment.cs
-
+
Services\ns10TestSource.cs
-
+
Services\ns10TestSourceHost.cs
-
+
Services\ns10ThreadOperations.cs
-
+
Services\ns10TraceListener.cs
-
+
Services\ns10TraceListenerManager.cs
-
+
Services\ns10TraceLogger.cs
-
-
-
- {6C9FE494-8315-4667-B3F6-75DC62A62319}
- Extension.Core
- False
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- False
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
- False
-
-
-
+
-
-
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\System.ComponentModel.Primitives.4.3.0\lib\netstandard1.0\System.ComponentModel.Primitives.dll
-
-
- ..\..\..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\netstandard1.0\System.ComponentModel.TypeConverter.dll
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Portable/packages.config b/src/Adapter/PlatformServices.Portable/packages.config
deleted file mode 100644
index 46673e74c6..0000000000
--- a/src/Adapter/PlatformServices.Portable/packages.config
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
index cec9d7b559..f2a110155c 100644
--- a/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
+++ b/src/Adapter/PlatformServices.Universal/PlatformServices.Universal.csproj
@@ -1,9 +1,10 @@
-
+
- ..\..\..\
+ ..\..\..\
+
{5D153CAA-80C2-4551-9549-6C406FCEEFB1}
Library
@@ -14,136 +15,108 @@
UAP
10.0.14393.0
10.0.10240.0
- 15
+ 14
+ 512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- ;2008
+ 2008
-
- AnyCPU
+
+
+ true
+ true
+ true
+ PackageReference
+
+
+
+ $(Platform)
true
full
false
DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
-
- AnyCPU
+
+ $(Platform)
pdbonly
true
TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
true
+ false
-
- ARM
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- ARM
- false
- prompt
- true
-
-
- ARM
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
- true
-
-
- x64
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- x64
- false
- prompt
- true
-
-
- x64
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
- true
-
-
- x86
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
- ;2008
- full
- x86
- false
- prompt
- true
-
-
- x86
- TRACE;NETFX_CORE;WINDOWS_UAP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
- true
-
+
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ False
+
+
+ {6c9fe494-8315-4667-b3f6-75dc62a62319}
+ Extension.Core
+ False
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+ False
+
+
+
-
-
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
+
Constants.cs
-
+
MarshalByRefObject.cs
-
+
SerializableAttribute.cs
-
+
Services\ns10ReflectionOperations.cs
-
+
Services\ns10DiaSessionOperations.cs
-
+
Services\ns10SettingsProvider.cs
-
+
Services\ns10TestContextImplementation.cs
-
+
Services\ns10TestDataSource.cs
-
+
Services\ns10TestDeployment.cs
-
+
Services\ns10TestSourceHost.cs
-
+
Services\ns10ThreadOperations.cs
-
+
Services\ns10TraceListener.cs
-
+
Services\ns10TraceListenerManager.cs
@@ -153,23 +126,6 @@
-
-
- {6c9fe494-8315-4667-b3f6-75dc62a62319}
- Extension.Core
- False
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- False
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
- False
-
-
15.0
diff --git a/src/Adapter/PlatformServices.Universal/project.json b/src/Adapter/PlatformServices.Universal/project.json
deleted file mode 100644
index a459dfaf70..0000000000
--- a/src/Adapter/PlatformServices.Universal/project.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "dependencies": {
- "MicroBuild.Core": "0.2.0",
- "Microsoft.TestPlatform.ObjectModel": "16.9.0-preview-20201021-10",
- "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
-
- "StyleCop.Analyzers": "1.0.0"
- },
- "frameworks": {
- "uap10.0.10240": {}
- },
- "runtimes": {
- "win10-arm": {},
- "win10-arm-aot": {},
- "win10-x86": {},
- "win10-x86-aot": {},
- "win10-x64": {},
- "win10-x64-aot": {}
- }
-}
\ No newline at end of file
diff --git a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
index e49ece17e3..5ef7d1ef64 100644
--- a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
+++ b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj
@@ -1,6 +1,6 @@
- ..\..\..\
+ ..\..\..\
NetCore
@@ -18,46 +18,60 @@
false
true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
Constants.cs
-
+
Services\ns10ReflectionOperations.cs
-
+
Services\ns10DiaSessionOperations.cs
-
+
Services\ns10TestContextImplementation.cs
-
+
Services\ns10TestDataSource.cs
-
+
Services\ns13TestDeployment.cs
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Services\ns10ThreadOperations.cs
-
+
Services\ns10TraceListener.cs
-
+
Services\ns10TraceListenerManager.cs
@@ -67,7 +81,8 @@
-
+
+
Resources\Resource.Designer.cs
True
True
@@ -76,7 +91,7 @@
-
+
Resources\Resource.resx
ResXFileCodeGenerator
Resource.Designer.cs
@@ -85,18 +100,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Package/sign/sign.proj b/src/Package/sign/sign.proj
index 1c426b309b..7f60058187 100644
--- a/src/Package/sign/sign.proj
+++ b/src/Package/sign/sign.proj
@@ -1,20 +1,21 @@
- Test
- 0.2.0
+ Test
$(MSBuildThisFileDirectory)..\..\..\
- Release
- $(RootDirectory)artifacts\$(BuildConfiguration)\MSTestPackages
- $(RootDirectory)artifacts\obj\$(BuildConfiguration)\MSTestPackages
-
+ Release
+ $(RootDirectory)artifacts\$(BuildConfiguration)\MSTestPackages
+ $(RootDirectory)artifacts\obj\$(BuildConfiguration)\MSTestPackages
+
+
+
-
-
+
+
diff --git a/src/TestFramework/Extension.Core/Extension.Core.csproj b/src/TestFramework/Extension.Core/Extension.Core.csproj
index 1fc52d1a70..373740b97c 100644
--- a/src/TestFramework/Extension.Core/Extension.Core.csproj
+++ b/src/TestFramework/Extension.Core/Extension.Core.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -34,20 +34,28 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\Core
+
-
-
-
-
-
-
+
{7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
False
+
-
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/TestFramework/Extension.Core/packages.config b/src/TestFramework/Extension.Core/packages.config
deleted file mode 100644
index 56e01ebc8f..0000000000
--- a/src/TestFramework/Extension.Core/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
index 078cd59ccb..8b6fa3c287 100644
--- a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
+++ b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -32,9 +32,7 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\Desktop
-
-
-
+
@@ -45,14 +43,23 @@
-
-
-
+
+
{7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
False
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
diff --git a/src/TestFramework/Extension.Desktop/packages.config b/src/TestFramework/Extension.Desktop/packages.config
deleted file mode 100644
index 631b26d47a..0000000000
--- a/src/TestFramework/Extension.Desktop/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.UWP/Extension.UWP.csproj b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
index 443acffef1..6598d36b14 100644
--- a/src/TestFramework/Extension.UWP/Extension.UWP.csproj
+++ b/src/TestFramework/Extension.UWP/Extension.UWP.csproj
@@ -1,9 +1,10 @@
- ..\..\..\
+ ..\..\..\
+
{DF131865-84EE-4540-8112-E88ACEBDEA09}
Library
@@ -17,115 +18,69 @@
15
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
+ 2008
-
- AnyCPU
+
+
+ true
+ true
+ PackageReference
+
+
+
+ $(Platform)
true
full
false
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
+ DEBUG;TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
-
- AnyCPU
+
+ $(Platform)
pdbonly
true
- TRACE;NETFX_CORE;WINDOWS_UWP
+ TRACE;NETFX_CORE;WINDOWS_UAP
prompt
4
+ true
+ false
-
- x86
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x86
- false
- prompt
-
-
- x86
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x86
- false
- prompt
-
-
- ARM
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- ARM
- false
- prompt
-
-
- ARM
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- ARM
- false
- prompt
-
-
- x64
- true
- DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP
- ;2008
- full
- x64
- false
- prompt
-
-
- x64
- TRACE;NETFX_CORE;WINDOWS_UWP
- true
- ;2008
- pdbonly
- x64
- false
- prompt
-
+
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.XML
Extensions\UWP
+
-
-
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ False
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- False
-
-
-
+
15.0
-
\ No newline at end of file
diff --git a/src/TestFramework/Extension.UWP/project.json b/src/TestFramework/Extension.UWP/project.json
deleted file mode 100644
index a739cd4b0b..0000000000
--- a/src/TestFramework/Extension.UWP/project.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "dependencies": {
- "MicroBuild.Core": "0.2.0",
- "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.0",
-
- "StyleCop.Analyzers": "1.0.0"
- },
- "frameworks": {
- "uap10.0": {}
- },
- "runtimes": {
- "win10-arm": {},
- "win10-arm-aot": {},
- "win10-x86": {},
- "win10-x86-aot": {},
- "win10-x64": {},
- "win10-x64-aot": {}
- }
-}
\ No newline at end of file
diff --git a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
index c95ab1e3e5..adabcd5a19 100644
--- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
+++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj
@@ -18,22 +18,22 @@
- ..\..\..\
+ ..\..\..\
NetCore
-
-
-
+
-
+
+
+
-
+
diff --git a/src/TestFramework/MSTest.Core/MSTest.Core.csproj b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
index e21a2e33ef..df06d880a2 100644
--- a/src/TestFramework/MSTest.Core/MSTest.Core.csproj
+++ b/src/TestFramework/MSTest.Core/MSTest.Core.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -34,6 +34,16 @@
$(OutputPath)\Microsoft.VisualStudio.TestPlatform.TestFramework.XML
Core
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
@@ -69,9 +79,7 @@
-
-
-
+
ResXFileCodeGenerator
diff --git a/src/TestFramework/MSTest.Core/packages.config b/src/TestFramework/MSTest.Core/packages.config
deleted file mode 100644
index 56e01ebc8f..0000000000
--- a/src/TestFramework/MSTest.Core/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
index 046966f135..9c21941772 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/App.config
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
index 88975f66ad..b2b3a5f224 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/DesktopTestSourceHostTests.cs
@@ -22,18 +22,6 @@ namespace PlatformServices.Desktop.ComponentTests
public class DesktopTestSourceHostTests
{
private TestSourceHost testSourceHost;
- private string testSource;
-
- public DesktopTestSourceHostTests()
- {
- var currentAssemblyPath = Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location);
- var testAssetPath =
- Path.Combine(
- Directory.GetParent(Directory.GetParent(Directory.GetParent(currentAssemblyPath).FullName).FullName).FullName,
- "artifacts",
- "TestAssets");
- this.testSource = Path.Combine(testAssetPath, "DesktopTestProjectx86Debug.dll");
- }
[TestMethod]
public void ParentDomainShouldHonourSearchDirectoriesSpecifiedInRunsettings()
@@ -52,7 +40,8 @@ public void ParentDomainShouldHonourSearchDirectoriesSpecifiedInRunsettings()
";
- this.testSourceHost = new TestSourceHost(this.testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
this.testSourceHost.SetupHost();
// Loading TestProjectForAssemblyResolution.dll should not throw.
@@ -77,19 +66,24 @@ public void ChildDomainResolutionPathsShouldHaveSearchDirectoriesSpecifiedInRuns
";
- this.testSourceHost = new TestSourceHost(this.testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
-
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, this.GetMockedIRunSettings(runSettingxml).Object, null);
this.testSourceHost.SetupHost();
+ var assemblyResolution = "ComponentTests\\TestProjectForAssemblyResolution.dll";
+ var asm = Assembly.LoadFrom(assemblyResolution);
+ var type = asm.GetType("PlatformServices.Desktop.ComponentTests.TestProjectForAssemblyResolution");
+
// Creating instance of TestProjectForAssemblyResolution should not throw.
// It is present in specified in runsettings
- AppDomainUtilities.CreateInstance(this.testSourceHost.AppDomain, typeof(TestProjectForAssemblyResolution), null);
+ AppDomainUtilities.CreateInstance(this.testSourceHost.AppDomain, type, null);
}
[TestMethod]
public void DisposeShouldUnloadChildAppDomain()
{
- this.testSourceHost = new TestSourceHost(this.testSource, null, null);
+ var testSource = GetTestAssemblyPath("DesktopTestProjectx86Debug.dll");
+ this.testSourceHost = new TestSourceHost(testSource, null, null);
this.testSourceHost.SetupHost();
// Check that child appdomain was indeed created
@@ -100,6 +94,14 @@ public void DisposeShouldUnloadChildAppDomain()
Assert.IsNull(this.testSourceHost.AppDomain);
}
+ private static string GetTestAssemblyPath(string assemblyName)
+ {
+ var currentAssemblyPath = Path.GetDirectoryName(typeof(DesktopTestSourceHostTests).Assembly.Location);
+ var testAssetPath = Path.Combine(Directory.GetParent(Directory.GetParent(Directory.GetParent(currentAssemblyPath).FullName).FullName).FullName, "artifacts", "TestAssets");
+
+ return Path.Combine(testAssetPath, assemblyName);
+ }
+
private Mock GetMockedIRunSettings(string runSettingxml)
{
var mockRunSettings = new Mock();
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
index 05dbabd7e8..62457c838d 100644
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
+++ b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/PlatformServices.Desktop.Component.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -15,8 +15,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -37,85 +37,53 @@
prompt
4
+
-
- ..\..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.8.2\lib\net45\Moq.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
+
+
+
FrameworkV1
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll
-
-
- ..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
-
-
-
-
-
-
-
-
-
-
- Designer
-
-
-
-
-
+
+
{b0fce474-14bc-449a-91ea-a433342c0d63}
PlatformServices.Desktop
-
+
{bbc99a6b-4490-49dd-9c12-af2c1e95576e}
PlatformServices.Interface
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
+
+ {7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
FrameworkV2
-
+
{5c411bbf-fcc9-4430-ae08-07666d39fd04}
SampleFrameworkExtensions
-
- {0b057b99-dcdd-417a-bc19-3e63ddd86f24}
- TestProjectForAssemblyResolution
-
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+ Designer
+
-
\ No newline at end of file
diff --git a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config b/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
deleted file mode 100644
index 79fb921202..0000000000
--- a/test/ComponentTests/PlatformServices.Desktop.Component.Tests/packages.config
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/ComponentTests/TestAssets/SampleFrameworkExtensions/SampleFrameworkExtensions.csproj b/test/ComponentTests/TestAssets/SampleFrameworkExtensions/SampleFrameworkExtensions.csproj
index 8a2e84eb2c..2cc6cdc1aa 100644
--- a/test/ComponentTests/TestAssets/SampleFrameworkExtensions/SampleFrameworkExtensions.csproj
+++ b/test/ComponentTests/TestAssets/SampleFrameworkExtensions/SampleFrameworkExtensions.csproj
@@ -30,15 +30,13 @@
prompt
4
+
true
-
-
true
-
-
$(TestFxRoot)scripts\build\key.snk
+
@@ -48,25 +46,16 @@
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+
+
-
-
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
-
-
-
\ No newline at end of file
diff --git a/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj b/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj
index 83331431d6..fa41acb98c 100644
--- a/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj
+++ b/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,68 +14,52 @@
v4.5
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
$(TestFxRoot)artifacts\TestAssets\
False
UnitTest
-
- true
- full
- false
- DEBUG;TRACE
- prompt
- 4
-
-
+
+
pdbonly
- true
TRACE
+ true
prompt
- 4
+ x64
+ MinimumRecommendedRules.ruleset
-
+
+
+ full
true
DEBUG;TRACE
- full
- x64
- prompt
- MinimumRecommendedRules.ruleset
-
-
- TRACE
- true
- pdbonly
- x64
+ false
prompt
+ 4
+ x64
MinimumRecommendedRules.ruleset
+
-
-
-
-
-
-
-
+
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
-
+
{5c411bbf-fcc9-4430-ae08-07666d39fd04}
SampleFrameworkExtensions
+
+
+
+
+
+
-
\ No newline at end of file
diff --git a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj
index 2cef981320..c7c1265d7e 100644
--- a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj
+++ b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj
@@ -1,7 +1,9 @@
- ..\..\..\..\
+ ..\..\..\..\
+
+
net452
@@ -14,8 +16,8 @@
-
-
-
+
+
+
diff --git a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
index 205eca7442..6741422a2a 100644
--- a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
+++ b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/UnitTest1.cs
@@ -5,7 +5,7 @@ namespace PlatformServices.Desktop.ComponentTests
{
[TestClass]
[Serializable]
- public class TestProjectForAssemblyResolution
+ public class TestProjectForAssemblyResolution : MarshalByRefObject
{
[TestMethod]
public void TestMethod1()
diff --git a/test/E2ETests/Automation.CLI/Automation.CLI.csproj b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
index 83ee2a0787..95b891ae13 100644
--- a/test/E2ETests/Automation.CLI/Automation.CLI.csproj
+++ b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -31,48 +31,26 @@
prompt
4
+
+
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CommunicationUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.TranslationLayer.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.Common.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard1.3\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll
- True
-
@@ -80,13 +58,13 @@
-
-
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
+
@@ -98,17 +76,17 @@
-
+
$(TargetDir)..\
$(TargetDir)..\..\TestAssets
$(TestFxRoot)\packages
- xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)"
- xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard1.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp1.1\"
- xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp2.1\"
+ xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities\$(MicrosoftNetTestSdkVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)"
+ xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities\$(MicrosoftNetTestSdkVersion)\lib\netstandard1.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp1.1\"
+ xcopy /Y /I "$(PackagesPath)\microsoft.testplatform.adapterutilities\$(MicrosoftNetTestSdkVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" "$(DestinationPath)\netcoreapp2.1\"
xcopy /Y /I "$(SourcePath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" "$(DestinationPath)"
xcopy /Y /I "$(SourcePath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" "$(DestinationPath)"
xcopy /Y /I "$(SourcePath)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" "$(DestinationPath)"
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.common.cs b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
index 5fa0221792..c5241f57a8 100644
--- a/test/E2ETests/Automation.CLI/CLITestBase.common.cs
+++ b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
@@ -19,7 +19,7 @@ public partial class CLITestBase
private const string PackagesFolder = "packages";
// This value is automatically updated by "build.ps1" script.
- private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform.16.10.0-release-20210421-08";
+ private const string TestPlatformCLIPackage = @"Microsoft.TestPlatform\16.10.0-release-20210421-08";
private const string VstestConsoleRelativePath = @"tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";
///
diff --git a/test/E2ETests/Automation.CLI/packages.config b/test/E2ETests/Automation.CLI/packages.config
deleted file mode 100644
index 98803acf5a..0000000000
--- a/test/E2ETests/Automation.CLI/packages.config
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
index c12fa7e130..a0e7aa3e4b 100644
--- a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
+++ b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj
@@ -1,8 +1,8 @@
- ..\..\..\
+ ..\..\..\
false
- $(TestFxRoot)artifacts\$(Configuration)\
+ $(TestFxRoot)artifacts\$(Configuration)\
@@ -24,33 +24,33 @@
-
-
-
-
+
+
+
+
- $(SourcePath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
+ $(ArtifactsPath)MSTest.CoreAdapter\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll
- $(SourcePath)MSTest.CoreAdapter\System.Collections.Concurrent.dll
+ $(ArtifactsPath)MSTest.CoreAdapter\System.Collections.Concurrent.dll
- $(SourcePath)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
+ $(ArtifactsPath)PlatformServices.Desktop\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
- $(SourcePath)PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
+ $(ArtifactsPath)PlatformServices.Interface\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.dll
- $(SourcePath)MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
+ $(ArtifactsPath)MSTest.Core\Microsoft.VisualStudio.TestPlatform.TestFramework.dll
- $(SourcePath)Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
+ $(ArtifactsPath)Extension.Desktop\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
diff --git a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
index 1b8309dd68..8ee9f61d10 100644
--- a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
+++ b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -23,23 +23,34 @@
true
full
false
+ DEBUG;TRACE
prompt
4
pdbonly
true
+ TRACE
prompt
4
-
- DEBUG;TRACE
- TRACE
-
+
-
-
+
+
+
+ {9c1219e0-e775-47f9-9236-63f03f774801}
+ Automation.CLI
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
@@ -55,15 +66,7 @@
-
-
-
-
-
- {9c1219e0-e775-47f9-9236-63f03f774801}
- Automation.CLI
-
-
+
\ No newline at end of file
diff --git a/test/E2ETests/Smoke.E2E.Tests/packages.config b/test/E2ETests/Smoke.E2E.Tests/packages.config
deleted file mode 100644
index e0c6eb980b..0000000000
--- a/test/E2ETests/Smoke.E2E.Tests/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj b/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj
index 5f88101c04..e10e3f5568 100644
--- a/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj
+++ b/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj
@@ -1,20 +1,21 @@
- ..\..\..\..\
+ ..\..\..\..\
+
+
net452
false
false
$(TestFxRoot)artifacts\TestAssets\CompatTests
-
-
-
-
+
+
+
diff --git a/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj b/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj
index 56d97e8d71..16bf36e160 100644
--- a/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj
+++ b/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj
index 5b3ec27ed2..ef3557856e 100644
--- a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj
+++ b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
@@ -9,12 +9,11 @@
false
false
$(TestFxRoot)artifacts\TestAssets\
-
-
-
+
+
diff --git a/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj b/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj
index 7052a2f2f4..82020dcc5f 100644
--- a/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj
+++ b/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
- Never
+ ..\..\..\..\
+ Never
@@ -13,12 +13,12 @@
-
+
+
-
-
+
@@ -37,10 +37,10 @@
-
+
-
+
diff --git a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
index 4227314bef..587f84c6f2 100644
--- a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
+++ b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
@@ -1,6 +1,6 @@
- ..\..\..\..\
+ ..\..\..\..\
false
@@ -13,12 +13,12 @@
-
+
+
-
-
+
diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj
index 7832edbb06..aa3e2a284a 100644
--- a/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj
+++ b/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,59 +14,48 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
$(TestFxRoot)artifacts\TestAssets\
-
+
true
full
- false
DEBUG;TRACE
+ false
+ x64
prompt
4
-
-
- pdbonly
- true
- TRACE
- prompt
- 4
-
-
- true
- DEBUG;TRACE
- full
- x64
- prompt
MinimumRecommendedRules.ruleset
-
+
+ pdbonly
TRACE
true
- pdbonly
- x64
+ x64
prompt
+ 4
MinimumRecommendedRules.ruleset
+
-
-
-
+
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
False
-
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
False
+
UnitTest1.cs
@@ -75,11 +64,4 @@
-
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj
index 53a457c505..1a7fe1c794 100644
--- a/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj
+++ b/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,59 +14,49 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
$(TestFxRoot)artifacts\TestAssets\
-
+
+
true
full
- false
DEBUG;TRACE
+ false
+ x64
prompt
4
-
-
- pdbonly
- true
- TRACE
- prompt
- 4
-
-
- true
- DEBUG;TRACE
- full
- x64
- prompt
MinimumRecommendedRules.ruleset
-
+
+ pdbonly
TRACE
true
- pdbonly
- x64
+ x64
prompt
+ 4
MinimumRecommendedRules.ruleset
+
-
-
-
+
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
False
-
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
False
+
UnitTest1.cs
@@ -75,11 +65,4 @@
-
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj
index 807205e889..4fdef1da3e 100644
--- a/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj
+++ b/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj
@@ -1,8 +1,7 @@
-
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -15,8 +14,8 @@
v4.5
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -25,63 +24,46 @@
$(TestFxRoot)artifacts\TestAssets\
-
+
+
true
full
- false
DEBUG;TRACE
+ false
+ x86
prompt
4
-
-
- pdbonly
- true
- TRACE
- prompt
- 4
-
-
- true
- DEBUG;TRACE
- full
- x86
- prompt
MinimumRecommendedRules.ruleset
-
+
+ pdbonly
TRACE
true
- pdbonly
- x86
+ x86
prompt
+ 4
MinimumRecommendedRules.ruleset
+
-
+
+
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
False
-
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
False
-
-
-
+
-
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj
index 0f63eaa296..7097bcdc10 100644
--- a/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj
+++ b/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,72 +14,55 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
$(TestFxRoot)artifacts\TestAssets\
-
+
+
true
full
- false
DEBUG;TRACE
+ false
+ x86
prompt
4
-
-
- pdbonly
- true
- TRACE
- prompt
- 4
-
-
- true
- DEBUG;TRACE
- full
- x86
- prompt
MinimumRecommendedRules.ruleset
-
+
+ pdbonly
TRACE
true
- pdbonly
- x86
+ x86
prompt
+ 4
MinimumRecommendedRules.ruleset
+
-
-
-
+
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
False
-
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
False
+
-
+
UnitTest1.cs
-
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj b/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj
index d17b65853f..b72cc0078c 100644
--- a/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj
+++ b/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
@@ -12,8 +12,8 @@
-
-
+
+
diff --git a/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj b/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
index bab2871807..5ecbbc5e1d 100644
--- a/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
+++ b/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
@@ -1,6 +1,6 @@
- ..\..\..\..\
+ ..\..\..\..\
diff --git a/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj b/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj
index 9e587e801d..7f2d781b61 100644
--- a/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj
+++ b/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,8 +14,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -36,9 +36,20 @@
prompt
4
+
+
+
+ {a82770c0-1ff5-43c7-8790-471d5e4f8d6e}
+ FxExtensibility
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+
+
@@ -47,16 +58,7 @@
-
-
- {a82770c0-1ff5-43c7-8790-471d5e4f8d6e}
- FxExtensibility
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
-
-
+
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj b/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj
index 794da950c2..8af5a83aef 100644
--- a/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj
+++ b/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,8 +14,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -36,26 +36,30 @@
prompt
4
+
+
-
-
-
-
-
-
-
-
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
-
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj b/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj
index 6ad0a60ac3..06f1576454 100644
--- a/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj
+++ b/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj
@@ -1,7 +1,7 @@
- ..\..\..\..\
+ ..\..\..\..\
Debug
@@ -14,8 +14,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -36,25 +36,26 @@
prompt
4
+
-
-
-
-
-
-
-
-
-
+
+
{a7ea583b-a2b0-47da-a058-458f247c7575}
Extension.Desktop
-
+
{7252d9e3-267d-442c-96bc-c73aef3241d6}
MSTest.Core
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/E2ETests/TestAssets/TimeoutTestProject/TimeoutTestProject.csproj b/test/E2ETests/TestAssets/TimeoutTestProject/TimeoutTestProject.csproj
index 482fd0b45e..04b604f89c 100644
--- a/test/E2ETests/TestAssets/TimeoutTestProject/TimeoutTestProject.csproj
+++ b/test/E2ETests/TestAssets/TimeoutTestProject/TimeoutTestProject.csproj
@@ -1,6 +1,6 @@
- ..\..\..\..\
+ ..\..\..\..\
diff --git a/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
index d4cee39ff3..335eba69ee 100644
--- a/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
+++ b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj
@@ -1,6 +1,6 @@
- ..\..\..\..\
+ ..\..\..\..\
@@ -13,7 +13,7 @@
-
+
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj b/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
index 8ffb1e2078..d7ed96023b 100644
--- a/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
+++ b/test/UnitTests/MSTest.Core.Unit.Tests/MSTest.Core.Unit.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -12,8 +12,8 @@
Microsoft.VisualStudio.TestPlatform.TestFramework.UnitTests
v4.5.2
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -33,35 +33,32 @@
prompt
4
+
-
- $(TestFxRoot)packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- $(TestFxRoot)packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
-
-
+
+ FrameworkV1
+
+
+
{7252D9E3-267D-442C-96BC-C73AEF3241D6}
MSTest.Core
FrameworkV2
-
+
{F81C7549-E3A3-4770-AC3F-3BC7356E61E8}
MSTest.CoreAdapter.TestUtilities
+
-
- FrameworkV1
-
-
-
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
@@ -73,9 +70,6 @@
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.Core.Unit.Tests/packages.config b/test/UnitTests/MSTest.Core.Unit.Tests/packages.config
deleted file mode 100644
index 32d98fb3a2..0000000000
--- a/test/UnitTests/MSTest.Core.Unit.Tests/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
index bc697765f9..36bf0e7240 100644
--- a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
+++ b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -12,8 +12,8 @@
MSTestAdapter.TestUtilities
v4.5.1
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -33,17 +33,21 @@
prompt
4
+
-
-
+
FrameworkV1
+
-
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
diff --git a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config
deleted file mode 100644
index 3644cdfa3c..0000000000
--- a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
index 666bbf7aea..3d19693d91 100644
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
+++ b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/MSTest.CoreAdapter.Unit.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -13,8 +13,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion
False
UnitTest
1685
@@ -34,51 +34,63 @@
prompt
4
+
-
- $(TestFxRoot)packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\FluentAssertions.5.10.3\lib\net45\FluentAssertions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- $(TestFxRoot)packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
- ..\..\..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll
-
+
FrameworkV1
True
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+ True
+
+
+ {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
+ PlatformServices.Portable
+ True
+
+
+ {98ba6d2c-1f3d-4636-8e1d-d4932b7a253d}
+ MSTest.CoreAdapter
+ True
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ FrameworkV2
+ True
+
+
+ {6C9FE494-8315-4667-B3F6-75DC62A62319}
+ Extension.Core
+ FrameworkV2CoreExtension
+ True
+
+
+ {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
+ MSTest.CoreAdapter.TestUtilities
+ True
+
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
@@ -120,44 +132,8 @@
-
-
+
-
-
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
- True
-
-
- {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
- PlatformServices.Portable
- True
-
-
- {98ba6d2c-1f3d-4636-8e1d-d4932b7a253d}
- MSTest.CoreAdapter
- True
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- FrameworkV2
- True
-
-
- {6C9FE494-8315-4667-B3F6-75DC62A62319}
- Extension.Core
- FrameworkV2CoreExtension
- True
-
-
- {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
- MSTest.CoreAdapter.TestUtilities
- True
-
diff --git a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config b/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
deleted file mode 100644
index f8236bbbc5..0000000000
--- a/test/UnitTests/MSTest.CoreAdapter.Unit.Tests/packages.config
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
index d477166232..fb3c2554dd 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/App.config
@@ -1,18 +1,18 @@
-
+
-
-
+
+
-
-
+
+
-
+
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
index 2eec8729e3..a58e535389 100644
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/PlatformServices.Desktop.Unit.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -13,8 +13,8 @@
v4.5.2
512
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
@@ -35,74 +35,84 @@
prompt
4
+
-
- ..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
+
+
+
FrameworkV1
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
+
+
+ {b0fce474-14bc-449a-91ea-a433342c0d63}
+ PlatformServices.Desktop
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+
+
+ {a7ea583b-a2b0-47da-a058-458f247c7575}
+ Extension.Desktop
+ FrameworkV2Extension
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ FrameworkV2
+
+
+ {F81C7549-E3A3-4770-AC3F-3BC7356E61E8}
+ MSTest.CoreAdapter.TestUtilities
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
+
Deployment\ns10DeploymentItemTests.cs
-
+
Deployment\ns10TestRunDirectoriesTests.cs
-
+
Extensions\ns10ExceptionExtensionsTests.cs
-
+
Services\ns10MSTestAdapterSettingsTests.cs
-
+
Utilities\ns10DeploymentUtilityTests.cs
-
+
Utilities\ns10FileUtilityTests.cs
-
+
Services\ns13TraceListenerManagerTests.cs
-
+
Services\ns13TraceListenerTests.cs
-
+
Services\ns13MSTestSettingsProviderTests.cs
-
+
Services\ns13TestDeploymentTests.cs
-
+
Utilities\ns13DeploymentItemUtilityTests.cs
-
+
Utilities\ns13ReflectionUtilityTests.cs
@@ -121,43 +131,16 @@
-
-
+
+
+ Designer
+
+
Always
Designer
-
-
- Designer
-
-
-
-
-
- {b0fce474-14bc-449a-91ea-a433342c0d63}
- PlatformServices.Desktop
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
-
-
- {a7ea583b-a2b0-47da-a058-458f247c7575}
- Extension.Desktop
- FrameworkV2Extension
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- FrameworkV2
-
-
- {F81C7549-E3A3-4770-AC3F-3BC7356E61E8}
- MSTest.CoreAdapter.TestUtilities
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
deleted file mode 100644
index 75ac30848c..0000000000
--- a/test/UnitTests/PlatformServices.Desktop.Unit.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
index 24dfdede8a..a3c7d91723 100644
--- a/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.NetCore.Unit.Tests/PlatformServices.NetCore.Unit.Tests.csproj
@@ -1,6 +1,6 @@
- ..\..\..\
+ ..\..\..\
false
@@ -14,45 +14,40 @@
CS1685
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
index 0e00c1f40d..fc86f1543b 100644
--- a/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Portable.Unit.Tests/PlatformServices.Portable.Unit.Tests.csproj
@@ -1,7 +1,7 @@
- ..\..\..\
+ ..\..\..\
@@ -12,8 +12,8 @@
MSTestAdapter.PlatformServices.Portable.UnitTests
v4.5.2
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
False
UnitTest
1685
@@ -33,94 +33,82 @@
prompt
4
+
-
- ..\..\..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
-
+
+
FrameworkV1
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.5.21\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
+
+
+ {BBC99A6B-4490-49DD-9C12-AF2C1E95576E}
+ PlatformServices.Interface
+
+
+ {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
+ PlatformServices.Portable
+
+
+ {6c9fe494-8315-4667-b3f6-75dc62a62319}
+ Extension.Core
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ FrameworkV2
+
+
+ {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
+ MSTest.CoreAdapter.TestUtilities
+
+
+
+
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
+
Services\ns10AssemblyAttributes.cs
-
+
Services\ns10FileOperationsTests.cs
-
+
Services\ns10DiaSessionOperationsTests.cs
-
+
Services\ns10ReflectionOperationsTests.cs
-
+
Services\ns10SettingsProviderTests.cs
-
+
Services\ns10TestContextImplementationTests.cs
-
+
Services\ns10TestSourceHostTests.cs
-
+
Services\ns10TestSourceTests.cs
-
+
Services\ns10ThreadOperationsTests.cs
-
-
+
-
-
-
-
- {BBC99A6B-4490-49DD-9C12-AF2C1E95576E}
- PlatformServices.Interface
-
-
- {58bdd63d-5e58-4d23-bdf5-592e5e03d29d}
- PlatformServices.Portable
-
-
- {6c9fe494-8315-4667-b3f6-75dc62a62319}
- Extension.Core
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- FrameworkV2
-
-
- {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
- MSTest.CoreAdapter.TestUtilities
-
diff --git a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
deleted file mode 100644
index b5d1923828..0000000000
--- a/test/UnitTests/PlatformServices.Portable.Unit.Tests/packages.config
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj b/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
index 61f57ff3f6..cf1f301332 100644
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
+++ b/test/UnitTests/PlatformServices.Universal.Unit.Tests/PlatformServices.Universal.Unit.Tests.csproj
@@ -1,7 +1,8 @@
- ..\..\..\
+ ..\..\..\
+ $(TestFxRoot)artifacts\$(Configuration)\
@@ -12,13 +13,19 @@
Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.UWP.UnitTests
v4.5.2
{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- 10.0
- $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
+ 10.0
+ $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
False
UnitTest
1685
+
+ true
+ true
+ true
+ PackageReference
+
true
full
@@ -34,97 +41,85 @@
prompt
4
+
-
- ..\..\..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll
- True
-
-
- ..\..\..\packages\Microsoft.TestPlatform.AdapterUtilities.$(TestPlatformVersion)\lib\uap10.0\Microsoft.TestPlatform.AdapterUtilities.dll
-
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.CoreUtilities.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(ArtifactsPath)PlatformServices.Universal\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.TestPlatform.PlatformAbstractions.dll
+
+ $(ArtifactsPath)Extension.UWP\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll
FrameworkV1
-
- ..\..\..\packages\Microsoft.TestPlatform.ObjectModel.$(TestPlatformVersion)\lib\net451\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll
-
-
- ..\..\..\packages\Moq.4.7.8\lib\net45\Moq.dll
- True
-
-
- ..\..\..\packages\NuGet.Frameworks.5.0.0\lib\net40\NuGet.Frameworks.dll
-
-
-
- ..\..\..\packages\System.Collections.Immutable.1.5.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll
-
-
- ..\..\..\packages\System.Reflection.Metadata.1.6.0\lib\portable-net45+win8\System.Reflection.Metadata.dll
-
-
-
+
+
+ {7252d9e3-267d-442c-96bc-c73aef3241d6}
+ MSTest.Core
+ FrameworkV2
+
+
+ {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
+ PlatformServices.Interface
+
+
+ {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
+ MSTest.CoreAdapter.TestUtilities
+
+
-
-
- Designer
-
+
+
+
+
+
+
+
+
+
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
-
+
Services\ns10AssemblyAttributes.cs
-
+
Services\ns10DiaSessionOperationsTests.cs
-
+
Services\ns10ReflectionOperationsTests.cs
-
+
Services\ns10SettingsProviderTests.cs
-
+
Services\ns10TestContextImplementationTests.cs
-
+
Services\ns10TestSourceHostTests.cs
-
+
Services\ns10ThreadOperationsTests.cs
-
-
- {bbc99a6b-4490-49dd-9c12-af2c1e95576e}
- PlatformServices.Interface
-
-
- {5D153CAA-80C2-4551-9549-6C406FCEEFB1}
- PlatformServices.Universal
-
-
- {f81c7549-e3a3-4770-ac3f-3bc7356e61e8}
- MSTest.CoreAdapter.TestUtilities
-
-
- {7252d9e3-267d-442c-96bc-c73aef3241d6}
- MSTest.Core
- FrameworkV2
-
-
- {DF131865-84EE-4540-8112-E88ACEBDEA09}
- Extension.UWP
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config b/test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config
deleted file mode 100644
index 33d949fb5d..0000000000
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config b/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
deleted file mode 100644
index 67cae056cf..0000000000
--- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file