diff --git a/docs/libraries/building/code-coverage.md b/docs/libraries/building/code-coverage.md index cee366fc5339d..5be7993afdb9a 100644 --- a/docs/libraries/building/code-coverage.md +++ b/docs/libraries/building/code-coverage.md @@ -1,7 +1,7 @@ Code Coverage ============= -"Code coverage" is a measure that indicates how much of our library code is exercised by our test suites. We measure code coverage using the [OpenCover](https://github.com/opencover/opencover), and a report of our latest code coverage results can be seen by clicking the coverage badge on the [CoreFX home page](https://github.com/dotnet/corefx), linking to the latest [Coverage Report](https://ci.dot.net/job/dotnet_corefx/job/master/job/code_coverage_windows/Code_Coverage_Report/). +"Code coverage" is a measure that indicates how much of our library code is exercised by our test suites. We measure code coverage using the [Coverlet](https://github.com/tonerdo/coverlet), and a report of our latest code coverage results can be seen by clicking the coverage badge on the [CoreFX home page](https://github.com/dotnet/corefx), linking to the latest [Coverage Report](https://ci.dot.net/job/dotnet_corefx/job/master/job/code_coverage_windows/Code_Coverage_Report/). This report shows each library currently being tested with code coverage and provides statistics around the quality of the code coverage for the library. It also provides a line-by-line breakdown of what lines are being covered and what lines are not. @@ -22,11 +22,11 @@ Our default, somewhat-arbitrary initial goal for a library is 90% code coverage. Issues are opened for a library when a cursory examination of its code coverage reveal that there are likely still some meaningful gaps that need to be addressed. We welcome contributions to our test suites to help address these gaps and close these issues. Many of these issues are marked as [up-for-grabs](https://github.com/dotnet/corefx/labels/up-for-grabs). -An issue need not be addressed in its entirety. We happily accept contributions that improve our tests and work towards improving code coverage numbers even if they only incrementally improve the situation. +An issue need not be addressed in its entirety. We happily accept contributions that improve our tests and work towards improving code coverage numbers even if they only incrementally improve the situation. ## Automated Code Coverage Runs -Code coverage runs are performed by Jenkins approximately twice a day. The results of these runs are all available from the site linked to by the code coverage badge on the home page. +Code coverage runs are performed approximately twice a day. The results of these runs are all available from the site linked to by the code coverage badge on the home page. ## PR Code Coverage Runs @@ -40,23 +40,15 @@ You can navigate to this from your PR by clicking the "Details" link to the righ ## Local Code Coverage Runs -You can perform code coverage runs locally on your own machine. Normally to build your entire CoreFX repo, from the root of your repo you'd run: - - build -includetests - -To include code coverage in this run, augment the `build -includetests` call with the `coverage` argument: +You can perform code coverage runs for the entire repository locally by adding the `coverage` argument to the `build -includetests` command. build -includetests -coverage -This will do the build and testing as with the normal ```build```, but it will run the tests using the OpenCover tool. A resulting index.htm file providing the results of the run will be available at: - - bin\tests\coverage\index.htm - -You can also build and test with code coverage for a particular test project rather than for the whole repo. Normally to build and test a particular test suite, from the same directory as that test suite's .csproj, you'd run: +This builds and tests the test assemblies and generates the full code coverage report. The resulting index.htm file providing the results of the run should be available at: - dotnet msbuild /t:BuildAndTest + artifacts\coverage\index.htm -To do so with code coverage, append the ```/p:Coverage=true``` argument: +You can also build and test with code coverage for a particular test project rather than for the whole repo with the ```/p:Coverage=true``` argument: dotnet msbuild /t:BuildAndTest /p:Coverage=true @@ -67,44 +59,14 @@ The results for this one library will then show up in the aforementioned index.h And then once the run completes: - ..\..\..\bin\tests\coverage\index.htm + $(TestPath)\report\index.htm ## Code coverage with System.Private.CoreLib code Some of the libraries for which contracts and tests live in the corefx repo are actually fully or partially implemented in the core runtime library in another repo, e.g. the implementation that backs the System.Runtime contract is in System.Private.CoreLib.dll in either the coreclr or corert repo. Test projects for code that lives, fully or partially, in System.Private.CoreLib, should have the property `TestRuntime` set to `true` in order to obtain proper code coverage reports. -If the test project does not set the property `TestRuntime` to `true` and you want to collect code coverage that includes types in System.Private.CoreLib.dll add `/p:CodeCoverageAssemblies="System.Private.CoreLib"` to the coverage build command listed above. +If the test project does not set the property `TestRuntime` to `true` and you want to collect code coverage that includes types in System.Private.CoreLib.dll add `/p:TestRuntime=true` to the coverage build command listed above. If you want to get coverage report against a private build of System.Private.CoreLib follow the steps outlined at [Testing with Private CoreClr Bits](https://github.com/dotnet/corefx/blob/master/Documentation/project-docs/developer-guide.md#testing-with-private-coreclr-bits). -The build and test projects take care of copying assemblies and PDBs as needed for coverage runs. The resulting code coverage report should now also include details for System.Private.CoreLib. - -Note: as of 10/2017 OpenCover, the default coverage tool, requires PDBs to be Windows PDBs - the needed conversions are automatically performed by coverage runs. You can determine if it is a Windows PDB by doing 'more System.Private.CoreLib.pdb', if it begins with 'Microsoft C/C++ MSF 7.00' it is a Windows PDB. If you need a Windows PDB the Pdb2Pdb tool will convert (or you can do a dotnet msbuild /t:rebuild /p:DebugType=full). - -## Cross-platform Coverage -As of 07/2018 CoreFx is only able to get coverage information on Windows. To correct this we are experimenting with [coverlet](https://github.com/tonerdo/coverlet). - -### Know Issues ### - -1. Instrumenting "System.Private.CoreLib" is causing test to crash (both on Windows and Unix). - -### Windows Instructions ### -On Windows by default coverage runs will use OpenCover instead of coverlet, use the build property `UseCoverlet` to change this default. Currently the use of `dotnet msbuild` is required to avoid a problem with one of the coverlet dependencies. Here is the command: - -``` -dotnet msbuild /t:RebuildAndTest /p:Coverage=True /p:UseCoverlet=True -``` - -### Unix Instructions ### -On Unix just specifying `/p:Coverage=True` triggers the usage of coverlet. However, in order to generate the html report a few setup steps are needed. - -1. Install the [dotnet/cli global tool reportgenerator](https://www.nuget.org/packages/dotnet-reportgenerator-globaltool), add it to the PATH if not automatically added by dotnet/cli (it can be only for the current session) -2. On Linux install the Arial font required for report generation: `sudo apt-get install ttf-mscorefonts-installer` - -After that you request a coverage run from a test folder, e.g.: - -``` -dotnet msbuild /t:RebuildAndTest /p:Coverage=True -``` - -Open index.htm located at bin/tests/coverage to see the results of the coverage run. +The build and test projects take care of copying assemblies and PDBs as needed for coverage runs. The resulting code coverage report should now also include details for System.Private.CoreLib. \ No newline at end of file diff --git a/docs/libraries/project-docs/developer-guide.md b/docs/libraries/project-docs/developer-guide.md index a08f5f13aee29..0f97f2239f92c 100644 --- a/docs/libraries/project-docs/developer-guide.md +++ b/docs/libraries/project-docs/developer-guide.md @@ -425,11 +425,14 @@ Code coverage is built into the corefx build system. It utilizes OpenCover for :: Run full coverage build -test -Coverage +If coverage succeeds, the full report can be found at `artifacts\coverage\index.htm`. + :: To run a single project with code coverage enabled pass the /p:Coverage=true property cd src\System.Collections.Immutable\tests dotnet msbuild /t:BuildAndTest /p:Coverage=true ``` -If coverage succeeds, the code coverage report will be generated automatically and placed in the bin\tests\coverage directory. You can view the full report by opening index.htm + +If coverage succeeds, the individual report can be found at `$(TestPath)\report\index.htm`. Code coverage reports from the continuous integration system are available from the links on the front page of the corefx repo. @@ -479,6 +482,4 @@ If you prefer, you can use a Debug build of System.Private.CoreLib, but if you d If the test project does not set the property `TestRuntime` to `true` and you want to collect code coverage that includes types in System.Private.CoreLib.dll, you'll need to follow the above steps, then -`dotnet msbuild /t:rebuildandtest /p:Coverage=true /p:CodeCoverageAssemblies="System.Private.CoreLib"` - -In order to facilitate coverage tools that perform IL rewrite a dedicated shared framework directory is created by default for coverage runs. This shared runtime is copied from the default shared test runtime (the one with version 9.9.9, e.g.: `\corefx\bin\testhost\netcoreapp-Windows_NT-Debug-x64\shared\Microsoft.NETCore.App\9.9.9`). This behavior can be overridden by adding `/p:UseCoverageDedicatedRuntime=false` to the build command used to capture code coverage, which will cause the coverage run to use the same shared runtime as a test run using the native image of System.Private.CoreLib.dll, causing loss of source coverage information for it. +`dotnet msbuild /t:rebuildandtest /p:Coverage=true /p:TestRuntime=true` diff --git a/docs/libraries/project-docs/performance-tests.md b/docs/libraries/project-docs/performance-tests.md index 560e16b6dc97d..56f6cd431726b 100644 --- a/docs/libraries/project-docs/performance-tests.md +++ b/docs/libraries/project-docs/performance-tests.md @@ -12,8 +12,8 @@ Performance test files (if present) are stored within a library's ```tests/Perfo **Step # 2:** Change directory to the performance tests directory: ```cd path/to/library/tests/Performance``` **Step # 3:** Build and run the tests: - - Windows ```dotnet msbuild /t:BuildAndTest /p:Performance=true /p:ConfigurationGroup=Release``` - - Linux: ```dotnet msbuild /t:BuildAndTest /p:Performance=true /p:ConfigurationGroup=Release``` + - Windows ```dotnet msbuild /t:BuildAndTest /p:ConfigurationGroup=Release``` + - Linux: ```dotnet msbuild /t:BuildAndTest /p:ConfigurationGroup=Release``` **Note: Because test build runs tests concurrently, do not use it for executing performance tests. If you still want to run them concurrently you need to pass the flag `/p:Performance=true` to it: `build -test -release /p:Performance=true`.** @@ -32,20 +32,12 @@ Performance tests should reside within their own "Performance" folder within the It's easiest to copy and modify an existing example like the one above. Notice that you'll need these lines in the tests csproj: ``` - - - - - Common\System\PerfUtils.cs - + + {69e46a6f-9966-45a5-8945-2559fe337827} + PerfRunner + - - - true - ``` -(Replace Dictionary/List with whatever class you’re testing.) - Once that’s all done, you can actually add tests to the file. Writing Test Cases diff --git a/eng/Resources.targets b/eng/Resources.targets index 1bc3a89343711..297d028e11db3 100644 --- a/eng/Resources.targets +++ b/eng/Resources.targets @@ -4,7 +4,7 @@ .cs .vb - $(MSBuildProjectDirectory)/Resources/Strings.resx + $(MSBuildProjectDirectory)/Resources/Strings.resx System SR FxResources.$(AssemblyName).$(StringResourcesClassName) @@ -16,7 +16,7 @@ - + true $(StringResourcesName) @@ -25,59 +25,11 @@ - - - - - - true - Resources/Common/SR$(ResourcesSourceFileExtension) - - - - - - - - CopyResxFilesToReswFiles; - $(CompileDependsOn); - - - - - - <_AllResxFiles Include="@(EmbeddedResource->'%(FullPath)')" Condition="'%(Extension)' == '.resx'"> - %(EmbeddedResource.ManifestResourceName) - - - - - true - true - $(RuntimePath)$(AssemblyName).Resw - <_ResWDestinationPath Condition="'$(TestResourcesFolderPath)' != ''">$(TestResourcesFolderPath) - <_ResWDestinationPath Condition="'$(TestResourcesFolderPath)' == ''">$(ResourcesFolderPath) - - - - <_ReswOutputFiles Include="@(_AllResxFiles->'$(_ResWDestinationPath)/%(ReswName).resw')" /> - - - - - - - - - - - - - + + + + true + Resources/Common/SR$(ResourcesSourceFileExtension) + + diff --git a/eng/dependencies.props b/eng/dependencies.props index e89505b04f711..24f1c878ea4e3 100644 --- a/eng/dependencies.props +++ b/eng/dependencies.props @@ -47,12 +47,16 @@ 4.4.0 - 15.8.0 + 16.0.0-preview-20181204-03 2.4.1-pre.build.4059 1.0.0-beta-build0020 2.0.5 1.0.23 + + 1.3.0 + 4.0.4 + 4.6.0-alpha-00001 $(ProjectNTfsTestILCPackageVersion) @@ -241,7 +245,7 @@ - $(MicrosoftDotNetTestSdkVersion) + $(MicrosoftNetTestSdkPackageVersion) diff --git a/src/libraries/Common/tests/Common.Tests.csproj b/src/libraries/Common/tests/Common.Tests.csproj index 068029e2bd5dd..bc83e72e88dd6 100644 --- a/src/libraries/Common/tests/Common.Tests.csproj +++ b/src/libraries/Common/tests/Common.Tests.csproj @@ -4,7 +4,7 @@ InnerLoop;OuterLoop true netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release - false + false diff --git a/src/libraries/Common/tests/Performance/BenchmarkFilter.cs b/src/libraries/Common/tests/Performance/BenchmarkFilter.cs index 2c1843d13a844..988ed2022c866 100644 --- a/src/libraries/Common/tests/Performance/BenchmarkFilter.cs +++ b/src/libraries/Common/tests/Performance/BenchmarkFilter.cs @@ -8,7 +8,7 @@ using Xunit.Abstractions; using Xunit.Sdk; -// Usage: [assembly: TestCaseOrderer("Microsoft.DotNet.XUnitExtensions.BenchmarkFilter", "System.Drawing.Common.Performance.Tests")] +// Usage: [assembly: TestCaseOrderer("Microsoft.DotNet.XUnitExtensions.BenchmarkFilter", "System.Drawing.Common.PerformanceTests")] namespace Microsoft.DotNet.XUnitExtensions { diff --git a/src/libraries/Common/tests/Performance/Common.Performance.Tests.csproj b/src/libraries/Common/tests/Performance/Common.PerformanceTests.csproj similarity index 90% rename from src/libraries/Common/tests/Performance/Common.Performance.Tests.csproj rename to src/libraries/Common/tests/Performance/Common.PerformanceTests.csproj index a1889dc75ef53..68d4c3066607f 100644 --- a/src/libraries/Common/tests/Performance/Common.Performance.Tests.csproj +++ b/src/libraries/Common/tests/Performance/Common.PerformanceTests.csproj @@ -14,7 +14,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/Common/perf/PerfRunner/AssemblyAttributes.cs b/src/libraries/Common/tests/Performance/PerfRunner/AssemblyAttributes.cs similarity index 100% rename from src/libraries/Common/perf/PerfRunner/AssemblyAttributes.cs rename to src/libraries/Common/tests/Performance/PerfRunner/AssemblyAttributes.cs diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props b/src/libraries/Common/tests/Performance/PerfRunner/Configurations.props similarity index 100% rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props rename to src/libraries/Common/tests/Performance/PerfRunner/Configurations.props diff --git a/src/libraries/Common/perf/PerfRunner/PerfRunner.cs b/src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.cs similarity index 94% rename from src/libraries/Common/perf/PerfRunner/PerfRunner.cs rename to src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.cs index 33f0a6168a29f..4b75d1e59d839 100644 --- a/src/libraries/Common/perf/PerfRunner/PerfRunner.cs +++ b/src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.cs @@ -41,6 +41,6 @@ private static string GetTestAssembly(string testName) private static IEnumerable GetTestAssemblies() { - return Directory.EnumerateFiles(".", "*.Performance.Tests.dll"); + return Directory.EnumerateFiles(".", "*.PerformanceTests.dll"); } } diff --git a/src/libraries/Common/perf/PerfRunner/PerfRunner.csproj b/src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.csproj similarity index 68% rename from src/libraries/Common/perf/PerfRunner/PerfRunner.csproj rename to src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.csproj index ebb03375387e8..addbf1c2d6a3e 100644 --- a/src/libraries/Common/perf/PerfRunner/PerfRunner.csproj +++ b/src/libraries/Common/tests/Performance/PerfRunner/PerfRunner.csproj @@ -4,19 +4,14 @@ Exe .exe - PerfRunner - PerfRunner true false 0436 - true - true - netstandard-Debug;netstandard-Release;netstandard1.3-Debug;netstandard1.3-Release + true + netstandard-Debug;netstandard-Release - - Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAttribute.cs diff --git a/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj b/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj index 1466dad2173a3..cd3e1e9b1c9cc 100644 --- a/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj +++ b/src/libraries/Common/tests/System/Xml/ModuleCore/ModuleCore.csproj @@ -1,6 +1,7 @@ {3CF0CC76-4CE0-460A-BA37-657CFED39AB0} + true netstandard-Debug;netstandard-Release diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 85b384020c8d4..b3269a936bc9f 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -18,4 +18,22 @@ --> $(AssemblySearchPaths);$(RefPath);{RawFileName} + + + + + + + + + + + + + + + + fullPath="".*System\.Private\.CoreLib\\shared + fullPath=""""$(CommonPath)\CoreLib + diff --git a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj index 89a202c37df0e..7b9039055c3e9 100644 --- a/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj +++ b/src/libraries/Microsoft.XmlSerializer.Generator/tests/Microsoft.XmlSerializer.Generator.Tests.csproj @@ -3,7 +3,7 @@ {0D1E2954-A5C7-4B8C-932A-31EB4A96A737} $(DefineConstants);XMLSERIALIZERGENERATORTESTS netcoreapp-Debug;netcoreapp-Release;netfx-Debug;netfx-Release;uap-Debug;uap-Release - false + false true @@ -11,7 +11,7 @@ - $(ToolsDir)netcoreapp.runtimeconfig.json + $(TestAssetsDir)netcoreapp.runtimeconfig.json $(TestHostRootPath) diff --git a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln index 481d2074890d0..eda71fa35d2be 100644 --- a/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln +++ b/src/libraries/System.Collections.Concurrent/System.Collections.Concurrent.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurre {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent.Performance.Tests", "tests\Performance\System.Collections.Concurrent.Performance.Tests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Concurrent.PerformanceTests", "tests\Performance\System.Collections.Concurrent.PerformanceTests.csproj", "{16568C86-E97E-42C6-B683-65A1B5AF2EC8}" ProjectSection(ProjectDependencies) = postProject {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} = {EA610394-CBA3-4E5C-B3DB-AAEA7F640E89} EndProjectSection diff --git a/src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.Performance.Tests.csproj b/src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.PerformanceTests.csproj similarity index 88% rename from src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.Performance.Tests.csproj rename to src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.PerformanceTests.csproj index 6429a3b944f9f..56d0992933fe0 100644 --- a/src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.Performance.Tests.csproj +++ b/src/libraries/System.Collections.Concurrent/tests/Performance/System.Collections.Concurrent.PerformanceTests.csproj @@ -13,7 +13,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj index ac4609130c315..679018491c989 100644 --- a/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj +++ b/src/libraries/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.csproj @@ -98,7 +98,7 @@ - + diff --git a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln index 6c572adc08675..ca51616ad33a0 100644 --- a/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln +++ b/src/libraries/System.Collections.NonGeneric/System.Collections.NonGeneric.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGener {585E3764-534B-4A12-8BD5-8578CB826A45} = {585E3764-534B-4A12-8BD5-8578CB826A45} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric.Performance.Tests", "tests\Performance\System.Collections.NonGeneric.Performance.Tests.csproj", "{93AB3799-BC91-4B27-B526-28FFFF0DB1B1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.NonGeneric.PerformanceTests", "tests\Performance\System.Collections.NonGeneric.PerformanceTests.csproj", "{93AB3799-BC91-4B27-B526-28FFFF0DB1B1}" ProjectSection(ProjectDependencies) = postProject {585E3764-534B-4A12-8BD5-8578CB826A45} = {585E3764-534B-4A12-8BD5-8578CB826A45} EndProjectSection diff --git a/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj b/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.PerformanceTests.csproj similarity index 86% rename from src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj rename to src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.PerformanceTests.csproj index b61d5e183aab8..134410bfcd342 100644 --- a/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.Performance.Tests.csproj +++ b/src/libraries/System.Collections.NonGeneric/tests/Performance/System.Collections.NonGeneric.PerformanceTests.csproj @@ -11,7 +11,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Collections/System.Collections.sln b/src/libraries/System.Collections/System.Collections.sln index a071803a8922d..655316c69a1aa 100644 --- a/src/libraries/System.Collections/System.Collections.sln +++ b/src/libraries/System.Collections/System.Collections.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Tests", {D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.Performance.Tests", "tests\Performance\System.Collections.Performance.Tests.csproj", "{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Collections.PerformanceTests", "tests\Performance\System.Collections.PerformanceTests.csproj", "{F2B47C9D-477E-4EB2-B7F9-D7563FCED117}" ProjectSection(ProjectDependencies) = postProject {D5FF747F-7A0B-9003-885A-FE9A63E755E5} = {D5FF747F-7A0B-9003-885A-FE9A63E755E5} EndProjectSection diff --git a/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj b/src/libraries/System.Collections/tests/Performance/System.Collections.PerformanceTests.csproj similarity index 92% rename from src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj rename to src/libraries/System.Collections/tests/Performance/System.Collections.PerformanceTests.csproj index 8c1bc55bb656d..3f189d6d4bf2c 100644 --- a/src/libraries/System.Collections/tests/Performance/System.Collections.Performance.Tests.csproj +++ b/src/libraries/System.Collections/tests/Performance/System.Collections.PerformanceTests.csproj @@ -17,7 +17,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj index 99f62f78e27fc..7907b51afa686 100644 --- a/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj +++ b/src/libraries/System.ComponentModel.Composition.Registration/tests/System.ComponentModel.Composition.Registration.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj index bbe773682cded..e9678bf6638a1 100644 --- a/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj +++ b/src/libraries/System.ComponentModel.Composition/tests/System.ComponentModel.Composition.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln index 528352fc4dce5..09a2894362c44 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln +++ b/src/libraries/System.ComponentModel.TypeConverter/System.ComponentModel.TypeConverter.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeC {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter.Performance.Tests", "tests\Performance\System.ComponentModel.TypeConverter.Performance.Tests.csproj", "{89C76728-ECAF-4905-A33F-BD6BFED5E91D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ComponentModel.TypeConverter.PerformanceTests", "tests\Performance\System.ComponentModel.TypeConverter.PerformanceTests.csproj", "{89C76728-ECAF-4905-A33F-BD6BFED5E91D}" ProjectSection(ProjectDependencies) = postProject {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} = {AF3EBF3B-526A-4B51-9F3D-62B0113CD01F} EndProjectSection diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj b/src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.PerformanceTests.csproj similarity index 89% rename from src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj rename to src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.PerformanceTests.csproj index 55c843821cc7c..a934c8b29de10 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.Performance.Tests.csproj +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/Performance/System.ComponentModel.TypeConverter.PerformanceTests.csproj @@ -13,7 +13,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.ComponentModel.TypeConverter/tests/SampleClasses.cs b/src/libraries/System.ComponentModel.TypeConverter/tests/SampleClasses.cs index 300bf002eecc4..7d2f98745e6da 100644 --- a/src/libraries/System.ComponentModel.TypeConverter/tests/SampleClasses.cs +++ b/src/libraries/System.ComponentModel.TypeConverter/tests/SampleClasses.cs @@ -98,7 +98,7 @@ public MyTypeListConverter(Type[] types) #if FUNCTIONAL_TESTS [TypeConverter("System.ComponentModel.Tests.BaseClassConverter, System.ComponentModel.TypeConverter.Tests, Version=9.9.9.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")] #elif PERFORMANCE_TESTS - [TypeConverter("System.ComponentModel.Tests.BaseClassConverter, System.ComponentModel.TypeConverter.Performance.Tests, Version=9.9.9.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")] + [TypeConverter("System.ComponentModel.Tests.BaseClassConverter, System.ComponentModel.TypeConverter.PerformanceTests, Version=9.9.9.9, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51")] #else #error Define FUNCTIONAL_TESTS or PERFORMANCE_TESTS #endif diff --git a/src/libraries/System.Console/System.Console.sln b/src/libraries/System.Console/System.Console.sln index 273890e3ffe9e..a84c03aa4931d 100644 --- a/src/libraries/System.Console/System.Console.sln +++ b/src/libraries/System.Console/System.Console.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Manual.Tests {F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.Performance.Tests", "tests\Performance\System.Console.Performance.Tests.csproj", "{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Console.PerformanceTests", "tests\Performance\System.Console.PerformanceTests.csproj", "{14BE0BA2-28BC-467A-AA76-C6B86D21FDAE}" ProjectSection(ProjectDependencies) = postProject {F9DF2357-81B4-4317-908E-512DA9395583} = {F9DF2357-81B4-4317-908E-512DA9395583} EndProjectSection diff --git a/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj b/src/libraries/System.Console/tests/Performance/System.Console.PerformanceTests.csproj similarity index 88% rename from src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj rename to src/libraries/System.Console/tests/Performance/System.Console.PerformanceTests.csproj index a76a6a3e15904..105f3f10d6cd1 100644 --- a/src/libraries/System.Console/tests/Performance/System.Console.Performance.Tests.csproj +++ b/src/libraries/System.Console/tests/Performance/System.Console.PerformanceTests.csproj @@ -11,7 +11,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Console/tests/System.Console.Tests.csproj b/src/libraries/System.Console/tests/System.Console.Tests.csproj index b2e7dbf1ea068..c1e1811f9d4fc 100644 --- a/src/libraries/System.Console/tests/System.Console.Tests.csproj +++ b/src/libraries/System.Console/tests/System.Console.Tests.csproj @@ -55,9 +55,6 @@ RemoteExecutorConsoleApp - - - diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj index b869a3094f653..cd9953253b20a 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/IMonitorLoader/IMonitorLoader.csproj @@ -9,5 +9,4 @@ - \ No newline at end of file diff --git a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj index f6b4a88ac3ffb..a4aa433ef0a27 100644 --- a/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj +++ b/src/libraries/System.Data.SqlClient/tests/StressTests/System.Data.StressRunner/System.Data.StressRunner.csproj @@ -48,5 +48,4 @@ - \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj index ef77ea42d71b7..ccc07a1d34bca 100644 --- a/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj +++ b/src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj @@ -9,7 +9,7 @@ true - + diff --git a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj index 3eec11c6a012d..a7d7160f7187d 100644 --- a/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj +++ b/src/libraries/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.csproj @@ -2,9 +2,7 @@ {A7922FA3-306A-41B9-B8DC-CC4DBE685A85} netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard1.1-Debug;netstandard1.1-Release;netstandard1.3-Debug;netstandard1.3-Release;netstandard1.5-Debug;netstandard1.5-Release - - - $(NoWarn);108 + $(NoWarn);108 @@ -25,7 +23,4 @@ Common\System\Net\Configuration.Http.cs - - - \ No newline at end of file diff --git a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln index 3079569adeac5..7267763334f6a 100644 --- a/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln +++ b/src/libraries/System.Diagnostics.Process/System.Diagnostics.Process.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process. {F55047F8-E47B-46E3-B221-C23595AFE168} = {F55047F8-E47B-46E3-B221-C23595AFE168} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process.Performance.Tests", "tests\Performance\System.Diagnostics.Process.Performance.Tests.csproj", "{4E05E43A-1DC9-47C7-8280-13CF4EF741EA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Diagnostics.Process.PerformanceTests", "tests\Performance\System.Diagnostics.Process.PerformanceTests.csproj", "{4E05E43A-1DC9-47C7-8280-13CF4EF741EA}" ProjectSection(ProjectDependencies) = postProject {F55047F8-E47B-46E3-B221-C23595AFE168} = {F55047F8-E47B-46E3-B221-C23595AFE168} EndProjectSection diff --git a/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj b/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj similarity index 93% rename from src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj rename to src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj index 200c0063df514..4157ee56c6fd7 100644 --- a/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.Performance.Tests.csproj +++ b/src/libraries/System.Diagnostics.Process/tests/Performance/System.Diagnostics.Process.PerformanceTests.csproj @@ -24,7 +24,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln index 0d1da4f75819d..ca4f1b5d9ddaa 100644 --- a/src/libraries/System.Drawing.Common/System.Drawing.Common.sln +++ b/src/libraries/System.Drawing.Common/System.Drawing.Common.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Tests {191B3618-FECD-4ABD-9D6B-5AC90DC33621} = {191B3618-FECD-4ABD-9D6B-5AC90DC33621} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.Performance.Tests", "tests\Performance\System.Drawing.Common.Performance.Tests.csproj", "{E66FFA55-0975-4F0D-8A18-24B2687FEDEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Common.PerformanceTests", "tests\Performance\System.Drawing.Common.PerformanceTests.csproj", "{E66FFA55-0975-4F0D-8A18-24B2687FEDEA}" ProjectSection(ProjectDependencies) = postProject {191B3618-FECD-4ABD-9D6B-5AC90DC33621} = {191B3618-FECD-4ABD-9D6B-5AC90DC33621} EndProjectSection diff --git a/src/libraries/System.Drawing.Common/tests/Performance/CustomAssemblyAttributes.cs b/src/libraries/System.Drawing.Common/tests/Performance/CustomAssemblyAttributes.cs index dd785f68586a3..6bfb479689c71 100644 --- a/src/libraries/System.Drawing.Common/tests/Performance/CustomAssemblyAttributes.cs +++ b/src/libraries/System.Drawing.Common/tests/Performance/CustomAssemblyAttributes.cs @@ -4,4 +4,4 @@ using Xunit; -[assembly: TestCaseOrderer("Microsoft.DotNet.XUnitExtensions.BenchmarkFilter", "System.Drawing.Common.Performance.Tests")] +[assembly: TestCaseOrderer("Microsoft.DotNet.XUnitExtensions.BenchmarkFilter", "System.Drawing.Common.PerformanceTests")] diff --git a/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj b/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.PerformanceTests.csproj similarity index 92% rename from src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj rename to src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.PerformanceTests.csproj index 5b62da57f8075..38655d9dcd75e 100644 --- a/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.Performance.Tests.csproj +++ b/src/libraries/System.Drawing.Common/tests/Performance/System.Drawing.Common.PerformanceTests.csproj @@ -20,7 +20,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln index caed109d9bdd7..a5160c8d3b91f 100644 --- a/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln +++ b/src/libraries/System.Drawing.Primitives/System.Drawing.Primitives.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.T {8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {8F472B93-574C-4AEC-9D28-6C2360A55BBF} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.Performance.Tests", "tests\Performance\System.Drawing.Primitives.Performance.Tests.csproj", "{1BD5C9BF-D7F2-4249-AA31-43B1850A5DB3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Drawing.Primitives.PerformanceTests", "tests\Performance\System.Drawing.Primitives.PerformanceTests.csproj", "{1BD5C9BF-D7F2-4249-AA31-43B1850A5DB3}" ProjectSection(ProjectDependencies) = postProject {8F472B93-574C-4AEC-9D28-6C2360A55BBF} = {8F472B93-574C-4AEC-9D28-6C2360A55BBF} EndProjectSection diff --git a/src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.Performance.Tests.csproj b/src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.PerformanceTests.csproj similarity index 69% rename from src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.Performance.Tests.csproj rename to src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.PerformanceTests.csproj index 52bf03f550ed9..067e96cc1f127 100644 --- a/src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.Performance.Tests.csproj +++ b/src/libraries/System.Drawing.Primitives/tests/Performance/System.Drawing.Primitives.PerformanceTests.csproj @@ -2,7 +2,6 @@ InnerLoop;OuterLoop - true {1BD5C9BF-D7F2-4249-AA31-43B1850A5DB3} netcoreapp-Debug;netcoreapp-Release @@ -10,12 +9,9 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner - - - \ No newline at end of file diff --git a/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj b/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj index eb656c6b375fa..17efcd50a2573 100644 --- a/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj +++ b/src/libraries/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.csproj @@ -6,8 +6,8 @@ netstandard-Debug;netstandard-Release - - + + diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/coverage.runtimeconfig.json b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/coverage.runtimeconfig.json deleted file mode 100644 index 2eba2fa62f691..0000000000000 --- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/coverage.runtimeconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "runtimeOptions": { - "configProperties": { - "Switch.System.Globalization.EnforceJapaneseEraYearRanges": true - }, - "framework": { - "name": "Microsoft.NETCore.App", - "version": "10.10.10" - } - } -} \ No newline at end of file diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/xunit.console.runtimeconfig.json b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/runtimeconfig.json similarity index 100% rename from src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/xunit.console.runtimeconfig.json rename to src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/Properties/runtimeconfig.json diff --git a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj index 6bdeabc8e88bd..7220da2212bf2 100644 --- a/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj +++ b/src/libraries/System.Globalization.Calendars/tests/CalendarTestWithConfigSwitch/System.Globalization.CalendarsWithConfigSwitch.Tests.csproj @@ -5,8 +5,7 @@ netcoreapp-Debug;netcoreapp-Release true - $(AppDesignerFolder)/xunit.console.runtimeconfig.json - $(AppDesignerFolder)/coverage.runtimeconfig.json + $(AppDesignerFolder)/runtimeconfig.json diff --git a/src/libraries/System.Globalization/System.Globalization.sln b/src/libraries/System.Globalization/System.Globalization.sln index 370f74a67275e..5170150af534d 100644 --- a/src/libraries/System.Globalization/System.Globalization.sln +++ b/src/libraries/System.Globalization/System.Globalization.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Invariant.Tests", "tests\In {2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.Performance.Tests", "tests\Performance\System.Globalization.Performance.Tests.csproj", "{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Globalization.PerformanceTests", "tests\Performance\System.Globalization.PerformanceTests.csproj", "{0BA6851E-0E75-453D-9D2A-CEB94E4DE975}" ProjectSection(ProjectDependencies) = postProject {2395E8CA-73CB-40DF-BE40-A60BC189B737} = {2395E8CA-73CB-40DF-BE40-A60BC189B737} EndProjectSection diff --git a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj index f6d7e29a7e2ea..bef43809b1701 100644 --- a/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj +++ b/src/libraries/System.Globalization/tests/Invariant/Invariant.Tests.csproj @@ -7,8 +7,7 @@ Overriding the runtime config file to include "System.Globalization.Invariant": true which enables the globalization invariant mode. --> - $(AppDesignerFolder)/xunit.console.runtimeconfig.json - $(AppDesignerFolder)/coverage.runtimeconfig.json + $(AppDesignerFolder)/runtimeconfig.json diff --git a/src/libraries/System.Globalization/tests/Invariant/Properties/coverage.runtimeconfig.json b/src/libraries/System.Globalization/tests/Invariant/Properties/coverage.runtimeconfig.json deleted file mode 100644 index dabe8cec66c26..0000000000000 --- a/src/libraries/System.Globalization/tests/Invariant/Properties/coverage.runtimeconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "runtimeOptions": { - "configProperties": { - "System.Globalization.Invariant": true - }, - "framework": { - "name": "Microsoft.NETCore.App", - "version": "10.10.10" - } - } -} \ No newline at end of file diff --git a/src/libraries/System.Globalization/tests/Invariant/Properties/xunit.console.runtimeconfig.json b/src/libraries/System.Globalization/tests/Invariant/Properties/runtimeconfig.json similarity index 100% rename from src/libraries/System.Globalization/tests/Invariant/Properties/xunit.console.runtimeconfig.json rename to src/libraries/System.Globalization/tests/Invariant/Properties/runtimeconfig.json diff --git a/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj b/src/libraries/System.Globalization/tests/Performance/System.Globalization.PerformanceTests.csproj similarity index 91% rename from src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj rename to src/libraries/System.Globalization/tests/Performance/System.Globalization.PerformanceTests.csproj index ad35fcefe7b0e..559fcf6b21720 100644 --- a/src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj +++ b/src/libraries/System.Globalization/tests/Performance/System.Globalization.PerformanceTests.csproj @@ -19,7 +19,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln index 9ea85d50fc808..cd4f7d63c4777 100644 --- a/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln +++ b/src/libraries/System.IO.Compression.Brotli/System.IO.Compression.Brotli.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotl {5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli.Performance.Tests", "tests\Performance\System.IO.Compression.Brotli.Performance.Tests.csproj", "{1341F8C8-637A-49A1-BE0F-13867A634929}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Brotli.PerformanceTests", "tests\Performance\System.IO.Compression.Brotli.PerformanceTests.csproj", "{1341F8C8-637A-49A1-BE0F-13867A634929}" ProjectSection(ProjectDependencies) = postProject {5471BFE8-8071-466F-838E-5ADAA779E742} = {5471BFE8-8071-466F-838E-5ADAA779E742} EndProjectSection diff --git a/src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.Performance.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.PerformanceTests.csproj similarity index 92% rename from src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.Performance.Tests.csproj rename to src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.PerformanceTests.csproj index 19aa55a4b45cf..50aefbb2548f5 100644 --- a/src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.Performance.Tests.csproj +++ b/src/libraries/System.IO.Compression.Brotli/tests/Performance/System.IO.Compression.Brotli.PerformanceTests.csproj @@ -19,7 +19,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj index 7f7d36312bb20..a63b6547a19fe 100644 --- a/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj +++ b/src/libraries/System.IO.Compression.Brotli/tests/System.IO.Compression.Brotli.Tests.csproj @@ -32,7 +32,4 @@ %(RecursiveDir)%(Filename)%(Extension) - - - \ No newline at end of file diff --git a/src/libraries/System.IO.Compression/System.IO.Compression.sln b/src/libraries/System.IO.Compression/System.IO.Compression.sln index 97c00a824556d..51fc1c95370e2 100644 --- a/src/libraries/System.IO.Compression/System.IO.Compression.sln +++ b/src/libraries/System.IO.Compression/System.IO.Compression.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Tests {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.Performance.Tests", "tests\Performance\System.IO.Compression.Performance.Tests.csproj", "{13C0F956-FB7B-4882-A411-39B8E22463D2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Compression.PerformanceTests", "tests\Performance\System.IO.Compression.PerformanceTests.csproj", "{13C0F956-FB7B-4882-A411-39B8E22463D2}" ProjectSection(ProjectDependencies) = postProject {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} = {E9ED0A04-23A8-4F8B-82C1-2B18AF74C870} EndProjectSection diff --git a/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj b/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.PerformanceTests.csproj similarity index 94% rename from src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj rename to src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.PerformanceTests.csproj index a0bd49ae35485..b95b81aa180af 100644 --- a/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.Performance.Tests.csproj +++ b/src/libraries/System.IO.Compression/tests/Performance/System.IO.Compression.PerformanceTests.csproj @@ -25,7 +25,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln index 1808ba4138109..a45c2d23a8ebe 100644 --- a/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln +++ b/src/libraries/System.IO.FileSystem/System.IO.FileSystem.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Tests" {1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {1B528B61-14F9-4BFC-A79A-F0BDB3339150} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.Performance.Tests", "tests\Performance\System.IO.FileSystem.Performance.Tests.csproj", "{3C42F714-82AF-4A43-9B9C-744DE31B5C5D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.FileSystem.PerformanceTests", "tests\Performance\System.IO.FileSystem.PerformanceTests.csproj", "{3C42F714-82AF-4A43-9B9C-744DE31B5C5D}" ProjectSection(ProjectDependencies) = postProject {1B528B61-14F9-4BFC-A79A-F0BDB3339150} = {1B528B61-14F9-4BFC-A79A-F0BDB3339150} EndProjectSection diff --git a/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.PerformanceTests.csproj similarity index 93% rename from src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj rename to src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.PerformanceTests.csproj index 5b7b0cd835cf7..9767275fe2268 100644 --- a/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.Performance.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/Performance/System.IO.FileSystem.PerformanceTests.csproj @@ -24,7 +24,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj index 9425c0854b56f..6f2bda838ba70 100644 --- a/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj +++ b/src/libraries/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.csproj @@ -187,7 +187,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln index d1f848befc7f1..80d4b9b8f5196 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln +++ b/src/libraries/System.IO.MemoryMappedFiles/System.IO.MemoryMappedFiles.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles {16EE5522-F387-4C9E-9EF2-B5134B043F37} = {16EE5522-F387-4C9E-9EF2-B5134B043F37} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles.Performance.Tests", "tests\Performance\System.IO.MemoryMappedFiles.Performance.Tests.csproj", "{41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.MemoryMappedFiles.PerformanceTests", "tests\Performance\System.IO.MemoryMappedFiles.PerformanceTests.csproj", "{41CAE9F4-0FFB-4FD1-9413-039C3C561DEE}" ProjectSection(ProjectDependencies) = postProject {16EE5522-F387-4C9E-9EF2-B5134B043F37} = {16EE5522-F387-4C9E-9EF2-B5134B043F37} EndProjectSection diff --git a/src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj b/src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.PerformanceTests.csproj similarity index 93% rename from src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj rename to src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.PerformanceTests.csproj index 3b9bd34ec2876..d137ebcec157a 100644 --- a/src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.Performance.Tests.csproj +++ b/src/libraries/System.IO.MemoryMappedFiles/tests/Performance/System.IO.MemoryMappedFiles.PerformanceTests.csproj @@ -20,7 +20,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.Performance.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.PerformanceTests.csproj similarity index 75% rename from src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.Performance.Tests.csproj rename to src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.PerformanceTests.csproj index 4eadc538b511a..a36b09e522439 100644 --- a/src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.Performance.Tests.csproj +++ b/src/libraries/System.IO.Pipelines/tests/Performance/System.IO.Pipelines.PerformanceTests.csproj @@ -1,6 +1,5 @@  - true {66AE57BA-B56C-4A1E-ACA6-7C18431D416B} netstandard-Debug;netstandard-Release @@ -8,7 +7,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj index 133b1daff5eb9..931c7fa0e468f 100644 --- a/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj +++ b/src/libraries/System.IO.Pipelines/tests/System.IO.Pipelines.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj index be7937918f5d9..e6f1ccc9051c3 100644 --- a/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj +++ b/src/libraries/System.IO.Pipes.AccessControl/tests/System.IO.Pipes.AccessControl.Tests.csproj @@ -2,8 +2,10 @@ {A0356E61-19E1-4722-A53D-5D2616E16312} netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release - System.IO.Pipes + + + diff --git a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln index 1fedfd55f5b17..fca4fe95a949b 100644 --- a/src/libraries/System.IO.Pipes/System.IO.Pipes.sln +++ b/src/libraries/System.IO.Pipes/System.IO.Pipes.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.Tests", "te {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.Performance.Tests", "tests\Performance\System.IO.Pipes.Performance.Tests.csproj", "{7A8B72D7-FACD-4E96-8390-F2D2FE269687}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Pipes.PerformanceTests", "tests\Performance\System.IO.Pipes.PerformanceTests.csproj", "{7A8B72D7-FACD-4E96-8390-F2D2FE269687}" ProjectSection(ProjectDependencies) = postProject {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} = {D293A0E4-AE6C-4DF7-99AE-CC1A37BF4918} EndProjectSection diff --git a/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj b/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.PerformanceTests.csproj similarity index 89% rename from src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj rename to src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.PerformanceTests.csproj index aeca59879baed..4ae866e4579e8 100644 --- a/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.Performance.Tests.csproj +++ b/src/libraries/System.IO.Pipes/tests/Performance/System.IO.Pipes.PerformanceTests.csproj @@ -14,7 +14,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.IO/System.IO.sln b/src/libraries/System.IO/System.IO.sln index b2365e9c57eb6..442dad6932788 100644 --- a/src/libraries/System.IO/System.IO.sln +++ b/src/libraries/System.IO/System.IO.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Tests", "tests\Sy {07390899-C8F6-4E83-A3A9-6867B8CB46A0} = {07390899-C8F6-4E83-A3A9-6867B8CB46A0} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.Performance.Tests", "tests\Performance\System.IO.Performance.Tests.csproj", "{66AE57BA-B56C-4A1E-ACA6-7C18431D416B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.IO.PerformanceTests", "tests\Performance\System.IO.PerformanceTests.csproj", "{66AE57BA-B56C-4A1E-ACA6-7C18431D416B}" ProjectSection(ProjectDependencies) = postProject {07390899-C8F6-4E83-A3A9-6867B8CB46A0} = {07390899-C8F6-4E83-A3A9-6867B8CB46A0} EndProjectSection diff --git a/src/libraries/System.IO/tests/Performance/System.IO.Performance.Tests.csproj b/src/libraries/System.IO/tests/Performance/System.IO.PerformanceTests.csproj similarity index 60% rename from src/libraries/System.IO/tests/Performance/System.IO.Performance.Tests.csproj rename to src/libraries/System.IO/tests/Performance/System.IO.PerformanceTests.csproj index 1e041913339d5..41432aa0913e3 100644 --- a/src/libraries/System.IO/tests/Performance/System.IO.Performance.Tests.csproj +++ b/src/libraries/System.IO/tests/Performance/System.IO.PerformanceTests.csproj @@ -1,15 +1,10 @@ InnerLoop;OuterLoop - true {66AE57BA-B56C-4A1E-ACA6-7C18431D416B} netstandard-Debug;netstandard-Release - - {69e46a6f-9966-45a5-8945-2559fe337827} - RemoteExecutorConsoleApp - Common\System\PerfUtils.cs @@ -19,12 +14,9 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner - - - \ No newline at end of file diff --git a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index e3c3cf155242b..e54845679c3d8 100644 --- a/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/libraries/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -12,7 +12,7 @@ false - + @@ -39,7 +39,7 @@ - + diff --git a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln index 07ab3814efd83..7883a9ff51332 100644 --- a/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln +++ b/src/libraries/System.Linq.Parallel/System.Linq.Parallel.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.Tests" {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} = {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.Performance.Tests", "tests\Performance\System.Linq.Parallel.Performance.Tests.csproj", "{11ABE2F8-4FB9-48AC-91AA-D04503059550}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Parallel.PerformanceTests", "tests\Performance\System.Linq.Parallel.PerformanceTests.csproj", "{11ABE2F8-4FB9-48AC-91AA-D04503059550}" ProjectSection(ProjectDependencies) = postProject {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} = {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} EndProjectSection diff --git a/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj b/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.PerformanceTests.csproj similarity index 93% rename from src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj rename to src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.PerformanceTests.csproj index a83b93f051fb5..ef24f999547a7 100644 --- a/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.Performance.Tests.csproj +++ b/src/libraries/System.Linq.Parallel/tests/Performance/System.Linq.Parallel.PerformanceTests.csproj @@ -30,7 +30,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Linq/System.Linq.sln b/src/libraries/System.Linq/System.Linq.sln index 4055f96c2762f..414321d920bb0 100644 --- a/src/libraries/System.Linq/System.Linq.sln +++ b/src/libraries/System.Linq/System.Linq.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Tests", "tests\ {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.Performance.Tests", "tests\Performance\System.Linq.Performance.Tests.csproj", "{28FB26C9-E425-4E50-9D1D-08F34560E86E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Linq.PerformanceTests", "tests\Performance\System.Linq.PerformanceTests.csproj", "{28FB26C9-E425-4E50-9D1D-08F34560E86E}" ProjectSection(ProjectDependencies) = postProject {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} = {CA488507-3B6E-4494-B7BE-7B4EEEB2C4D1} EndProjectSection diff --git a/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj b/src/libraries/System.Linq/tests/Performance/System.Linq.PerformanceTests.csproj similarity index 86% rename from src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj rename to src/libraries/System.Linq/tests/Performance/System.Linq.PerformanceTests.csproj index 64d6d289504e8..5230ca2d6f93c 100644 --- a/src/libraries/System.Linq/tests/Performance/System.Linq.Performance.Tests.csproj +++ b/src/libraries/System.Linq/tests/Performance/System.Linq.PerformanceTests.csproj @@ -11,7 +11,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Memory/System.Memory.sln b/src/libraries/System.Memory/System.Memory.sln index 0d7342c583d8e..f54ba8d9900d6 100644 --- a/src/libraries/System.Memory/System.Memory.sln +++ b/src/libraries/System.Memory/System.Memory.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Tests", "test {4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {4BBC8F69-D03E-4432-AA8A-D458FA5B235A} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.Performance.Tests", "tests\Performance\System.Memory.Performance.Tests.csproj", "{18482C55-6B57-41E8-BBC4-383B9E2C7AA2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Memory.PerformanceTests", "tests\Performance\System.Memory.PerformanceTests.csproj", "{18482C55-6B57-41E8-BBC4-383B9E2C7AA2}" ProjectSection(ProjectDependencies) = postProject {4BBC8F69-D03E-4432-AA8A-D458FA5B235A} = {4BBC8F69-D03E-4432-AA8A-D458FA5B235A} EndProjectSection diff --git a/src/libraries/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj b/src/libraries/System.Memory/tests/Performance/System.Memory.PerformanceTests.csproj similarity index 96% rename from src/libraries/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj rename to src/libraries/System.Memory/tests/Performance/System.Memory.PerformanceTests.csproj index 217f59b72a44d..7c84169891513 100644 --- a/src/libraries/System.Memory/tests/Performance/System.Memory.Performance.Tests.csproj +++ b/src/libraries/System.Memory/tests/Performance/System.Memory.PerformanceTests.csproj @@ -47,7 +47,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj index 30cff2f2319c6..dcb0de66dc71f 100644 --- a/src/libraries/System.Memory/tests/System.Memory.Tests.csproj +++ b/src/libraries/System.Memory/tests/System.Memory.Tests.csproj @@ -266,9 +266,6 @@ - - - {69e46a6f-9966-45a5-8945-2559fe337827} diff --git a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj index e75c8d828a499..a70851159ea8d 100644 --- a/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj @@ -7,7 +7,7 @@ netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release - + diff --git a/src/libraries/System.Net.Http/System.Net.Http.sln b/src/libraries/System.Net.Http/System.Net.Http.sln index 3ee6466aa5a60..d547403266fbe 100644 --- a/src/libraries/System.Net.Http/System.Net.Http.sln +++ b/src/libraries/System.Net.Http/System.Net.Http.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Functional. {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.Performance.Tests", "tests\Performance\System.Net.Http.Performance.Tests.csproj", "{981FC867-9071-444D-9388-BC5826609F76}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Http.PerformanceTests", "tests\Performance\System.Net.Http.PerformanceTests.csproj", "{981FC867-9071-444D-9388-BC5826609F76}" ProjectSection(ProjectDependencies) = postProject {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} = {1D422B1D-D7C4-41B9-862D-EB3D98DF37DE} EndProjectSection diff --git a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj index 3a994daecab40..026a605a3c2f8 100644 --- a/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/FunctionalTests/System.Net.Http.Functional.Tests.csproj @@ -166,7 +166,4 @@ SelectedSitesTest.txt - - - diff --git a/src/libraries/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj b/src/libraries/System.Net.Http/tests/Performance/System.Net.Http.PerformanceTests.csproj similarity index 90% rename from src/libraries/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj rename to src/libraries/System.Net.Http/tests/Performance/System.Net.Http.PerformanceTests.csproj index e530cfbc710b8..56002f7744bf1 100644 --- a/src/libraries/System.Net.Http/tests/Performance/System.Net.Http.Performance.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/Performance/System.Net.Http.PerformanceTests.csproj @@ -13,7 +13,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj index 7f37d22be7bef..cb8772830d703 100644 --- a/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj +++ b/src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj @@ -8,8 +8,8 @@ - - + + @@ -427,7 +427,4 @@ RemoteExecutorConsoleApp - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj index 30ad853f25f76..eb0faecb21130 100644 --- a/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj +++ b/src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj index ba2fc45c19aa9..70c95c621c5d7 100644 --- a/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj index 5f3410d7ae14b..ccc4d27c19309 100644 --- a/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj +++ b/src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln index 400e6ed5b8ced..fbd317af3e610 100644 --- a/src/libraries/System.Net.Primitives/System.Net.Primitives.sln +++ b/src/libraries/System.Net.Primitives/System.Net.Primitives.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Pal.T {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.Performance.Tests", "tests\PerformanceTests\System.Net.Primitives.Performance.Tests.csproj", "{86256B36-4C78-4A71-A80A-CCA35C4AE758}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Primitives.PerformanceTests", "tests\PerformanceTests\System.Net.Primitives.PerformanceTests.csproj", "{86256B36-4C78-4A71-A80A-CCA35C4AE758}" ProjectSection(ProjectDependencies) = postProject {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} = {8772BC91-7B55-49B9-94FA-4B1BE5BEAB55} EndProjectSection diff --git a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj index 061bd928a46a9..c9556ab771e83 100644 --- a/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj b/src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.PerformanceTests.csproj similarity index 88% rename from src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj rename to src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.PerformanceTests.csproj index 373295be6a0e1..5aa26fe44779c 100644 --- a/src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.Performance.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/PerformanceTests/System.Net.Primitives.PerformanceTests.csproj @@ -8,7 +8,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj index dd3c72c53e560..5ad503eabdacc 100644 --- a/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj +++ b/src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj index 16d12fdc48617..3dd8b3ce79215 100644 --- a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj @@ -155,7 +155,4 @@ RemoteExecutorConsoleApp - - - diff --git a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj index a497a98121d65..b44d9fb7385ad 100644 --- a/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj +++ b/src/libraries/System.Net.Security/tests/UnitTests/System.Net.Security.Unit.Tests.csproj @@ -76,7 +76,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln index 3b433ca68879a..84fb478252254 100644 --- a/src/libraries/System.Net.Sockets/System.Net.Sockets.sln +++ b/src/libraries/System.Net.Sockets/System.Net.Sockets.sln @@ -7,12 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Tests", {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Async.Performance.Tests", "tests\ManualPerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj", "{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Async.PerformanceTests", "tests\ManualPerformanceTests\System.Net.Sockets.Async.PerformanceTests.csproj", "{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}" ProjectSection(ProjectDependencies) = postProject {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.Performance.Tests", "tests\Performance\System.Net.Sockets.Performance.Tests.csproj", "{02092D8A-E8C4-414A-B6FB-470BD1EC9242}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Net.Sockets.PerformanceTests", "tests\Performance\System.Net.Sockets.PerformanceTests.csproj", "{02092D8A-E8C4-414A-B6FB-470BD1EC9242}" ProjectSection(ProjectDependencies) = postProject {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} = {43311AFB-D7C4-4E5A-B1DE-855407F90D1B} EndProjectSection diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj index 0f6732e2135ea..fe7119ce69b88 100644 --- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj @@ -118,7 +118,4 @@ - - - \ No newline at end of file diff --git a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.PerformanceTests.csproj similarity index 97% rename from src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj rename to src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.PerformanceTests.csproj index 30dcbf2ce7083..a66909f181f9d 100644 --- a/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/ManualPerformanceTests/System.Net.Sockets.Async.PerformanceTests.csproj @@ -58,7 +58,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj b/src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.PerformanceTests.csproj similarity index 86% rename from src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj rename to src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.PerformanceTests.csproj index c79d11c2814f1..3ff05c2b7b54f 100644 --- a/src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.Performance.Tests.csproj +++ b/src/libraries/System.Net.Sockets/tests/Performance/System.Net.Sockets.PerformanceTests.csproj @@ -10,7 +10,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj index 2eed4c23c82f3..ff38fe72ab4ba 100644 --- a/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj +++ b/src/libraries/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj index dacc43cf337fa..0329734d849d6 100644 --- a/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj +++ b/src/libraries/System.Numerics.Tensors/tests/System.Numerics.Tensors.Tests.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln index 537266812494c..98843f0d862d3 100644 --- a/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln +++ b/src/libraries/System.Numerics.Vectors/System.Numerics.Vectors.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.Tes {53134B0C-0D57-481B-B84E-D1991E8D54FF} = {53134B0C-0D57-481B-B84E-D1991E8D54FF} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.Performance.Tests", "tests\Performance\System.Numerics.Vectors.Performance.Tests.csproj", "{D9906F1A-A41A-43CD-81D2-BA94CF0001C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Numerics.Vectors.PerformanceTests", "tests\Performance\System.Numerics.Vectors.PerformanceTests.csproj", "{D9906F1A-A41A-43CD-81D2-BA94CF0001C9}" ProjectSection(ProjectDependencies) = postProject {53134B0C-0D57-481B-B84E-D1991E8D54FF} = {53134B0C-0D57-481B-B84E-D1991E8D54FF} EndProjectSection diff --git a/src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj b/src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.PerformanceTests.csproj similarity index 97% rename from src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj rename to src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.PerformanceTests.csproj index ac9ec380fade9..ffb18ec371e66 100644 --- a/src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.Performance.Tests.csproj +++ b/src/libraries/System.Numerics.Vectors/tests/Performance/System.Numerics.Vectors.PerformanceTests.csproj @@ -52,7 +52,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Private.Xml/System.Private.Xml.sln b/src/libraries/System.Private.Xml/System.Private.Xml.sln index 194b68bb34098..850ee7672ef86 100644 --- a/src/libraries/System.Private.Xml/System.Private.Xml.sln +++ b/src/libraries/System.Private.Xml/System.Private.Xml.sln @@ -57,7 +57,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.RW.XmlConvert.Te {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument.Performance.Tests", "tests\XmlDocument\Performance\System.Xml.XmlDocument.Performance.Tests.csproj", "{8A7370E5-BF89-4BCF-ACCD-BA298869055B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlDocument.PerformanceTests", "tests\XmlDocument\Performance\System.Xml.XmlDocument.PerformanceTests.csproj", "{8A7370E5-BF89-4BCF-ACCD-BA298869055B}" ProjectSection(ProjectDependencies) = postProject {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} EndProjectSection @@ -107,7 +107,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSchema.XmlSch {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.Performance.Tests", "tests\XmlSerializer\Performance\System.Xml.XmlSerializer.Performance.Tests.csproj", "{9891F9AC-9A0A-47DF-8D96-92B21AFC3B93}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Xml.XmlSerializer.PerformanceTests", "tests\XmlSerializer\Performance\System.Xml.XmlSerializer.PerformanceTests.csproj", "{9891F9AC-9A0A-47DF-8D96-92B21AFC3B93}" ProjectSection(ProjectDependencies) = postProject {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} = {C427CE0D-0740-41F3-9C3A-552BEA3DDB0D} EndProjectSection diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.PerformanceTests.csproj similarity index 90% rename from src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj rename to src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.PerformanceTests.csproj index e6180fca53b6b..6d6be6f90eeae 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.Performance.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/Performance/System.Xml.XmlDocument.PerformanceTests.csproj @@ -18,7 +18,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj index 085be276488f9..7e8405929ada5 100644 --- a/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlDocument/System.Xml.XmlDocument.Tests.csproj @@ -2,7 +2,6 @@ {7EAFC2D8-48D2-4A56-A9C6-6BADF2053499} - true netstandard-Debug;netstandard-Release diff --git a/src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj b/src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.PerformanceTests.csproj similarity index 91% rename from src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj rename to src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.PerformanceTests.csproj index b674486ca3e56..185100261990e 100644 --- a/src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj +++ b/src/libraries/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.PerformanceTests.csproj @@ -11,7 +11,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj index 885ea7bb2cbdd..aa05700a47238 100644 --- a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj +++ b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj @@ -139,7 +139,7 @@ - + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln index 5bcb0a73aaeae..e0de534cb4f11 100644 --- a/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln +++ b/src/libraries/System.Runtime.Extensions/System.Runtime.Extensions.sln @@ -7,12 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.T {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveTests", "tests\AssemblyResolveTests\AssemblyResolveTests.csproj", "{E60AFAE8-2EA7-471C-9E24-52A99453B26B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyResolveTestApp", "tests\AssemblyResolveTestApp\AssemblyResolveTestApp.csproj", "{E60AFAE8-2EA7-471C-9E24-52A99453B26B}" ProjectSection(ProjectDependencies) = postProject {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.Performance.Tests", "tests\Performance\System.Runtime.Extensions.Performance.Tests.csproj", "{978FA427-F87B-46E2-B276-F5B727C50A01}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Extensions.PerformanceTests", "tests\Performance\System.Runtime.Extensions.PerformanceTests.csproj", "{978FA427-F87B-46E2-B276-F5B727C50A01}" ProjectSection(ProjectDependencies) = postProject {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} = {845D2B72-D8A4-42E5-9BE9-17639EC4FC1A} EndProjectSection diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyAttributes.cs b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyAttributes.cs similarity index 100% rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyAttributes.cs rename to src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyAttributes.cs diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj similarity index 100% rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj rename to src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/AssemblyResolveTestApp.csproj diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/Class1.cs b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Class1.cs similarity index 90% rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/Class1.cs rename to src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Class1.cs index 693f4c1e6485c..4aa0cfe68d17c 100644 --- a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/Class1.cs +++ b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Class1.cs @@ -5,7 +5,8 @@ using System; using System.Reflection; using System.Threading; -namespace AssemblyResolveTests + +namespace AssemblyResolveTestApp { public class Class1 { diff --git a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/ClassesSample.cs b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/ClassesSample.cs similarity index 94% rename from src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/ClassesSample.cs rename to src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/ClassesSample.cs index 4c8636d56b3b2..8b30cadb0269d 100644 --- a/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTests/ClassesSample.cs +++ b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/ClassesSample.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -namespace AssemblyResolveTests +namespace AssemblyResolveTestApp { public class PublicClassSample { diff --git a/src/libraries/Common/perf/PerfRunner/Configurations.props b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Configurations.props similarity index 92% rename from src/libraries/Common/perf/PerfRunner/Configurations.props rename to src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Configurations.props index b2db637110616..c398e42e89942 100644 --- a/src/libraries/Common/perf/PerfRunner/Configurations.props +++ b/src/libraries/System.Runtime.Extensions/tests/AssemblyResolveTestApp/Configurations.props @@ -2,7 +2,6 @@ - netstandard1.3; netstandard; diff --git a/src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.PerformanceTests.csproj similarity index 89% rename from src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj rename to src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.PerformanceTests.csproj index 733a6bfae1b1e..8737791ba4c49 100644 --- a/src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.Performance.Tests.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/Performance/System.Runtime.Extensions.PerformanceTests.csproj @@ -15,7 +15,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index 02b01f1e248ee..623e2520f7c49 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -108,9 +108,9 @@ {69e46a6f-9966-45a5-8945-2559fe337827} RemoteExecutorConsoleApp - + {ad83807c-8be5-4f27-85df-9793613233e1} - AssemblyResolveTests + AssemblyResolveTestApp {c44b33e3-f89f-40b9-b353-d380c1524988} diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs index 9b9e2b7be88fb..7439debd2b344 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.cs @@ -591,12 +591,12 @@ public void AssemblyResolve() RemoteInvoke(() => { ResolveEventHandler handler = (sender, e) => { - return Assembly.LoadFile(Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTests.exe")); + return Assembly.LoadFile(Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTestApp.dll")); }; AppDomain.CurrentDomain.AssemblyResolve += handler; - Type t = Type.GetType("AssemblyResolveTests.Class1, AssemblyResolveTests", true); + Type t = Type.GetType("AssemblyResolveTestApp.Class1, AssemblyResolveTestApp", true); Assert.NotNull(t); return SuccessExitCode; }).Dispose(); @@ -614,7 +614,7 @@ public void AssemblyResolve_RequestingAssembly() ResolveEventHandler handler = (sender, e) => { Assert.Equal(e.RequestingAssembly, a); - return Assembly.LoadFile(Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTests.exe")); + return Assembly.LoadFile(Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTestApp.dll")); }; AppDomain.CurrentDomain.AssemblyResolve += handler; @@ -732,11 +732,11 @@ public void SetThreadPrincipal() private void CopyTestAssemblies() { - string destTestAssemblyPath = Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTests", "AssemblyResolveTests.dll"); - if (!File.Exists(destTestAssemblyPath) && File.Exists("AssemblyResolveTests.dll")) + string destTestAssemblyPath = Path.Combine(Environment.CurrentDirectory, "AssemblyResolveTestApp", "AssemblyResolveTestApp.dll"); + if (!File.Exists(destTestAssemblyPath) && File.Exists("AssemblyResolveTestApp.dll")) { Directory.CreateDirectory(Path.GetDirectoryName(destTestAssemblyPath)); - File.Copy("AssemblyResolveTests.dll", destTestAssemblyPath, false); + File.Copy("AssemblyResolveTestApp.dll", destTestAssemblyPath, false); } destTestAssemblyPath = Path.Combine(Environment.CurrentDirectory, "TestAppOutsideOfTPA", "TestAppOutsideOfTPA.exe"); diff --git a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.netcoreapp.cs b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.netcoreapp.cs index 4725f1b89f889..0db83173cce27 100644 --- a/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.netcoreapp.cs +++ b/src/libraries/System.Runtime.Extensions/tests/System/AppDomainTests.netcoreapp.cs @@ -74,14 +74,14 @@ public static void TestingCreateInstanceFromObjectHandle(string physicalFileName public static TheoryData TestingCreateInstanceFromObjectHandleData => new TheoryData { // string physicalFileName, string assemblyFile, string typeName, returnedFullNameType, expectedException - { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PublicClassSample", "AssemblyResolveTests.PublicClassSample", null }, - { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.publicclasssample", "AssemblyResolveTests.PublicClassSample", typeof(TypeLoadException) }, + { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PublicClassSample", "AssemblyResolveTestApp.PublicClassSample", null }, + { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.publicclasssample", "AssemblyResolveTestApp.PublicClassSample", typeof(TypeLoadException) }, - { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PrivateClassSample", "AssemblyResolveTests.PrivateClassSample", null }, - { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.privateclasssample", "AssemblyResolveTests.PrivateClassSample", typeof(TypeLoadException) }, + { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PrivateClassSample", "AssemblyResolveTestApp.PrivateClassSample", null }, + { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.privateclasssample", "AssemblyResolveTestApp.PrivateClassSample", typeof(TypeLoadException) }, - { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", typeof(MissingMethodException) }, - { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.publicclassnodefaultconstructorsample", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", typeof(TypeLoadException) } + { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", typeof(MissingMethodException) }, + { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.publicclassnodefaultconstructorsample", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", typeof(TypeLoadException) } }; [Theory] @@ -123,14 +123,14 @@ public static void TestingCreateInstanceObjectHandle(string assemblyName, string public static TheoryData TestingCreateInstanceObjectHandleData => new TheoryData() { // string assemblyName, string typeName, returnedFullNameType, expectedException - { "AssemblyResolveTests", "AssemblyResolveTests.PublicClassSample", "AssemblyResolveTests.PublicClassSample", null }, - { "assemblyresolvetests", "assemblyresolvetests.publicclasssample", "AssemblyResolveTests.PublicClassSample", typeof(TypeLoadException) }, + { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PublicClassSample", "AssemblyResolveTestApp.PublicClassSample", null }, + { "assemblyresolvetestapp", "assemblyresolvetestapp.publicclasssample", "AssemblyResolveTestApp.PublicClassSample", typeof(TypeLoadException) }, - { "AssemblyResolveTests", "AssemblyResolveTests.PrivateClassSample", "AssemblyResolveTests.PrivateClassSample", null }, - { "assemblyresolvetests", "assemblyresolvetests.privateclasssample", "AssemblyResolveTests.PrivateClassSample", typeof(TypeLoadException) }, + { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PrivateClassSample", "AssemblyResolveTestApp.PrivateClassSample", null }, + { "assemblyresolvetestapp", "assemblyresolvetestapp.privateclasssample", "AssemblyResolveTestApp.PrivateClassSample", typeof(TypeLoadException) }, - { "AssemblyResolveTests", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", typeof(MissingMethodException) }, - { "assemblyresolvetests", "assemblyresolvetests.publicclassnodefaultconstructorsample", "AssemblyResolveTests.PublicClassNoDefaultConstructorSample", typeof(TypeLoadException) } + { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", typeof(MissingMethodException) }, + { "assemblyresolvetestapp", "assemblyresolvetestapp.publicclassnodefaultconstructorsample", "AssemblyResolveTestApp.PublicClassNoDefaultConstructorSample", typeof(TypeLoadException) } }; [Theory] @@ -149,15 +149,15 @@ public static void TestingCreateInstanceFromObjectHandleFullSignature(string phy public static IEnumerable TestingCreateInstanceFromObjectHandleFullSignatureData() { // string physicalFileName, string assemblyFile, string typeName, bool ignoreCase, BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture, object[] activationAttributes, returnedFullNameType - yield return new object[] { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - - yield return new object[] { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "AssemblyResolveTests.dll", "AssemblyResolveTests.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "AssemblyResolveTests.dll", "assemblyresolvetests.dll", "assemblyresolvetests.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + + yield return new object[] { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.dll", "AssemblyResolveTestApp.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp.dll", "assemblyresolvetestapp.dll", "assemblyresolvetestapp.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; } [Theory] @@ -186,15 +186,15 @@ private static void CheckValidity(ObjectHandle instance, string expected) public static IEnumerable TestingCreateInstanceObjectHandleFullSignatureData() { // string assemblyName, string typeName, bool ignoreCase, BindingFlags bindingAttr, Binder binder, object[] args, CultureInfo culture, object[] activationAttributes, returnedFullNameType - yield return new object[] { "AssemblyResolveTests", "AssemblyResolveTests.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "assemblyresolvetests", "assemblyresolvetests.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "AssemblyResolveTests", "AssemblyResolveTests.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - yield return new object[] { "assemblyresolvetests", "assemblyresolvetests.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PublicClassSample" }; - - yield return new object[] { "AssemblyResolveTests", "AssemblyResolveTests.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "assemblyresolvetests", "assemblyresolvetests.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "AssemblyResolveTests", "AssemblyResolveTests.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; - yield return new object[] { "assemblyresolvetests", "assemblyresolvetests.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTests.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "assemblyresolvetestapp", "assemblyresolvetestapp.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PublicClassSample", false, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + yield return new object[] { "assemblyresolvetestapp", "assemblyresolvetestapp.publicclasssample", true, BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PublicClassSample" }; + + yield return new object[] { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "assemblyresolvetestapp", "assemblyresolvetestapp.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[0], CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "AssemblyResolveTestApp", "AssemblyResolveTestApp.PrivateClassSample", false, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; + yield return new object[] { "assemblyresolvetestapp", "assemblyresolvetestapp.privateclasssample", true, BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance, Type.DefaultBinder, new object[1] { 1 }, CultureInfo.InvariantCulture, null, "AssemblyResolveTestApp.PrivateClassSample" }; } } } diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs index 354fae00feee9..09067bb238cf5 100644 --- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs +++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Program.cs @@ -20,7 +20,7 @@ public static int Main(string[] args) public static object foo() { - AssemblyResolveTests.Class1 c = new AssemblyResolveTests.Class1(); + AssemblyResolveTestApp.Class1 c = new AssemblyResolveTestApp.Class1(); return c; } } diff --git a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj index 29f7c12a9a7c2..a37da6bafdbe8 100644 --- a/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj +++ b/src/libraries/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj @@ -17,9 +17,9 @@ - + {ad83807c-8be5-4f27-85df-9793613233e1} - AssemblyResolveTests + AssemblyResolveTestApp \ No newline at end of file diff --git a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln index efb7641815078..5d8176ba6682e 100644 --- a/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln +++ b/src/libraries/System.Runtime.Numerics/System.Runtime.Numerics.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Tes {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} = {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.Performance.Tests", "tests\Performance\System.Runtime.Numerics.Performance.Tests.csproj", "{3842BE38-1A99-41B2-81B5-186E64077B95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Numerics.PerformanceTests", "tests\Performance\System.Runtime.Numerics.PerformanceTests.csproj", "{3842BE38-1A99-41B2-81B5-186E64077B95}" ProjectSection(ProjectDependencies) = postProject {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} = {D2C99D27-0BEF-4319-ADB3-05CBEBA8F69B} EndProjectSection diff --git a/src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.Performance.Tests.csproj b/src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.PerformanceTests.csproj similarity index 90% rename from src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.Performance.Tests.csproj rename to src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.PerformanceTests.csproj index 706e21ab2d733..5bd1106883f24 100644 --- a/src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.Performance.Tests.csproj +++ b/src/libraries/System.Runtime.Numerics/tests/Performance/System.Runtime.Numerics.PerformanceTests.csproj @@ -12,7 +12,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln index cb4c104848ab9..c699384466aa7 100644 --- a/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln +++ b/src/libraries/System.Runtime.Serialization.Json/System.Runtime.Serialization.Json.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serializatio {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.Performance.Tests", "tests\Performance\System.Runtime.Serialization.Json.Performance.Tests.csproj", "{F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Json.PerformanceTests", "tests\Performance\System.Runtime.Serialization.Json.PerformanceTests.csproj", "{F6836E5C-BFA0-4E92-ADEE-87E797D7C90C}" ProjectSection(ProjectDependencies) = postProject {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} = {AAFFA8F4-BDA9-4107-A650-9014F64EDAE9} EndProjectSection diff --git a/src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj b/src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.PerformanceTests.csproj similarity index 92% rename from src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj rename to src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.PerformanceTests.csproj index 19d4b4c80abb7..902211494c40f 100644 --- a/src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.Performance.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Json/tests/Performance/System.Runtime.Serialization.Json.PerformanceTests.csproj @@ -16,7 +16,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln index 89c973550edc3..92d0ad40a540d 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln +++ b/src/libraries/System.Runtime.Serialization.Xml/System.Runtime.Serialization.Xml.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serializatio {9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.Performance.Tests", "tests\Performance\System.Runtime.Serialization.Xml.Performance.Tests.csproj", "{122A5432-C5B7-4293-AFDA-B24F4D54FDEF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Serialization.Xml.PerformanceTests", "tests\Performance\System.Runtime.Serialization.Xml.PerformanceTests.csproj", "{122A5432-C5B7-4293-AFDA-B24F4D54FDEF}" ProjectSection(ProjectDependencies) = postProject {9D747A18-C8FD-4D7A-8913-4ED7911683B4} = {9D747A18-C8FD-4D7A-8913-4ED7911683B4} EndProjectSection diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj b/src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.PerformanceTests.csproj similarity index 91% rename from src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj rename to src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.PerformanceTests.csproj index 006d4840d2b79..ec3204c83c66d 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.Performance.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/Performance/System.Runtime.Serialization.Xml.PerformanceTests.csproj @@ -16,7 +16,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Runtime/System.Runtime.sln b/src/libraries/System.Runtime/System.Runtime.sln index 0d84796c250e6..809839c622986 100644 --- a/src/libraries/System.Runtime/System.Runtime.sln +++ b/src/libraries/System.Runtime/System.Runtime.sln @@ -12,7 +12,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForwardedTypesAssembly", "t {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Performance.Tests", "tests\Performance\System.Runtime.Performance.Tests.csproj", "{E9560F70-79F5-453A-B518-0292CFE4A6AD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.PerformanceTests", "tests\Performance\System.Runtime.PerformanceTests.csproj", "{E9560F70-79F5-453A-B518-0292CFE4A6AD}" ProjectSection(ProjectDependencies) = postProject {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} = {56B9D0A9-44D3-488E-8B42-C14A6E30CAB2} EndProjectSection diff --git a/src/libraries/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj b/src/libraries/System.Runtime/tests/Performance/System.Runtime.PerformanceTests.csproj similarity index 94% rename from src/libraries/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj rename to src/libraries/System.Runtime/tests/Performance/System.Runtime.PerformanceTests.csproj index d2a4bb1d568fe..2ad75af8fe013 100644 --- a/src/libraries/System.Runtime/tests/Performance/System.Runtime.Performance.Tests.csproj +++ b/src/libraries/System.Runtime/tests/Performance/System.Runtime.PerformanceTests.csproj @@ -34,7 +34,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln index c77105396e6d1..8b0127d7eb2c0 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln +++ b/src/libraries/System.Security.Cryptography.Primitives/System.Security.Cryptography.Primitives.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptograph {DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives.Performance.Tests", "tests\Performance\System.Security.Cryptography.Primitives.Performance.Tests.csproj", "{FB3EA273-567D-414F-B36D-3698BE8D198B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Security.Cryptography.Primitives.PerformanceTests", "tests\Performance\System.Security.Cryptography.Primitives.PerformanceTests.csproj", "{FB3EA273-567D-414F-B36D-3698BE8D198B}" ProjectSection(ProjectDependencies) = postProject {DF73E985-E143-4BF5-9FA4-E199E7D36235} = {DF73E985-E143-4BF5-9FA4-E199E7D36235} EndProjectSection diff --git a/src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj b/src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.PerformanceTests.csproj similarity index 89% rename from src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj rename to src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.PerformanceTests.csproj index 5013402fd5d5b..00b9940719ad5 100644 --- a/src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.Performance.Tests.csproj +++ b/src/libraries/System.Security.Cryptography.Primitives/tests/Performance/System.Security.Cryptography.Primitives.PerformanceTests.csproj @@ -14,7 +14,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln index cce4bf88a5fe0..f047e4c021dd0 100644 --- a/src/libraries/System.Text.Encoding/System.Text.Encoding.sln +++ b/src/libraries/System.Text.Encoding/System.Text.Encoding.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Tests" {635F30B9-5566-4096-B772-68FAA9B00DF4} = {635F30B9-5566-4096-B772-68FAA9B00DF4} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.Performance.Tests", "tests\Performance\System.Text.Encoding.Performance.Tests.csproj", "{859C92CB-72FB-453C-A363-7CD025E29B1D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.Encoding.PerformanceTests", "tests\Performance\System.Text.Encoding.PerformanceTests.csproj", "{859C92CB-72FB-453C-A363-7CD025E29B1D}" ProjectSection(ProjectDependencies) = postProject {635F30B9-5566-4096-B772-68FAA9B00DF4} = {635F30B9-5566-4096-B772-68FAA9B00DF4} EndProjectSection diff --git a/src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj b/src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.PerformanceTests.csproj similarity index 87% rename from src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj rename to src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.PerformanceTests.csproj index 1c9affa372356..48e4c17ed78be 100644 --- a/src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.Performance.Tests.csproj +++ b/src/libraries/System.Text.Encoding/tests/Performance/System.Text.Encoding.PerformanceTests.csproj @@ -11,7 +11,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln index 41bd63fb3cdfe..974d341285b94 100644 --- a/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln +++ b/src/libraries/System.Text.RegularExpressions/System.Text.RegularExpressions.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressi {2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.Performance.Tests", "tests\Performance\System.Text.RegularExpressions.Performance.Tests.csproj", "{7F4B8C48-8692-4885-BF84-FEB7EA82E34B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Text.RegularExpressions.PerformanceTests", "tests\Performance\System.Text.RegularExpressions.PerformanceTests.csproj", "{7F4B8C48-8692-4885-BF84-FEB7EA82E34B}" ProjectSection(ProjectDependencies) = postProject {2C58640B-5BED-4E83-9554-CD2B9762643F} = {2C58640B-5BED-4E83-9554-CD2B9762643F} EndProjectSection diff --git a/src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj b/src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.PerformanceTests.csproj similarity index 90% rename from src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj rename to src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.PerformanceTests.csproj index bb6b7ff371660..07d7d9fa90259 100644 --- a/src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.Performance.Tests.csproj +++ b/src/libraries/System.Text.RegularExpressions/tests/Performance/System.Text.RegularExpressions.PerformanceTests.csproj @@ -17,7 +17,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln index 07ca7cfd8d8bf..10a7ca1065c0e 100644 --- a/src/libraries/System.Threading.Channels/System.Threading.Channels.sln +++ b/src/libraries/System.Threading.Channels/System.Threading.Channels.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.T {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.Performance.Tests", "tests\Performance\System.Threading.Channels.Performance.Tests.csproj", "{856BC941-58C3-4568-AAF2-238349DFA53E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Channels.PerformanceTests", "tests\Performance\System.Threading.Channels.PerformanceTests.csproj", "{856BC941-58C3-4568-AAF2-238349DFA53E}" ProjectSection(ProjectDependencies) = postProject {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} = {AAADA5D3-CF64-4E9D-943C-EFDC006D6366} EndProjectSection diff --git a/src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.Performance.Tests.csproj b/src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.PerformanceTests.csproj similarity index 85% rename from src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.Performance.Tests.csproj rename to src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.PerformanceTests.csproj index 0eb4a5c7c5fc8..5af11be0c5d2a 100644 --- a/src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.Performance.Tests.csproj +++ b/src/libraries/System.Threading.Channels/tests/Performance/System.Threading.Channels.PerformanceTests.csproj @@ -10,7 +10,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln index 966f5ab469b5b..cdac3df97626f 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln +++ b/src/libraries/System.Threading.Tasks.Extensions/System.Threading.Tasks.Extensions.sln @@ -7,12 +7,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Exte {DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions.Performance.Tests", "tests\Performance\System.Threading.Tasks.Extensions.Performance.Tests.csproj", "{77E38A48-61ED-4D79-9136-D88617EE3558}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions.PerformanceTests", "tests\Performance\System.Threading.Tasks.Extensions.PerformanceTests.csproj", "{77E38A48-61ED-4D79-9136-D88617EE3558}" ProjectSection(ProjectDependencies) = postProject {DE90AD0B-649D-4062-B8D9-9658DE140532} = {DE90AD0B-649D-4062-B8D9-9658DE140532} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "src\System.Threading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tasks.Extensions", "src\SystemThreading.Tasks.Extensions.csproj", "{DE90AD0B-649D-4062-B8D9-9658DE140532}" ProjectSection(ProjectDependencies) = postProject {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} = {0DF7FA9A-E7D3-4CEF-862B-A37F5BBBB54C} EndProjectSection diff --git a/src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj b/src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.PerformanceTests.csproj similarity index 91% rename from src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj rename to src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.PerformanceTests.csproj index 503ba554d1961..4cfb28e785770 100644 --- a/src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.Performance.Tests.csproj +++ b/src/libraries/System.Threading.Tasks.Extensions/tests/Performance/System.Threading.Tasks.Extensions.PerformanceTests.csproj @@ -16,7 +16,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Threading/System.Threading.sln b/src/libraries/System.Threading/System.Threading.sln index 61a491121cfdb..2bf2fa31993a7 100644 --- a/src/libraries/System.Threading/System.Threading.sln +++ b/src/libraries/System.Threading/System.Threading.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Tests", "t {604027F5-1DFC-42F4-B4FE-61F8789BA647} = {604027F5-1DFC-42F4-B4FE-61F8789BA647} EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.Performance.Tests", "tests\Performance\System.Threading.Performance.Tests.csproj", "{7AB03FFA-7D4D-4248-9702-3D2785859C18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Threading.PerformanceTests", "tests\Performance\System.Threading.PerformanceTests.csproj", "{7AB03FFA-7D4D-4248-9702-3D2785859C18}" ProjectSection(ProjectDependencies) = postProject {604027F5-1DFC-42F4-B4FE-61F8789BA647} = {604027F5-1DFC-42F4-B4FE-61F8789BA647} EndProjectSection diff --git a/src/libraries/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj b/src/libraries/System.Threading/tests/Performance/System.Threading.PerformanceTests.csproj similarity index 89% rename from src/libraries/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj rename to src/libraries/System.Threading/tests/Performance/System.Threading.PerformanceTests.csproj index 8e8a57336086e..231643a0f7a95 100644 --- a/src/libraries/System.Threading/tests/Performance/System.Threading.Performance.Tests.csproj +++ b/src/libraries/System.Threading/tests/Performance/System.Threading.PerformanceTests.csproj @@ -15,7 +15,7 @@ - + {69e46a6f-9966-45a5-8945-2559fe337827} PerfRunner diff --git a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj index 5b2d6dcaaea8a..1fff09ebf1d15 100644 --- a/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj +++ b/src/libraries/System.Transactions.Local/tests/System.Transactions.Local.Tests.csproj @@ -2,7 +2,7 @@ {1C397868-9644-48CB-94BF-35805C4AE024} netstandard-Debug;netstandard-Release - false + false diff --git a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj index 13e032604d6c8..e8f86b3b4a91b 100644 --- a/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj +++ b/src/libraries/System.ValueTuple/tests/System.ValueTuple.Tests.csproj @@ -4,9 +4,6 @@ netcoreapp-Debug;netcoreapp-Release;netstandard-Debug;netstandard-Release true - - 5 - diff --git a/src/libraries/buildpipeline/windows.groovy b/src/libraries/buildpipeline/windows.groovy index 4be9c985b794b..7298f02ed63ee 100644 --- a/src/libraries/buildpipeline/windows.groovy +++ b/src/libraries/buildpipeline/windows.groovy @@ -75,7 +75,8 @@ simpleNode('windows.10.amd64.clientrs4.devex.open') { targetHelixQueues = ['Windows.10.Amd64.ClientRS4.Open'] } - bat "buildpipeline\\setup-vs-tools.cmd && msbuild src\\upload-tests.proj /p:TargetGroup=${params.TGroup} /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=%CloudDropAccessToken% /p:CloudResultsAccessToken=%OutputCloudResultsAccessToken% /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=\"${targetHelixQueues.join(',')}\" /p:HelixLogFolder= /p:HelixLogFolder=${WORKSPACE}\\${logFolder}\\ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt /p:MaxRetryCount=3" + // We should just use .\eng\common\msbuild.ps1 here instead. + bat "set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1& .\\.dotnet\\dotnet.exe msbuild /nologo .\\src\\upload-tests.proj /p:TargetGroup=${params.TGroup} /p:ArchGroup=${params.AGroup} /p:ConfigurationGroup=${params.CGroup} /p:TestProduct=corefx /p:TimeoutInSeconds=1200 /p:TargetOS=Windows_NT /p:HelixJobType=test/functional/cli/ /p:HelixSource=${helixSource} /p:BuildMoniker=${helixBuild} /p:HelixCreator=${helixCreator} /p:CloudDropAccountName=dotnetbuilddrops /p:CloudResultsAccountName=dotnetjobresults /p:CloudDropAccessToken=%CloudDropAccessToken% /p:CloudResultsAccessToken=%OutputCloudResultsAccessToken% /p:HelixApiEndpoint=https://helix.dot.net/api/2017-04-14/jobs /p:TargetQueues=\\\"${targetHelixQueues.join(',')}\\\" /p:HelixLogFolder=${WORKSPACE}\\${logFolder}\\ /p:HelixCorrelationInfoFileName=SubmittedHelixRuns.txt /p:MaxRetryCount=3" submittedHelixJson = readJSON file: "${logFolder}\\SubmittedHelixRuns.txt" } diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj index 09d7e383bbbd1..2631e3c3c1988 100644 --- a/src/libraries/dirs.proj +++ b/src/libraries/dirs.proj @@ -65,20 +65,20 @@ - - + + - + <_TestProjectRootDir>$(SourceDir) <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild) - - + + true - true + true $(IntermediateOutputPath) $(RestoreOutputPath)/project.assets.json diff --git a/src/libraries/external/test-runtime/XUnit.Runtime.depproj b/src/libraries/external/test-runtime/XUnit.Runtime.depproj index e11f075ea1f6d..f6280c2096cc1 100644 --- a/src/libraries/external/test-runtime/XUnit.Runtime.depproj +++ b/src/libraries/external/test-runtime/XUnit.Runtime.depproj @@ -13,17 +13,16 @@ win10-arm $(RuntimePath) - xunit.runner.console + xunit.runner.console xunit.console xunit.runner.visualstudio xunit.runner.visualstudio.dotnetcore.testadapter xunit.runner.visualstudio.uwp.testadapter xunit.runner.visualstudio.testadapter + Microsoft.NET.Test.Sdk microsoft.testplatform.testhost + Microsoft.Diagnostics.Tracing.TraceEvent testhost - - coverlet.msbuild - 2.3.0 c# @@ -32,169 +31,91 @@ - - $(XUnitPackageVersion) - - - $(MicrosoftDotNetXUnitExtensionsPackageVersion) - - - - $(XUnitPackageVersion) - + + + + - - 1.5.0 - - - 2.1.0 - - - 9.0.1 - - - 1.4 - - - 4.6.519 - - - $(CoverletPackageVersion) - - - 3.0.1 - + + + - - 1.0.6-prerelease - - - 1.0.0-prerelease - - - 1.0.2-prerelease - - - 1.0.1-prerelease - - - 1.0.0 - - - 1.0.7 - - - 1.0.2 - + + + + + + + + + + + + + + + + + + - - $(XUnitPerformancePackageVersion) - - - $(XUnitPerformancePackageVersion) - - - $(XUnitPerformancePackageVersion) - - - $(XUnitPerformancePackageVersion) - - - $(TraceEventPackageVersion) - - - 0.10.1 - - - 2.3.1 - + + + + + + + - + - - - - $(XUnitPackageVersion) - - - $(MicrosoftDotNetTestSdkVersion) - - - $(MicrosoftDotNetTestSdkVersion) - - - $(MicrosoftDotNetTestSdkVersion) - - - 2.0.4 - - - $(MicrosoftDotNetTestSdkVersion) - + + + + + + + + - - - - - - - - - - - - - - - - + - + + - - - - - $(UAPToolsPackageVersion) - - + - - $(RuntimeWinX64RuntimeNativeSystemDataSqlClientSniPackageVersion) - + + @@ -202,8 +123,8 @@ + Condition="'$(TargetGroup)' == 'uap'" + AfterTargets="AfterResolveReferences"> microsoft.dotnet.uap.testtools @@ -213,7 +134,7 @@ - + @@ -229,118 +150,154 @@ SourceFiles="@(LauncherFolderContents)" DestinationFolder="$(TestHostRootPath)\Launcher\%(RecursiveDir)" SkipUnchangedFiles="true"/> + + + + Condition="'$(TargetsAOT)' == 'true'"> + TestILC $(TestILCToolsPackageName).amd64ret $(TestILCToolsPackageName).x86ret $(TestILCToolsPackageName).armret $(PackagesDir)$(TestILCToolsPackageName)\$(ProjectNTfsTestILCPackageVersion)\TestILC - $(TestILCFolder.Replace('/', '\')) - + - + - - - + + + net45 + uap10.0 + netcoreapp1.0 + + + + + false + $(MicrosoftNetTestSdkPackageName) + $(MicrosoftNetTestSdkPackageVersion) + + + + + + + + - - + - + false - $(XUnitRunnerPackageId) + $(XUnitRunnerConsolePackageName) $(XUnitPackageVersion) - + false $(XUnitTestAdapterPackageId) $(XUnitPackageVersion) - + false $(TestPlatformHostPackageId) - $(MicrosoftDotNetTestSdkVersion) + $(MicrosoftNetTestSdkPackageVersion) + - - + + - - + - + false - $(XUnitRunnerPackageId) + $(XUnitRunnerConsolePackageName) $(XUnitPackageVersion) - + false $(XUnitTestAdapterPackageId) $(XUnitPackageVersion) - + false $(TestPlatformHostPackageId) - $(MicrosoftDotNetTestSdkVersion) + $(MicrosoftNetTestSdkPackageVersion) + - - + + - + false - $(XUnitRunnerPackageId) + $(XUnitRunnerConsolePackageName) $(XUnitPackageVersion) - + false $(XUnitTestAdapterPackageId) $(XUnitPackageVersion) + diff --git a/src/libraries/netci.groovy b/src/libraries/netci.groovy index abf8a1c258db8..518ec3f08e0d1 100644 --- a/src/libraries/netci.groovy +++ b/src/libraries/netci.groovy @@ -71,7 +71,7 @@ def targetGroupOsMapInnerloop = ['netcoreapp': ['Windows_NT', 'Ubuntu14.04', 'Ub // Set the machine affinity to windows machines Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto') // Publish reports - Utilities.addHtmlPublisher(newJob, 'artifacts/bin/tests/coverage', 'Code Coverage Report', 'index.htm') + Utilities.addHtmlPublisher(newJob, 'artifacts/coverage', 'Code Coverage Report', 'index.htm') // Archive results. Utilities.addArchival(newJob, '**/coverage/*,msbuild.log') // Timeout. Code coverage runs take longer, so we set the timeout to be longer. diff --git a/src/libraries/tests.builds b/src/libraries/tests.builds index 9b6c20b13a448..53660fb72d8d1 100644 --- a/src/libraries/tests.builds +++ b/src/libraries/tests.builds @@ -7,7 +7,11 @@ Since IsTestProject is set to false in this case, when TargetGroup = netfx it will add net462 and net47 build configurations if they exist on the test project. We only want to build tests against current TargetGroup --> - true + true + true + true + $(TestWorkingDir)**/coverage.xml + $(ArtifactsDir)coverage @@ -18,11 +22,10 @@ - + true - @@ -34,8 +37,8 @@ - <_ProjectPattern Condition="'$(Performance)' != 'true'">.Tests - <_ProjectPattern Condition="'$(Performance)' == 'true'">.Performance.Tests + <_ProjectPattern Condition="'$(Performance)' != 'true'">Tests + <_ProjectPattern Condition="'$(Performance)' == 'true'">PerformanceTests @@ -54,7 +57,7 @@ - + MakeCommonResourcesPriFile; $(TraversalBuildDependsOn) diff --git a/src/libraries/upload-tests.proj b/src/libraries/upload-tests.proj index 8877a27cdded5..5c842dd8f24cc 100644 --- a/src/libraries/upload-tests.proj +++ b/src/libraries/upload-tests.proj @@ -1,12 +1,11 @@ - + - - + - AnyOS.AnyCPU.$(ConfigurationGroup) - $(TestWorkingDir)$(AnyOSPlatformConfig)/archive/ - $(AnyOsArchivesRoot)tests/ - - - Unix.$(Platform).$(ConfigurationGroup) - $(TestWorkingDir)$(UnixPlatformConfig)/archive/ - $(UnixArchivesRoot)tests/ - + $(TestArchiveTestsRoot)$(AnyOSPlatformConfig)/ + $(TestArchiveTestsRoot)$(UnixPlatformConfig)/ - $(TestWorkingDir)$(OSPlatformConfig)/archive/ - $(ArchivesRoot)tests/ + $(TestArchiveTestsRoot)$(OSPlatformConfig)/ + + + $(TestArchiveRoot) test-runtime-$(BuildConfiguration).zip - $(ArchivesRoot)$(TestRuntimeArchiveFilename) + $(TestArchiveRuntimeRoot)$(TestRuntimeArchiveFilename) $(TestRunnerScript) $(TestWorkingDir)SupplementalPayload/ @@ -68,7 +61,7 @@ pr/unknown/ - $(ArchivesRoot) + $(TestArchiveRoot) $(CurrentDate) @@ -86,21 +79,21 @@ true - + - - - + + + - - + + - + @@ -122,15 +115,19 @@ - + + DestinationFile="$(TestRuntimeArchiveFile)" + Overwrite="true" /> + $(Platform)$(ConfigurationGroup)/$(TestRuntimeArchiveFilename) +