diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2017-02-09 02:32:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-09 02:32:53 +0300 |
| commit | 15b4f51c2f3cb924840e5407bb8d5fe03bb282ea (patch) | |
| tree | c820f338e7ad9b2ec11c5e508d1d2ef3f44ce798 /src/System.Private.Xml/tests/Xslt | |
| parent | 61ac3777213b2b6b9713e1ad77c891007ae1ba2a (diff) | |
Enable tests to compile with netstandard (#15956)
* Enable tests to compile with netstandard
Most of the tests have netstandard configurations and it doesn't compile. the changes here is to fix the configurations and the tests to compile.
This is important step to get netfx tests compile too as we are in most of the time netfx fallback to netstandard configuration
The changes include some fixes to compile teh sources too.
* Fix System.Collections.Immutable
* update src configuration
* remove netstandard17 defines
* Split netcoreapp code to its own files
* Remove 17 from the test class name
Diffstat (limited to 'src/System.Private.Xml/tests/Xslt')
4 files changed, 26 insertions, 11 deletions
diff --git a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/Configurations.props new file mode 100644 index 0000000000..77a4b65bc9 --- /dev/null +++ b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/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/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj index ad4a0b0f21..abe7326552 100644 --- a/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XslCompiledTransformApi/System.Xml.Xsl.XslCompiledTransformApi.Tests.csproj @@ -5,15 +5,17 @@ <ProjectGuid>{B01E2AE1-1B52-4518-B32E-016070356A7F}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - </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 Condition="'$(TargetGroup)' == 'netcoreapp'"> + <Compile Include="XslCompiledTransform.cs" /> + </ItemGroup> <ItemGroup> <Compile Include="Errata4.cs" /> <Compile Include="OutputSettings.cs" /> <Compile Include="TempFiles.cs" /> - <Compile Include="XslCompiledTransform.cs" /> <Compile Include="XsltApiV2.cs" /> <Compile Include="XsltArgumentList.cs" /> <Compile Include="XsltArgumentListMultith.cs" /> diff --git a/src/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props b/src/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props new file mode 100644 index 0000000000..2845c11c54 --- /dev/null +++ b/src/System.Private.Xml/tests/Xslt/XsltCompiler/Configurations.props @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <BuildConfigurations> + netcoreapp; + </BuildConfigurations> + </PropertyGroup> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj index 19a0663dc8..ad8ad555e1 100644 --- a/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj +++ b/src/System.Private.Xml/tests/Xslt/XsltCompiler/XsltCompiler.Tests.csproj @@ -5,12 +5,8 @@ <ProjectGuid>{59B2167E-E2D6-4E7E-AFFE-4060E1F3843C}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <OutputPath>$(OutputPath)\$(RootNamespace)\$(AssemblyName)</OutputPath> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <OutputPath>$(OutputPath)\$(RootNamespace)\$(AssemblyName)</OutputPath> - </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" /> <ItemGroup> <Compile Include="CommonScenarios\XsltcTestBasicFunctionality.cs" /> <Compile Include="CommonScenarios\XsltcTestCaseBase.cs" /> |