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
diff options
context:
space:
mode:
authorEric Mellino <erme@microsoft.com>2017-01-04 00:27:19 +0300
committerGitHub <noreply@github.com>2017-01-04 00:27:19 +0300
commit2c0352ec38f9f6f602ae819f0cafb02c1908f137 (patch)
tree04d5a8bd0acf51d3a314916d653f25ae777aadb5 /external/test-runtime
parent496c9e27afbdd99d38973623516fb7d5e9471a3b (diff)
Add Configurations.props files for test projects, include tests in build.proj (#14663)
* [WIP]Created src\tests.proj which is mostly building all tests * Convert test project .builds to Configuration.props * Fix test paths in targetingpack.props, move test-runtime. * Move test-runtime under external. * Rename RuntimeDir->RuntimePath in targetingpacks.props and Xunit.Runtime.depproj. * Remove test-runtime project.json from the SupplementalTestData list in dir.targets. * Remove XUnit.Runtime.depproj from tests.proj * Convert test .builds files to Configuration.props. * Revert "Convert test project .builds to Configuration.props" This reverts commit 1efc4d9a02d1c2eced0f20a544abcbcd0092f40c. * Fix compilation error in System.Collections.Concurrent.Tests * Fix condition in System.Collections ref project * Fix two more Collections test project issues * Add Configuration.props for System.Collections ref * Fix TargetGroup conditions in System.Collections.Tests.csproj. * Fix compilation problems with NameResoltion.Pal.Tests. * Fix compilation errors in SqlClient Stress tests * Fix IO.Compression.Performance tests compilation * Fix compilation and configurations of System.Net.Http.Unit.Tests.csproj. * Fix compilation issues in System.Private.Xml.Linq tests * Disable XsltScenarios.Tests project, like it was before. * Fix missing DefineConstants for System.Linq ref project. * Fix compilation of System.Net.Primitives.Pal.Tests.csproj * Fix compilation of System.Net.Primitives.UnitTests.Tests.csproj * Fix compilation of System.Security.Cryptography.Cng.Tests.csproj. * Fix compilation of System.Net.Primitives reference project * Fix compilation of System.Net.Security ref project * Fix compilation of SYstem.Net.Security.Tests.csproj * Fix configuration of X509Certificates ref project * Fix compilation errors in System.Net.Http.Unit.Tests.csproj * Fix Common.Tests.csproj * Fix System.Diagnostics.Debug.Tests.csproj * Fix Microsoft.Win32.Registry.Tests.csproj * Add runtime.native.System.Data.SqlClient.sni to external project * Fix System.Diagnostics.TraceSource.Tests.csproj * Fix System.IO.Compression.Performance.Tests.csproj * Move supplemental test data into test-runtime/project.json * Fix System.IO.FileSystem.Watcher.Tests.csproj * Fix System.IO.FileSystem.Tests.csproj * Fix System.IO.Pipes.AccessControl.Tests.csproj * Fix System.IO.MemoryMappedFiles.Tests.csproj * Fix System.IO.Pipes.Tests.csproj * Fix System.Json.Tests.csproj * Add missing supplemental test data for net security tests * Fix resource names in System.Xml.XPath.XDocument.Tests.csproj * Fix Assembly.Location test case * Fix assembly loading paths in DefaultLoadContextTest.cs * Fix issues in System.Runtime.Loader.Tests.csproj * Fix RootNamespace in ResourceManager tests * Mark OpenSSL tests as unsupported on Windows * Fix RootNamespace in System.Xml.XPath.Tests.csproj * Fix RootNamespace in System.Xml.XPath.XmlDocument.Tests.csproj * Fix System.IO.Compression.Tests.csproj * Add missing Configurations.props files for System.Net projects * Fix compilation issues in WinHttpHandler tests * Add fixes and a workaround for Linq.Expressions tests * Add workaround for System.Runtime.Tests * Use extension methods explicitly in Ref.Emit tests * Hook up test projects into build * Fix build configuration of Crypto.Primitives for netcoreapp * Enable VB tests outside Windows * Enable Mail tests outside windows * Don't run Unsafe tests outside windows * Don't build Unsafe tests outside Windows * Don't build WebServer project outside of Windows. * Fix corerun path for Unix tests. * Fix casing of 'Native' directory in NETCoreApp private pkgproj * Remove runtime-specific stuff from Xunit.Runtime.depproj * Move tests into a separate project ('tests.msbuild') which isn't built in build.proj * Remove duplicate types from NameResolution.Pal tests * Skip tests in a project if there is no compatible configuration. * Include internal socket types only on Windows in NameResolution tests * Manually fix S.R.InteropServices configurations * Rename tests.msbuild -> tests.builds * Manually fix System.Text.Encoding.Tests.csproj configuration * Manually fix System.Threading.Tests configuration * Manually clean up System.Runtime.Tests.csproj * Fix System.IO.FileSystem.Tests configurations * Manually fix System.Globalization.Tests configurations * Manually fix System.IO.Pipes.Tests configurations * Manually fix System.IO.Compression.Tests configurations * Manually fix System.Runtime.Extensions.Tests configurations * Manually fix System.IO.MemoryMappedFiles.Tests configurations * Manually fix S.Diagnostics.Process.Tests configurations * Manually fix System.ComponentModel.TypeConverter.Tests configurations * Misc PR feedback. * Use HostRunnerName instead of HostRunner in Process tests * Fix configurations for S.ServiceProcess.ServiceController.Tests * Revert to using ConfigurationErrorMsg to check if tests should be skipped. Configuration still defaults to 'Debug' even if there is no valid configuration.
Diffstat (limited to 'external/test-runtime')
-rw-r--r--external/test-runtime/XUnit.Runtime.depproj32
-rw-r--r--external/test-runtime/project.json29
2 files changed, 61 insertions, 0 deletions
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
new file mode 100644
index 0000000000..1a70b92a78
--- /dev/null
+++ b/external/test-runtime/XUnit.Runtime.depproj
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <PropertyGroup>
+ <NuGetTargetMoniker>.NETStandard,Version=v1.7</NuGetTargetMoniker>
+ <IsRuntimeAssembly>false</IsRuntimeAssembly>
+ <!-- Given that xunit packages bring with them part of the framework, we need to specify a runtime in order to get the assets
+ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here
+ -->
+ <NugetRuntimeIdentifier>win7-x64</NugetRuntimeIdentifier>
+ <OutputPath>$(RuntimePath)</OutputPath>
+ </PropertyGroup>
+ <ItemGroup>
+ <None Include="project.json" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+ <Target Name="FilterNugetPackage" AfterTargets="ResolveNuGetPackages">
+ <!-- Filter down to just xunit assets -->
+ <ItemGroup>
+ <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.abstractions' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.assert' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.extensibility.core' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.extensibility.execution' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.console.netcore' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='xunit.runner.utility' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Microsoft.xunit.netcore.extensions' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Microsoft.DotNet.xunit.performance.run.core' And
+ '%(ReferenceCopyLocalPaths.NuGetPackageId)'!='Newtonsoft.Json'
+ " />
+ </ItemGroup>
+ </Target>
+</Project>
diff --git a/external/test-runtime/project.json b/external/test-runtime/project.json
new file mode 100644
index 0000000000..ea38f07560
--- /dev/null
+++ b/external/test-runtime/project.json
@@ -0,0 +1,29 @@
+{
+ "dependencies": {
+ "xunit.console.netcore": "1.0.3-prerelease-00921-01",
+ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.1-prerelease-01001-04",
+ "Microsoft.xunit.netcore.extensions": "1.0.1-prerelease-01001-04",
+ "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
+ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
+ "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24728-02",
+ "Microsoft.NETCore.TestHost": "1.2.0-beta-24728-02",
+ "Newtonsoft.Json": "9.0.1",
+ "coveralls.io": "1.4",
+ "OpenCover": "4.6.519",
+ "ReportGenerator": "2.5.0",
+
+ // Supplemental test data
+ "System.IO.Compression.TestData": "1.0.4-prerelease",
+ "System.IO.Packaging.TestData": "1.0.0-prerelease",
+ "System.Security.Cryptography.X509Certificates.TestData": "1.0.2-prerelease",
+ "System.Net.TestData": "1.0.0-prerelease",
+ },
+ "frameworks": {
+ "netstandard1.7": {}
+ },
+ "runtimes": {
+ "win7-x64": {}
+ }
+}