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.ComponentModel | |
| 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.ComponentModel')
3 files changed, 11 insertions, 8 deletions
diff --git a/src/System.ComponentModel/System.ComponentModel.sln b/src/System.ComponentModel/System.ComponentModel.sln index d5fad6761a..2d9e5ccdcc 100644 --- a/src/System.ComponentModel/System.ComponentModel.sln +++ b/src/System.ComponentModel/System.ComponentModel.sln @@ -26,10 +26,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netstandard1.3-Debug|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netstandard1.3-Debug|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netstandard1.3-Release|Any CPU - {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netstandard1.3-Release|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.ActiveCfg = netstandard-Debug|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Debug|Any CPU.Build.0 = netstandard-Debug|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.ActiveCfg = netstandard-Release|Any CPU + {40C01084-DAB1-4F24-8729-85523BC9F04E}.Release|Any CPU.Build.0 = netstandard-Release|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.ActiveCfg = netcoreapp-Debug|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Debug|Any CPU.Build.0 = netcoreapp-Debug|Any CPU {D40BC4CC-544F-4F49-A9E1-C81FFF784B2C}.Release|Any CPU.ActiveCfg = netcoreapp-Release|Any CPU diff --git a/src/System.ComponentModel/tests/Configurations.props b/src/System.ComponentModel/tests/Configurations.props index c3266e1e93..b2db637110 100644 --- a/src/System.ComponentModel/tests/Configurations.props +++ b/src/System.ComponentModel/tests/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.ComponentModel/tests/System.ComponentModel.Tests.csproj b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj index 6582ebde55..93207ee43d 100644 --- a/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj +++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.csproj @@ -1,14 +1,16 @@ -<?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>{40C01084-DAB1-4F24-8729-85523BC9F04E}</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="ComponentModelBasicTests.cs" /> </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> -</Project> +</Project>
\ No newline at end of file |