diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2017-02-03 04:54:40 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 04:54:40 +0300 |
| commit | e79912f8b77bc22abfd85e94b74c06e5d99e8381 (patch) | |
| tree | 391ecc074646284dde8da4f600f31bfe9ec03da7 /src/System.Private.Xml.Linq/tests | |
| parent | d0001fe7c89b7e1b5d629ba0f13f1233ea72490d (diff) | |
Enable compiling the test projects against the configuration (#15743)
* Enable compiling the test projects against the configuration
The tests were compiled using the vertical configuration and not the best configuration picked from Configurations.props. this change is fix that and have all test projects configured accordingly.
This change ensuring netcoreapp runs successfully and we'll have another rounds later for other configurations like netfx, UAP...etc.
* Fix openssl test project on Linux distros
* Update the project configurations
* Update VS solution files
* update solution files
Diffstat (limited to 'src/System.Private.Xml.Linq/tests')
6 files changed, 17 insertions, 8 deletions
diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj index ebef5e950b..36e815de79 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Common/XDocument.Common.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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> @@ -8,8 +8,10 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="BridgeHelpers.cs" /> <Compile Include="CXmlCache.cs" /> @@ -26,4 +28,4 @@ <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj index 9f26c40448..0586d44c02 100644 --- a/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj +++ b/src/System.Private.Xml.Linq/tests/XDocument.Test.ModuleCore/XDocument.Test.ModuleCore.csproj @@ -6,6 +6,8 @@ <NoWarn>0436</NoWarn> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> diff --git a/src/System.Private.Xml.Linq/tests/events/Configurations.props b/src/System.Private.Xml.Linq/tests/events/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.Private.Xml.Linq/tests/events/Configurations.props +++ b/src/System.Private.Xml.Linq/tests/events/Configurations.props @@ -3,6 +3,7 @@ <PropertyGroup> <BuildConfigurations> netstandard1.3; + netstandard; </BuildConfigurations> </PropertyGroup> </Project>
\ No newline at end of file diff --git a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj index 6e48dd4cfb..4b2b4dd596 100644 --- a/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj +++ b/src/System.Private.Xml.Linq/tests/events/System.Xml.Linq.Events.Tests.csproj @@ -1,12 +1,14 @@ -<?xml version="1.0" encoding="utf-8"?> +<?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> <ProjectGuid>{C560E194-5B14-4112-ABC6-3208491E53E6}</ProjectGuid> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netstandard1.3-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Release|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Debug|AnyCPU'" /> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.3-Release|AnyCPU'" /> <ItemGroup> <Compile Include="EventsAdd.cs" /> <Compile Include="EventsName.cs" /> @@ -22,4 +24,4 @@ <ProjectReference Include="..\XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |