From 3d6d7e8e870a9ef5cbd6913d41794d0dc9e03649 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 | 3 +- scripts/Build.ps1 | 6 +- scripts/build/TestFx.Loc.targets | 10 +- scripts/build/TestFx.Settings.targets | 1 - scripts/build/TestFx.Versions.targets | 40 ++++- scripts/build/TestFx.targets | 17 +- scripts/common.lib.ps1 | 2 +- scripts/test.ps1 | 6 +- .../MSTest.CoreAdapter.csproj | 80 +++++---- .../PlatformServices.Desktop.csproj | 110 ++++++------ .../PlatformServices.Desktop/packages.config | 15 -- .../PlatformServices.Interface.csproj | 58 +++--- .../packages.config | 21 --- .../PlatformServices.NetCore.csproj | 77 ++++---- .../PlatformServices.Portable.csproj | 100 +++++------ .../PlatformServices.Portable/packages.config | 21 --- .../PlatformServices.Universal.csproj | 166 +++++++----------- .../PlatformServices.Universal}/app.config | 4 +- .../PlatformServices.Universal/project.json | 20 --- .../PlatformServices.WinUI.csproj | 78 ++++---- src/Package/sign/sign.proj | 9 +- .../Extension.Core/Extension.Core.csproj | 22 ++- .../Extension.Core/packages.config | 5 - .../Extension.Desktop.csproj | 19 +- .../Extension.Desktop/packages.config | 5 - .../Extension.UWP/Extension.UWP.csproj | 121 ++++--------- src/TestFramework/Extension.UWP/project.json | 19 -- .../Extension.WinUI/Extension.WinUI.csproj | 10 +- .../MSTest.Core/MSTest.Core.csproj | 14 +- src/TestFramework/MSTest.Core/packages.config | 5 - .../App.config | 12 +- .../DesktopTestSourceHostTests.cs | 36 ++-- ...ormServices.Desktop.Component.Tests.csproj | 90 +++------- .../packages.config | 12 -- .../SampleFrameworkExtensions.csproj | 27 +-- .../TestProjectForDiscovery.csproj | 58 +++--- .../TestProjectForAssemblyResolution.csproj | 8 +- .../UnitTest1.cs | 2 +- .../Automation.CLI/Automation.CLI.csproj | 64 +++---- .../Automation.CLI/CLITestBase.common.cs | 2 +- test/E2ETests/Automation.CLI/packages.config | 15 -- .../DiscoveryAndExecutionTests.csproj | 22 +-- .../Smoke.E2E.Tests/Smoke.E2E.Tests.csproj | 33 ++-- test/E2ETests/Smoke.E2E.Tests/packages.config | 4 - .../CompatTestProject.csproj | 9 +- .../DataRowTestProject.csproj | 4 +- .../DataSourceTestProject.csproj | 5 +- .../DeploymentTestProject.csproj | 6 +- .../DeploymentTestProjectNetCore.csproj | 6 +- .../DesktopTestProjectx64Debug.csproj | 42 ++--- .../DesktopTestProjectx64Release.csproj | 43 ++--- .../DesktopTestProjectx86Debug.csproj | 45 ++--- .../DesktopTestProjectx86Release.csproj | 45 ++--- .../DoNotParallelizeTestProject.csproj | 4 +- .../FxExtensibilityTestProject.csproj | 20 ++- .../ParallelClassesTestProject.csproj | 22 ++- .../ParallelMethodsTestProject.csproj | 21 +-- .../TimeoutTestProjectNetCore.csproj | 2 +- .../MSTest.Core.Unit.Tests.csproj | 34 ++-- .../MSTest.Core.Unit.Tests/packages.config | 6 - .../MSTest.CoreAdapter.TestUtilities.csproj | 10 +- .../packages.config | 4 - .../MSTest.CoreAdapter.Unit.Tests.csproj | 122 ++++++------- .../packages.config | 13 -- .../App.config | 12 +- ...PlatformServices.Desktop.Unit.Tests.csproj | 125 ++++++------- .../packages.config | 10 -- ...PlatformServices.NetCore.Unit.Tests.csproj | 55 +++--- ...latformServices.Portable.Unit.Tests.csproj | 112 ++++++------ .../packages.config | 10 -- ...atformServices.Universal.Unit.Tests.csproj | 109 ++++++------ .../packages.config | 11 -- 73 files changed, 958 insertions(+), 1402 deletions(-) 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 rename {test/UnitTests/PlatformServices.Universal.Unit.Tests => src/Adapter/PlatformServices.Universal}/app.config (54%) 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/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..b1e21d6122 100644 --- a/samples/FxExtensibility/FxExtensibility.csproj +++ b/samples/FxExtensibility/FxExtensibility.csproj @@ -4,6 +4,7 @@ ..\..\ + 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..eac1562aaf 100644 --- a/scripts/Build.ps1 +++ b/scripts/Build.ps1 @@ -310,15 +310,15 @@ function Replace-InFile($File, $RegEx, $ReplaceWith) { } function Sync-PackageVersions { - $versionsRegex = '(?mi)<(TestPlatformVersion.*?)>(.*?)<\/TestPlatformVersion>' + $versionsRegex = '(?mi)<(MicrosoftNETTestSdkVersion.*?)>(.*?)<\/MicrosoftNETTestSdkVersion>' $packageRegex = '(?mi)$TestPlatformVersion" + Replace-InFile -File $TF_VERSIONS_FILE -RegEx $versionsRegex -ReplaceWith "<`$1>$TestPlatformVersion" } (Get-ChildItem "$PSScriptRoot\..\src\*packages.config", "$PSScriptRoot\..\test\*packages.config" -Recurse) | ForEach-Object { diff --git a/scripts/build/TestFx.Loc.targets b/scripts/build/TestFx.Loc.targets index 16b75c229d..196c0cebec 100644 --- a/scripts/build/TestFx.Loc.targets +++ b/scripts/build/TestFx.Loc.targets @@ -42,8 +42,8 @@ - - + + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation.1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) + <_SourcePath>$(TestFxPackagesRoot)MSTest.Internal.TestFx.Localized.Documentation\1.0.0-build-20170420-1\contentFiles\any\any\$(LocDocumentationSubPath) <_LocalizedFiles Include="$(_SourcePath)\**\*.*" /> diff --git a/scripts/build/TestFx.Settings.targets b/scripts/build/TestFx.Settings.targets index 2f53ecce34..312e8e25a4 100644 --- a/scripts/build/TestFx.Settings.targets +++ b/scripts/build/TestFx.Settings.targets @@ -8,7 +8,6 @@ - diff --git a/scripts/build/TestFx.Versions.targets b/scripts/build/TestFx.Versions.targets index 76c8afa9d1..74c1804282 100644 --- a/scripts/build/TestFx.Versions.targets +++ b/scripts/build/TestFx.Versions.targets @@ -1,7 +1,43 @@  - + - 16.10.0-release-20210421-08 + 16.10.0-release-20210421-08 + + + 0.2.0 + 5.0.0 + + + + 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..d4b72c46d1 100644 --- a/scripts/build/TestFx.targets +++ b/scripts/build/TestFx.targets @@ -11,9 +11,6 @@ true - - - @@ -30,9 +27,9 @@ stylecop.json - - - + + + @@ -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}. - - - - - diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1 index d63a78aeb9..a963681c89 100644 --- a/scripts/common.lib.ps1 +++ b/scripts/common.lib.ps1 @@ -22,7 +22,7 @@ $env:TF_PACKAGES_DIR = Join-Path $env:TF_ROOT_DIR "packages" $TF_VERSIONS_FILE = "$PSScriptRoot\build\TestFx.Versions.targets" if ([String]::IsNullOrWhiteSpace($TestPlatformVersion)) { - $TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.TestPlatformVersion).InnerText + $TestPlatformVersion = (([XML](Get-Content $TF_VERSIONS_FILE)).Project.PropertyGroup.MicrosoftNETTestSdkVersion).InnerText } function Create-Directory([string[]] $path) { diff --git a/scripts/test.ps1 b/scripts/test.ps1 index 7a153cc590..679a41d629 100644 --- a/scripts/test.ps1 +++ b/scripts/test.ps1 @@ -194,9 +194,13 @@ function Run-Test([string[]] $testContainers, [string[]] $netCoreTestContainers) function Get-VSTestPath { $versionsFile = "$PSScriptRoot\build\TestFx.Versions.targets" - $TestPlatformVersion = (([XML](Get-Content $versionsFile)).Project.PropertyGroup.TestPlatformVersion).InnerText + $TestPlatformVersion = (([XML](Get-Content $versionsFile)).Project.PropertyGroup.MicrosoftNETTestSdkVersion).InnerText $vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform.$TestPlatformVersion\" + if(-not (Test-Path $vsInstallPath)) { + $vsInstallPath = "$PSScriptRoot\..\packages\Microsoft.TestPlatform\$TestPlatformVersion\" + } + $vstestPath = Join-Path -path $vsInstallPath "tools\net451\Common7\IDE\Extensions\TestPlatform\vstest.console.exe" return Resolve-Path -path $vstestPath } diff --git a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj index 66c6afc6c0..f90ddd5379 100644 --- a/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj +++ b/src/Adapter/MSTest.CoreAdapter/MSTest.CoreAdapter.csproj @@ -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..9ae6e06cf9 100644 --- a/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj +++ b/src/Adapter/PlatformServices.Desktop/PlatformServices.Desktop.csproj @@ -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..6a444b0155 100644 --- a/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj +++ b/src/Adapter/PlatformServices.Interface/PlatformServices.Interface.csproj @@ -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..aab62a9ecc 100644 --- a/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj +++ b/src/Adapter/PlatformServices.NetCore/PlatformServices.NetCore.csproj @@ -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..7ae789c2b6 100644 --- a/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj +++ b/src/Adapter/PlatformServices.Portable/PlatformServices.Portable.csproj @@ -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..56adb2ec49 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/test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config b/src/Adapter/PlatformServices.Universal/app.config similarity index 54% rename from test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config rename to src/Adapter/PlatformServices.Universal/app.config index 33d949fb5d..e08993fc2a 100644 --- a/test/UnitTests/PlatformServices.Universal.Unit.Tests/app.config +++ b/src/Adapter/PlatformServices.Universal/app.config @@ -3,8 +3,8 @@ - - + + 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..cd43c8ccad 100644 --- a/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj +++ b/src/Adapter/PlatformServices.WinUI/PlatformServices.WinUI.csproj @@ -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..c0073d08be 100644 --- a/src/Package/sign/sign.proj +++ b/src/Package/sign/sign.proj @@ -2,7 +2,6 @@ Test - 0.2.0 @@ -10,11 +9,13 @@ 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..cab6e8e026 100644 --- a/src/TestFramework/Extension.Core/Extension.Core.csproj +++ b/src/TestFramework/Extension.Core/Extension.Core.csproj @@ -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..b3dd3e94fe 100644 --- a/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj +++ b/src/TestFramework/Extension.Desktop/Extension.Desktop.csproj @@ -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..b583947c43 100644 --- a/src/TestFramework/Extension.UWP/Extension.UWP.csproj +++ b/src/TestFramework/Extension.UWP/Extension.UWP.csproj @@ -4,6 +4,7 @@ ..\..\..\ + {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..f808f8d91b 100644 --- a/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj +++ b/src/TestFramework/Extension.WinUI/Extension.WinUI.csproj @@ -22,18 +22,18 @@ NetCore - - - + - + + + - + diff --git a/src/TestFramework/MSTest.Core/MSTest.Core.csproj b/src/TestFramework/MSTest.Core/MSTest.Core.csproj index e21a2e33ef..f2ac2cb985 100644 --- a/src/TestFramework/MSTest.Core/MSTest.Core.csproj +++ b/src/TestFramework/MSTest.Core/MSTest.Core.csproj @@ -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..cfbd30f58a 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 @@ -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..ebcb5295b2 100644 --- a/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj +++ b/test/ComponentTests/TestAssets/TestProject/TestProjectForDiscovery.csproj @@ -21,61 +21,45 @@ 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..7e61b9ae89 100644 --- a/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj +++ b/test/ComponentTests/TestAssets/TestProjectForAssemblyResolution/TestProjectForAssemblyResolution.csproj @@ -2,6 +2,8 @@ ..\..\..\..\ + + 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..c2b09f91ed 100644 --- a/test/E2ETests/Automation.CLI/Automation.CLI.csproj +++ b/test/E2ETests/Automation.CLI/Automation.CLI.csproj @@ -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..9a592359fd 100644 --- a/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj +++ b/test/E2ETests/DiscoveryAndExecutionTests/DiscoveryAndExecutionTests.csproj @@ -2,7 +2,7 @@ ..\..\..\ 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..0261038700 100644 --- a/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj +++ b/test/E2ETests/Smoke.E2E.Tests/Smoke.E2E.Tests.csproj @@ -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..682c9b8ddb 100644 --- a/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj +++ b/test/E2ETests/TestAssets/CompatTestProject/CompatTestProject.csproj @@ -3,18 +3,19 @@ ..\..\..\..\ + + 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..a4512c3389 100644 --- a/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj +++ b/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj index 5b3ec27ed2..abc9053118 100644 --- a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj +++ b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj @@ -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..892c866c0a 100644 --- a/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj +++ b/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj @@ -13,12 +13,12 @@ - + + - - + diff --git a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj index 4227314bef..cb286123c5 100644 --- a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj +++ b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj @@ -13,12 +13,12 @@ - + + - - + diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj index 7832edbb06..8bbd814957 100644 --- a/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj +++ b/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj @@ -21,52 +21,41 @@ 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..d81c9f7f1a 100644 --- a/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj +++ b/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj @@ -21,52 +21,42 @@ 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..1247d67613 100644 --- a/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj +++ b/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj @@ -25,63 +25,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..563cf8901d 100644 --- a/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj +++ b/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj @@ -21,65 +21,48 @@ 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..8f6f13d1a1 100644 --- a/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj +++ b/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj b/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj index 9e587e801d..8429cae369 100644 --- a/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj +++ b/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj @@ -36,17 +36,11 @@ prompt 4 + - - - - - - - - + {a82770c0-1ff5-43c7-8790-471d5e4f8d6e} @@ -57,6 +51,16 @@ 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..0bee4127bc 100644 --- a/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj +++ b/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj @@ -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..e8f4e2d5d6 100644 --- a/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj +++ b/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj @@ -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/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj index d4cee39ff3..8ef91f8790 100644 --- a/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj +++ b/test/E2ETests/TestAssets/TimeoutTestProjectNetCore/TimeoutTestProjectNetCore.csproj @@ -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..5d4158f851 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 @@ -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..6a48e87304 100644 --- a/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj +++ b/test/UnitTests/MSTest.CoreAdapter.TestUtilities/MSTest.CoreAdapter.TestUtilities.csproj @@ -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..67ee8ec2f4 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 @@  - ..\..\..\ + ..\..\..\ @@ -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..18a9d99231 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 @@ -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..0abb1e0f89 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 @@ -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..cf9b68f908 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 @@ -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..c428164993 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 @@ -2,6 +2,7 @@ ..\..\..\ + $(TestFxRoot)artifacts\$(Configuration)\ @@ -19,6 +20,12 @@ UnitTest 1685 + + true + true + true + PackageReference + true full @@ -34,49 +41,60 @@ 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 - - - + + + {bbc99a6b-4490-49dd-9c12-af2c1e95576e} + PlatformServices.Interface + + + {f81c7549-e3a3-4770-ac3f-3bc7356e61e8} + MSTest.CoreAdapter.TestUtilities + + + {7252d9e3-267d-442c-96bc-c73aef3241d6} + MSTest.Core + FrameworkV2 + + - - - Designer - + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + + Services\ns10AssemblyAttributes.cs @@ -102,29 +120,6 @@ - - - {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/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