diff options
| author | Stephen Toub <stoub@microsoft.com> | 2017-04-20 22:38:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 22:38:15 +0300 |
| commit | 1db7e65928e73b9848f2e8ca7d6ee9c7eef4bc3e (patch) | |
| tree | 7226f6f0620b80595f622d49a2d668fe709bdb2d /src | |
| parent | 0c1a37600485c1149c8ff95c696adc789e32e193 (diff) | |
| parent | 39f206f6aafacde948d4b1494a16fd55a4cde9d0 (diff) | |
Merge pull request #18678 from mconnew/XmlSerializerPerf
Move XmlSerializer perf tests into own project with correct naming
Diffstat (limited to 'src')
3 files changed, 38 insertions, 2 deletions
diff --git a/src/System.Private.Xml/tests/XmlSerializer/Performance/Configurations.props b/src/System.Private.Xml/tests/XmlSerializer/Performance/Configurations.props new file mode 100644 index 0000000000..77a4b65bc9 --- /dev/null +++ b/src/System.Private.Xml/tests/XmlSerializer/Performance/Configurations.props @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netstandard; + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj b/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj new file mode 100644 index 0000000000..3034650f4d --- /dev/null +++ b/src/System.Private.Xml/tests/XmlSerializer/Performance/System.Xml.XmlSerializer.Performance.Tests.csproj @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + <PropertyGroup> + <AppDesignerFolder>Properties</AppDesignerFolder> + <IncludePerformanceTests>true</IncludePerformanceTests> + <ProjectGuid>{9891F9AC-9A0A-47DF-8D96-92B21AFC3B93}</ProjectGuid> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <ItemGroup> + <Compile Include="$(TestSourceFolder)..\..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> + <Compile Include="$(TestSourceFolder)..\..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.cs" /> + <Compile Include="$(TestSourceFolder)..\..\..\..\System.Runtime.Serialization.Xml\tests\Performance\PerformanceTestsCommon.cs" /> + <Compile Include="$(TestSourceFolder)XsPerformanceTest.cs" /> + <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> + <Link>CommonTest\System\PlatformDetection.cs</Link> + </Compile> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="$(CommonPath)\..\perf\PerfRunner\PerfRunner.csproj"> + <Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project> + <Name>PerfRunner</Name> + </ProjectReference> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj b/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj index 4fc69e41a3..e5db808ca9 100644 --- a/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj +++ b/src/System.Private.Xml/tests/XmlSerializer/System.Xml.XmlSerializer.Tests.csproj @@ -12,9 +12,7 @@ <ItemGroup> <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\Utils.cs" /> <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\SerializationTypes.cs" /> - <Compile Include="$(TestSourceFolder)..\..\..\System.Runtime.Serialization.Xml\tests\Performance\PerformanceTestsCommon.cs" /> <Compile Include="$(TestSourceFolder)XmlSerializerTests.cs" /> - <Compile Include="$(TestSourceFolder)Performance\XsPerformanceTest.cs" /> <Compile Include="$(CommonTestPath)\System\PlatformDetection.cs"> <Link>CommonTest\System\PlatformDetection.cs</Link> </Compile> |