diff options
| author | Tarek Mahmoud Sayed <tarekms@microsoft.com> | 2017-02-07 00:52:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-07 00:52:11 +0300 |
| commit | 62212cca900081173fce70991c3a0b30393994a3 (patch) | |
| tree | fd09c442d0bf236eb3b5d78415ad3356d93f95a0 /src/System.Runtime.Extensions/tests | |
| parent | 4cafdebd2ceb5383c12cf70b020a72ae770c0e71 (diff) | |
Remove versioned configuration from test projects (#15879)
The changes onclude some other minor clean up in the test project files
Diffstat (limited to 'src/System.Runtime.Extensions/tests')
10 files changed, 4 insertions, 42 deletions
diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj index e4e79973e6..96103be4cd 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj @@ -9,21 +9,14 @@ <!-- 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.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Class1.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Core" /> - <TargetingPackReference Include="System.Runtime" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props index 800e963c80..c398e42e89 100644 --- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props +++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.5; netstandard; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Extensions/tests/Configurations.props b/src/System.Runtime.Extensions/tests/Configurations.props index b117e5a4e8..5055ec1f79 100644 --- a/src/System.Runtime.Extensions/tests/Configurations.props +++ b/src/System.Runtime.Extensions/tests/Configurations.props @@ -4,8 +4,6 @@ <BuildConfigurations> netcoreapp-Windows_NT; netcoreapp-Unix; - netstandard1.5-Unix; - netstandard1.5-Windows_NT; netstandard-Windows_NT; netstandard-Unix; </BuildConfigurations> diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj index f2e41ef8f9..5de360ac3e 100644 --- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj +++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj @@ -15,10 +15,6 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Release|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Debug|AnyCPU'" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Windows_NT-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Unix-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Unix-Release|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Windows_NT-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Windows_NT-Release|AnyCPU'" /> <ItemGroup Condition="'$(TargetGroup)'=='netstandard' or '$(TargetGroup)'=='netcoreapp'"> <Compile Include="System\ApplicationIdTests.cs" /> <Compile Include="System\IO\PathTests.netstandard.cs" /> diff --git a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props index 800e963c80..c398e42e89 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props +++ b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.5; netstandard; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj index 6d9b68c099..b19a5c2adc 100644 --- a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj +++ b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj @@ -10,22 +10,15 @@ <!-- 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.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="TestApp.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Core" /> - <TargetingPackReference Include="System.Runtime" /> - </ItemGroup> <ItemGroup> <None Include="project.json" /> </ItemGroup> diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props index 800e963c80..c398e42e89 100644 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props +++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.5; netstandard; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj index 02a94799a4..aa9e8c1998 100644 --- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj +++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj @@ -10,22 +10,15 @@ <!-- 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.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="Program.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Core" /> - <TargetingPackReference Include="System.Runtime" /> - </ItemGroup> <ItemGroup> <ProjectReference Include="..\AssemblyResolveTests\AssemblyResolveTests.csproj"> <Project>{ad83807c-8be5-4f27-85df-9793613233e1}</Project> diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props index 800e963c80..c398e42e89 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props @@ -2,7 +2,6 @@ <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <BuildConfigurations> - netstandard1.5; netstandard; </BuildConfigurations> </PropertyGroup> diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj index 1a4b4bd8c9..90f54284b8 100644 --- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj +++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj @@ -10,21 +10,14 @@ <!-- 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.5-Debug|AnyCPU'" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" /> <ItemGroup> <Compile Include="VoidMainWithExitCodeApp.cs" /> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' != 'net46'"> + <ItemGroup> <Compile Include="AssemblyAttributes.cs" /> <Compile Include="$(CommonPath)\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs"> <Link>Common\System\Diagnostics\CodeAnalysis\ExcludeFromCodeCoverageAssemblyAttribute.cs</Link> </Compile> </ItemGroup> - <ItemGroup Condition="'$(TargetGroup)' == 'net46'"> - <TargetingPackReference Include="System" /> - <TargetingPackReference Include="System.Core" /> - <TargetingPackReference Include="System.Runtime" /> - </ItemGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project>
\ No newline at end of file |