Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/System.Runtime.Extensions/tests
diff options
context:
space:
mode:
authorTarek Mahmoud Sayed <tarekms@microsoft.com>2017-02-03 04:54:40 +0300
committerGitHub <noreply@github.com>2017-02-03 04:54:40 +0300
commite79912f8b77bc22abfd85e94b74c06e5d99e8381 (patch)
tree391ecc074646284dde8da4f600f31bfe9ec03da7 /src/System.Runtime.Extensions/tests
parentd0001fe7c89b7e1b5d629ba0f13f1233ea72490d (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.Runtime.Extensions/tests')
-rw-r--r--src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj2
-rw-r--r--src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props1
-rw-r--r--src/System.Runtime.Extensions/tests/Configurations.props2
-rw-r--r--src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj24
-rw-r--r--src/System.Runtime.Extensions/tests/TestApp/Configurations.props1
-rw-r--r--src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj2
-rw-r--r--src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props1
-rw-r--r--src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj2
-rw-r--r--src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props1
-rw-r--r--src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj2
10 files changed, 28 insertions, 10 deletions
diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
index a76392925e..e4e79973e6 100644
--- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
+++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/AssemblyResolveTests.csproj
@@ -7,6 +7,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.5-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" />
<ItemGroup>
diff --git a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props
index 2c5652de53..800e963c80 100644
--- a/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props
+++ b/src/System.Runtime.Extensions/tests/AssemblyResolveTests/Configurations.props
@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard1.5;
+ netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Runtime.Extensions/tests/Configurations.props b/src/System.Runtime.Extensions/tests/Configurations.props
index ad85f94e9e..b117e5a4e8 100644
--- a/src/System.Runtime.Extensions/tests/Configurations.props
+++ b/src/System.Runtime.Extensions/tests/Configurations.props
@@ -6,6 +6,8 @@
netcoreapp-Unix;
netstandard1.5-Unix;
netstandard1.5-Windows_NT;
+ netstandard-Windows_NT;
+ netstandard-Unix;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
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 803539ec6d..f2e41ef8f9 100644
--- a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.csproj
+++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.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>
@@ -7,14 +7,18 @@
<DefineConstants Condition="'$(TargetGroup)'=='netstandard2.0'">$(DefineConstants);netstandard17</DefineConstants>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Windows_NT-Release|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='netcoreapp-Unix-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'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard-Unix-Debug|AnyCPU'" />
+ <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" />
@@ -122,4 +126,4 @@
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project> \ No newline at end of file
diff --git a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props
index 2c5652de53..800e963c80 100644
--- a/src/System.Runtime.Extensions/tests/TestApp/Configurations.props
+++ b/src/System.Runtime.Extensions/tests/TestApp/Configurations.props
@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard1.5;
+ netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
index f57a318162..6d9b68c099 100644
--- a/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
+++ b/src/System.Runtime.Extensions/tests/TestApp/TestApp.csproj
@@ -8,6 +8,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.5-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" />
<ItemGroup>
diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
index 2c5652de53..800e963c80 100644
--- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
+++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/Configurations.props
@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard1.5;
+ netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
index 04d7dac966..02a94799a4 100644
--- a/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
+++ b/src/System.Runtime.Extensions/tests/TestAppOutsideOfTPA/TestAppOutsideOfTPA.csproj
@@ -8,6 +8,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.5-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" />
<ItemGroup>
diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
index 2c5652de53..800e963c80 100644
--- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
+++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/Configurations.props
@@ -3,6 +3,7 @@
<PropertyGroup>
<BuildConfigurations>
netstandard1.5;
+ netstandard;
</BuildConfigurations>
</PropertyGroup>
</Project> \ No newline at end of file
diff --git a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
index d8436fe29d..1a4b4bd8c9 100644
--- a/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
+++ b/src/System.Runtime.Extensions/tests/VoidMainWithExitCodeApp/VoidMainWithExitCodeApp.csproj
@@ -8,6 +8,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.5-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netstandard1.5-Release|AnyCPU'" />
<ItemGroup>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 01:08:56 +0300