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:
-rw-r--r--build.proj9
-rw-r--r--dir.props4
-rw-r--r--dir.traversal.targets3
-rwxr-xr-xrun-test.sh17
-rw-r--r--src/Common/tests/Common.Tests.builds13
-rw-r--r--src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds9
-rw-r--r--src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds4
-rw-r--r--src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds6
-rw-r--r--src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds11
-rw-r--r--src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj1
-rw-r--r--src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds17
-rw-r--r--src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds4
-rw-r--r--src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds11
-rw-r--r--src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds11
-rw-r--r--src/Scenarios/tests/InterProcessCommunication/InterProcessCommunication.Tests.builds10
-rw-r--r--src/System.AppContext/tests/System.AppContext.Tests.builds9
-rw-r--r--src/System.Buffers/tests/System.Buffers.Tests.builds9
-rw-r--r--src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds9
-rw-r--r--src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds9
-rw-r--r--src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds9
-rw-r--r--src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds9
-rw-r--r--src/System.Collections/src/System.Collections.csproj4
-rw-r--r--src/System.Collections/tests/System.Collections.Tests.builds9
-rw-r--r--src/System.Collections/tests/System.Collections.Tests.csproj2
-rw-r--r--src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds9
-rw-r--r--src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds9
-rw-r--r--src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds9
-rw-r--r--src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds9
-rw-r--r--src/System.ComponentModel/tests/System.ComponentModel.Tests.builds9
-rw-r--r--src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds9
-rw-r--r--src/System.Composition/tests/System.Composition.Tests.builds8
-rw-r--r--src/System.Console/tests/System.Console.Tests.builds9
-rw-r--r--src/System.Console/tests/System.Console.Tests.csproj5
-rw-r--r--src/System.Data.Common/tests/System.Data.Common.Tests.builds9
-rw-r--r--src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj1
-rw-r--r--src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj1
-rw-r--r--src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds9
-rw-r--r--src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds9
-rw-r--r--src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds20
-rw-r--r--src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds9
-rw-r--r--src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds16
-rw-r--r--src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds16
-rw-r--r--src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds9
-rw-r--r--src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds9
-rw-r--r--src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds17
-rw-r--r--src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds9
-rw-r--r--src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds9
-rw-r--r--src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds9
-rw-r--r--src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds9
-rw-r--r--src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds14
-rw-r--r--src/System.Globalization/tests/System.Globalization.Tests.builds9
-rw-r--r--src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds9
-rw-r--r--src/System.IO.Compression/tests/System.IO.Compression.Tests.builds17
-rw-r--r--src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds4
-rw-r--r--src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds14
-rw-r--r--src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds20
-rw-r--r--src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj1
-rw-r--r--src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds9
-rw-r--r--src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds17
-rw-r--r--src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds20
-rw-r--r--src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds17
-rw-r--r--src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds9
-rw-r--r--src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds17
-rw-r--r--src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds9
-rw-r--r--src/System.IO/src/System.IO.csproj2
-rw-r--r--src/System.IO/tests/System.IO.Tests.builds9
-rw-r--r--src/System.IO/tests/System.IO.Tests.csproj3
-rw-r--r--src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds9
-rw-r--r--src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds9
-rw-r--r--src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds9
-rw-r--r--src/System.Linq/tests/System.Linq.Tests.builds9
-rw-r--r--src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds4
-rw-r--r--src/System.Net.Http/tests/System.Net.Http.Tests.builds32
-rw-r--r--src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds19
-rw-r--r--src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds25
-rw-r--r--src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds19
-rw-r--r--src/System.Net.Primitives/tests/System.Net.Primitives.UnitTests.Tests.builds34
-rw-r--r--src/System.Net.Requests/tests/System.Net.Requests.Tests.builds20
-rw-r--r--src/System.Net.Security/tests/System.Net.Security.Unit.Tests.builds25
-rw-r--r--src/System.Net.Sockets/src/System.Net.Sockets.csproj2
-rw-r--r--src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj3
-rw-r--r--src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj3
-rw-r--r--src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds26
-rw-r--r--src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds20
-rw-r--r--src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds17
-rw-r--r--src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds9
-rw-r--r--src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds9
-rw-r--r--src/System.ObjectModel/tests/System.ObjectModel.Tests.builds9
-rw-r--r--src/System.Private.Uri/tests/System.Private.Uri.Tests.builds13
-rw-r--r--src/System.Private.Uri/tests/System.Private.Uri.Tests.csproj14
-rw-r--r--src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds11
-rw-r--r--src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj1
-rw-r--r--src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds9
-rw-r--r--src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds9
-rw-r--r--src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds9
-rw-r--r--src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds9
-rw-r--r--src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds9
-rw-r--r--src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds9
-rw-r--r--src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds10
-rw-r--r--src/System.Reflection/tests/System.Reflection.Tests.builds10
-rw-r--r--src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds9
-rw-r--r--src/System.Resources.ReaderWriter/tests/System.Resources.ReaderWriter.Tests.builds9
-rw-r--r--src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds9
-rw-r--r--src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds9
-rw-r--r--src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds20
-rw-r--r--src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds9
-rw-r--r--src/System.Runtime.InteropServices.PInvoke/tests/System.Runtime.InteropServices.PInvoke.Tests.builds9
-rw-r--r--src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds20
-rw-r--r--src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds9
-rw-r--r--src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj3
-rw-r--r--src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds10
-rw-r--r--src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds9
-rw-r--r--src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds9
-rw-r--r--src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds8
-rw-r--r--src/System.Runtime/tests/System.Runtime.Tests.builds9
-rw-r--r--src/System.Runtime/tests/System.Runtime.Tests.csproj4
-rw-r--r--src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds4
-rw-r--r--src/System.Security.Claims/tests/System.Security.Claims.Tests.builds9
-rw-r--r--src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds20
-rw-r--r--src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds4
-rw-r--r--src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds11
-rw-r--r--src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds4
-rw-r--r--src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds11
-rw-r--r--src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds17
-rw-r--r--src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds2
-rw-r--r--src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds17
-rw-r--r--src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds9
-rw-r--r--src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds17
-rw-r--r--src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds11
-rw-r--r--src/System.Security.Principal/tests/System.Security.Principal.Tests.builds11
-rw-r--r--src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds17
-rw-r--r--src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds9
-rw-r--r--src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds9
-rw-r--r--src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds9
-rw-r--r--src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds9
-rw-r--r--src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds11
-rw-r--r--src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj1
-rw-r--r--src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds11
-rw-r--r--src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds10
-rw-r--r--src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds9
-rw-r--r--src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds9
-rw-r--r--src/System.Threading.Tasks/src/System.Threading.Tasks.csproj4
-rw-r--r--src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds9
-rw-r--r--src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj6
-rw-r--r--src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds9
-rw-r--r--src/System.Threading/src/System.Threading.csproj2
-rw-r--r--src/System.Threading/tests/System.Threading.Tests.builds9
-rw-r--r--src/System.Threading/tests/System.Threading.Tests.csproj10
-rw-r--r--src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds22
-rw-r--r--src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds18
-rw-r--r--src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds9
-rw-r--r--src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds9
-rw-r--r--src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds9
-rw-r--r--src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds9
-rw-r--r--src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds9
-rw-r--r--src/tests.builds14
156 files changed, 1540 insertions, 75 deletions
diff --git a/build.proj b/build.proj
index 7eb8e138ad..f815a267c2 100644
--- a/build.proj
+++ b/build.proj
@@ -4,6 +4,10 @@
<!-- Capture OSGroup passed to command line for setting default FilterToOSGroup value below -->
<_OriginalOSGroup>$(OSGroup)</_OriginalOSGroup>
</PropertyGroup>
+ <PropertyGroup>
+ <InputOSGroup>$(OSGroup)</InputOSGroup>
+ <InputOSGroup Condition="'$(InputOSGroup)'==''">$(FilterToOSGroup)</InputOSGroup>
+ </PropertyGroup>
<Import Project="dir.props" />
<!-- required to build the projects in their specified order -->
@@ -25,8 +29,11 @@
<Project Include="src\dirs.proj">
<!-- For the root traversal default filter the OSGroup to the OSEnvironment which is the OS we are running on -->
<FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup>
+ <InputOSGroup>$(InputOSGroup)</InputOSGroup>
+ </Project>
+ <Project Include="src\tests.builds" Condition="$(BuildTests)=='true'">
+ <InputOSGroup>$(InputOSGroup)</InputOSGroup>
</Project>
- <Project Include="src\tests.builds" Condition="$(BuildTests)=='true'"/>
<!-- signing must happen before packaging -->
<Project Include="src\sign.builds" />
<Project Include="src\packages.builds" Condition="'$(BuildPackages)'=='true'"/>
diff --git a/dir.props b/dir.props
index e502c39549..9af9737008 100644
--- a/dir.props
+++ b/dir.props
@@ -11,6 +11,10 @@
<OsEnvironment Condition="'$(OsEnvironment)'==''">$(OS)</OsEnvironment>
</PropertyGroup>
+ <PropertyGroup>
+ <InputOSGroup Condition="'$(InputOSGroup)'==''">$(OSEnvironment)</InputOSGroup>
+ </PropertyGroup>
+
<!-- Build Tools Versions -->
<PropertyGroup>
<RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion>
diff --git a/dir.traversal.targets b/dir.traversal.targets
index cfd6e2e619..0c56c0679c 100644
--- a/dir.traversal.targets
+++ b/dir.traversal.targets
@@ -23,6 +23,9 @@
<AdditionalProperties Condition="'%(Project.FilterToOSGroup)'!=''">FilterToOSGroup=%(Project.FilterToOSGroup);%(Project.AdditionalProperties)</AdditionalProperties>
</Project>
<Project>
+ <AdditionalProperties Condition="'%(Project.InputOSGroup)' != ''">InputOSGroup=%(Project.InputOSGroup);%(Project.AdditionalProperties)</AdditionalProperties>
+ </Project>
+ <Project>
<!-- If a project isn't setting the OSGroup via metadata then undefine it so that the globally set OSGroup doesn't override empty OSGroup -->
<UndefineProperties Condition="'%(Project.OSGroup)'==''">%(Project.UndefineProperties);OSGroup</UndefineProperties>
</Project>
diff --git a/run-test.sh b/run-test.sh
index 3bd4fa1be1..b25d773446 100755
--- a/run-test.sh
+++ b/run-test.sh
@@ -83,7 +83,6 @@ esac
# Misc defaults
TestSelection=".*"
TestsFailed=0
-OverlayDir="$ProjectRoot/bin/tests/$OS.AnyCPU.$ConfigurationGroup/TestOverlay/"
create_test_overlay()
{
@@ -163,8 +162,16 @@ runtest()
if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ]
then
- echo "error: Did not find corresponding test dll for $testProject at $dirName/$testDllName"
- exit 1
+ dirName="$AnyOsTestDir/$fileNameWithoutExtension/dnxcore50"
+ if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ]
+ then
+ dirName="$UnixTestDir/$fileNameWithoutExtension/dnxcore50"
+ if [ ! -d "$dirName" ] || [ ! -f "$dirName/$testDllName" ]
+ then
+ echo "error: Did not find corresponding test dll for $testProject"
+ exit 1
+ fi
+ fi
fi
copy_test_overlay $dirName
@@ -303,6 +310,10 @@ do
shift
done
+OverlayDir="$ProjectRoot/bin/tests/$OS.AnyCPU.$ConfigurationGroup/TestOverlay/"
+AnyOsTestDir="$ProjectRoot/bin/tests/AnyOS.AnyCPU.$ConfigurationGroup"
+UnixTestDir="$ProjectRoot/bin/tests/Unix.AnyCPU.$ConfigurationGroup"
+
# Compute paths to the binaries if they haven't already been computed
if [ "$CoreClrBins" == "" ]
diff --git a/src/Common/tests/Common.Tests.builds b/src/Common/tests/Common.Tests.builds
new file mode 100644
index 0000000000..89484b497c
--- /dev/null
+++ b/src/Common/tests/Common.Tests.builds
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Common.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="Common.Tests.csproj">
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds
new file mode 100644
index 0000000000..93bd833b66
--- /dev/null
+++ b/src/Microsoft.CSharp/tests/Microsoft.CSharp.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Microsoft.CSharp.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
index fcbbed749e..2425d0ec96 100644
--- a/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
+++ b/src/Microsoft.VisualBasic/pkg/Microsoft.VisualBasic.builds
@@ -3,7 +3,9 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<!-- Temporary workaround, VisualBasic projects cannot be built on non-Windows platforms. See issue #5230. -->
- <Project Include="Microsoft.VisualBasic.pkgproj" Condition="'$(OSEnvironment)' == 'Windows_NT'" />
+ <Project Include="Microsoft.VisualBasic.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds
index 6a7ae8e9f7..c50e4482d9 100644
--- a/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds
+++ b/src/Microsoft.VisualBasic/src/Microsoft.VisualBasic.builds
@@ -3,7 +3,9 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<!-- Temporary workaround, VisualBasic projects cannot be built on non-Windows platforms. See issue #5230. -->
- <Project Include="Microsoft.VisualBasic.vbproj" Condition="'$(OSEnvironment)' == 'Windows_NT'" />
+ <Project Include="Microsoft.VisualBasic.vbproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
-</Project> \ No newline at end of file
+</Project>
diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds
new file mode 100644
index 0000000000..8aa48a5dcd
--- /dev/null
+++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <!-- Temporary workaround, VisualBasic projects cannot be built on non-Windows platforms. See issue #5230. -->
+ <Project Include="Microsoft.VisualBasic.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
index a386002759..986465660a 100644
--- a/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
+++ b/src/Microsoft.VisualBasic/tests/Microsoft.VisualBasic.Tests.csproj
@@ -5,6 +5,7 @@
<ProjectGuid>{82B54697-0251-47A1-8546-FC507D0F3B08}</ProjectGuid>
<AssemblyName>Microsoft.VisualBasic.Tests</AssemblyName>
<RootNamespace>Microsoft.VisualBasic.Tests</RootNamespace>
+ <UnsupportedPlatforms>Linux;NetBSD;OSX</UnsupportedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds
new file mode 100644
index 0000000000..64be5940e0
--- /dev/null
+++ b/src/Microsoft.Win32.Primitives/tests/Microsoft.Win32.Primitives.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Microsoft.Win32.Primitives.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="Microsoft.Win32.Primitives.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="Microsoft.Win32.Primitives.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
index c3bc001dcc..95bff11262 100644
--- a/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
+++ b/src/Microsoft.Win32.Registry.AccessControl/pkg/Microsoft.Win32.Registry.AccessControl.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="Microsoft.Win32.Registry.AccessControl.pkgproj" />
+ <Project Include="Microsoft.Win32.Registry.AccessControl.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds
new file mode 100644
index 0000000000..62209136db
--- /dev/null
+++ b/src/Microsoft.Win32.Registry.AccessControl/tests/Microsoft.Win32.Registry.AccessControl.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Microsoft.Win32.Registry.AccessControl.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds
new file mode 100644
index 0000000000..200b5fe941
--- /dev/null
+++ b/src/Microsoft.Win32.Registry/tests/Microsoft.Win32.Registry.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Microsoft.Win32.Registry.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/Scenarios/tests/InterProcessCommunication/InterProcessCommunication.Tests.builds b/src/Scenarios/tests/InterProcessCommunication/InterProcessCommunication.Tests.builds
new file mode 100644
index 0000000000..c579d04e69
--- /dev/null
+++ b/src/Scenarios/tests/InterProcessCommunication/InterProcessCommunication.Tests.builds
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="InterProcessCommunication.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.AppContext/tests/System.AppContext.Tests.builds b/src/System.AppContext/tests/System.AppContext.Tests.builds
new file mode 100644
index 0000000000..4b5268e5b1
--- /dev/null
+++ b/src/System.AppContext/tests/System.AppContext.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.AppContext.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Buffers/tests/System.Buffers.Tests.builds b/src/System.Buffers/tests/System.Buffers.Tests.builds
new file mode 100644
index 0000000000..8d89d890d7
--- /dev/null
+++ b/src/System.Buffers/tests/System.Buffers.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Buffers.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds
new file mode 100644
index 0000000000..236df79da9
--- /dev/null
+++ b/src/System.Collections.Concurrent/tests/System.Collections.Concurrent.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Collections.Concurrent.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds
new file mode 100644
index 0000000000..4322f59987
--- /dev/null
+++ b/src/System.Collections.Immutable/tests/System.Collections.Immutable.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Collections.Immutable.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds
new file mode 100644
index 0000000000..ce9f85e351
--- /dev/null
+++ b/src/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Collections.NonGeneric.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds
new file mode 100644
index 0000000000..5560a26b15
--- /dev/null
+++ b/src/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Collections.Specialized.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections/src/System.Collections.csproj b/src/System.Collections/src/System.Collections.csproj
index 34837bbb07..25ca70a638 100644
--- a/src/System.Collections/src/System.Collections.csproj
+++ b/src/System.Collections/src/System.Collections.csproj
@@ -20,8 +20,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aotao_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == ''">
<ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
- <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
- <OSGroup>Windows_NT</OSGroup>
+ <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" >
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'net46'">
diff --git a/src/System.Collections/tests/System.Collections.Tests.builds b/src/System.Collections/tests/System.Collections.Tests.builds
new file mode 100644
index 0000000000..2efac79eb1
--- /dev/null
+++ b/src/System.Collections/tests/System.Collections.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Collections.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Collections/tests/System.Collections.Tests.csproj b/src/System.Collections/tests/System.Collections.Tests.csproj
index f957ca47ef..d009d4d0f5 100644
--- a/src/System.Collections/tests/System.Collections.Tests.csproj
+++ b/src/System.Collections/tests/System.Collections.Tests.csproj
@@ -22,6 +22,7 @@
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
<ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -34,6 +35,7 @@
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds
new file mode 100644
index 0000000000..34d0b4dde2
--- /dev/null
+++ b/src/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ComponentModel.Annotations.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds
new file mode 100644
index 0000000000..1fb88003df
--- /dev/null
+++ b/src/System.ComponentModel.EventBasedAsync/tests/System.ComponentModel.EventBasedAsync.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ComponentModel.EventBasedAsync.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds
new file mode 100644
index 0000000000..83e1092e1a
--- /dev/null
+++ b/src/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ComponentModel.Primitives.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds
new file mode 100644
index 0000000000..41ec5eeaad
--- /dev/null
+++ b/src/System.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ComponentModel.TypeConverter.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds b/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds
new file mode 100644
index 0000000000..223dc68d89
--- /dev/null
+++ b/src/System.ComponentModel/tests/System.ComponentModel.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ComponentModel.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds
new file mode 100644
index 0000000000..925498c888
--- /dev/null
+++ b/src/System.Composition.Convention/tests/System.Composition.Convention.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Composition.Convention.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Composition/tests/System.Composition.Tests.builds b/src/System.Composition/tests/System.Composition.Tests.builds
new file mode 100644
index 0000000000..656c42e66f
--- /dev/null
+++ b/src/System.Composition/tests/System.Composition.Tests.builds
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Composition.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Console/tests/System.Console.Tests.builds b/src/System.Console/tests/System.Console.Tests.builds
new file mode 100644
index 0000000000..fa97b97108
--- /dev/null
+++ b/src/System.Console/tests/System.Console.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Console.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Console/tests/System.Console.Tests.csproj b/src/System.Console/tests/System.Console.Tests.csproj
index 3ce4afd468..b7768ca106 100644
--- a/src/System.Console/tests/System.Console.Tests.csproj
+++ b/src/System.Console/tests/System.Console.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -61,10 +58,12 @@
<ProjectReference Include="..\src\System.Console.csproj">
<Project>{F9DF2357-81B4-4317-908E-512DA9395583}</Project>
<Name>System.Console</Name>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
<ProjectReference Include="$(CommonTestPath)\System\Diagnostics\RemoteExecutorConsoleApp\RemoteExecutorConsoleApp.csproj">
<Project>{69e46a6f-9966-45a5-8945-2559fe337827}</Project>
<Name>RemoteExecutorConsoleApp</Name>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/System.Data.Common/tests/System.Data.Common.Tests.builds b/src/System.Data.Common/tests/System.Data.Common.Tests.builds
new file mode 100644
index 0000000000..db3c12c00c
--- /dev/null
+++ b/src/System.Data.Common/tests/System.Data.Common.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Data.Common.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
index 921235a368..0e912d6a26 100644
--- a/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
+++ b/src/System.Data.SqlClient/tests/FunctionalTests/System.Data.SqlClient.Tests.csproj
@@ -9,6 +9,7 @@
<OutputType>Library</OutputType>
<RootNamespace>System.Data.SqlClient.Tests</RootNamespace>
<AssemblyName>System.Data.SqlClient.Tests</AssemblyName>
+ <UnsupportedPlatforms>Linux;OSX</UnsupportedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU'" />
diff --git a/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj b/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
index 2a2a37955a..0ee1e341f8 100644
--- a/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/System.Data.SqlClient/tests/ManualTests/System.Data.SqlClient.ManualTesting.Tests.csproj
@@ -14,6 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
<PropertyGroup Condition=" '$(TargetsWindows)' != 'true' ">
<DefineConstants>$(DefineConstants);MANAGED_SNI</DefineConstants>
+ <UnsupportedPlatforms>Linux;OSX</UnsupportedPlatforms>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\System.Data.SqlClient.csproj">
diff --git a/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds b/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds
new file mode 100644
index 0000000000..c3a40f719d
--- /dev/null
+++ b/src/System.Data.SqlClient/tests/System.Data.SqlClient.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Data.SqlClient.Tests.csproj" />
+ <Project Include="ManualTests\System.Data.SqlClient.ManualTesting.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds
new file mode 100644
index 0000000000..90a06d485c
--- /dev/null
+++ b/src/System.Diagnostics.Contracts/tests/System.Diagnostics.Contracts.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.Contracts.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
new file mode 100644
index 0000000000..c36efce3d8
--- /dev/null
+++ b/src/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.Debug.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.Debug.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.Debug.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.Debug.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds
new file mode 100644
index 0000000000..ce2c3e28c1
--- /dev/null
+++ b/src/System.Diagnostics.DiagnosticSource/tests/System.Diagnostics.DiagnosticSource.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.DiagnosticSource.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds
new file mode 100644
index 0000000000..f287558945
--- /dev/null
+++ b/src/System.Diagnostics.FileVersionInfo/tests/System.Diagnostics.FileVersionInfo.Tests.builds
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.FileVersionInfo.Tests\System.Diagnostics.FileVersionInfo.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds
new file mode 100644
index 0000000000..85dcb47ddf
--- /dev/null
+++ b/src/System.Diagnostics.Process/tests/System.Diagnostics.Process.Tests.builds
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.Process.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.Process.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.Process.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds
new file mode 100644
index 0000000000..c3fcc71625
--- /dev/null
+++ b/src/System.Diagnostics.TextWriterTraceListener/tests/System.Diagnostics.TextWriterTraceListener.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.TextWriterTraceListener.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds
new file mode 100644
index 0000000000..8db8171a76
--- /dev/null
+++ b/src/System.Diagnostics.Tools/tests/System.Diagnostics.Tools.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.Tools.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds
new file mode 100644
index 0000000000..0afffc8598
--- /dev/null
+++ b/src/System.Diagnostics.TraceSource/tests/System.Diagnostics.TraceSource.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.TraceSource.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.TraceSource.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Diagnostics.TraceSource.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds
new file mode 100644
index 0000000000..fd4743f6d6
--- /dev/null
+++ b/src/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Diagnostics.Tracing.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds
new file mode 100644
index 0000000000..6949575321
--- /dev/null
+++ b/src/System.Drawing.Primitives/tests/System.Drawing.Primitives.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Drawing.Primitives.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds
new file mode 100644
index 0000000000..1c923e24d8
--- /dev/null
+++ b/src/System.Dynamic.Runtime/tests/System.Dynamic.Runtime.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Dynamic.Runtime.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds
new file mode 100644
index 0000000000..eba3f1737b
--- /dev/null
+++ b/src/System.Globalization.Calendars/tests/System.Globalization.Calendars.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Globalization.Calendars.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds
new file mode 100644
index 0000000000..950e108bd5
--- /dev/null
+++ b/src/System.Globalization.Extensions/tests/System.Globalization.Extensions.Tests.builds
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Globalization.Extensions.Tests.csproj">
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ <Project Include="System.Globalization.Extensions.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Globalization/tests/System.Globalization.Tests.builds b/src/System.Globalization/tests/System.Globalization.Tests.builds
new file mode 100644
index 0000000000..a1cec20e88
--- /dev/null
+++ b/src/System.Globalization/tests/System.Globalization.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Globalization.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds
new file mode 100644
index 0000000000..cb16d10cfd
--- /dev/null
+++ b/src/System.IO.Compression.ZipFile/tests/System.IO.Compression.ZipFile.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.Compression.ZipFile.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds b/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds
new file mode 100644
index 0000000000..b0d49d3466
--- /dev/null
+++ b/src/System.IO.Compression/tests/System.IO.Compression.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.Compression.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.Compression.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.Compression.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
index f05a5d3f4a..c213a6d77d 100644
--- a/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
+++ b/src/System.IO.FileSystem.AccessControl/pkg/System.IO.FileSystem.AccessControl.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="System.IO.FileSystem.AccessControl.pkgproj" />
+ <Project Include="System.IO.FileSystem.AccessControl.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds
new file mode 100644
index 0000000000..2994e868c3
--- /dev/null
+++ b/src/System.IO.FileSystem.AccessControl/tests/System.IO.FileSystem.AccessControl.Tests.builds
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.FileSystem.AccessControl.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.AccessControl.Tests.csproj">
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds
new file mode 100644
index 0000000000..0fab479f7b
--- /dev/null
+++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.FileSystem.DriveInfo.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.DriveInfo.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.DriveInfo.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.DriveInfo.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
index debc433fca..20b707dd1d 100644
--- a/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
+++ b/src/System.IO.FileSystem.DriveInfo/tests/System.IO.FileSystem.DriveInfo.Tests.csproj
@@ -11,7 +11,6 @@
<RootNamespace>System.IO.FileSystem.DriveInfo.Tests</RootNamespace>
<AssemblyName>System.IO.FileSystem.DriveInfo.Tests</AssemblyName>
<ProjectGuid>{7D9E5F2F-5677-40FC-AD04-FA7D603E4806}</ProjectGuid>
- <UnsupportedPlatforms>OSX</UnsupportedPlatforms>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds
new file mode 100644
index 0000000000..713f4944ba
--- /dev/null
+++ b/src/System.IO.FileSystem.Primitives/tests/System.IO.FileSystem.Primitives.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.FileSystem.Primitives.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds
new file mode 100644
index 0000000000..6163a357e7
--- /dev/null
+++ b/src/System.IO.FileSystem.Watcher/tests/System.IO.FileSystem.Watcher.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.FileSystem.Watcher.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.Watcher.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.Watcher.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds
new file mode 100644
index 0000000000..e715aadc93
--- /dev/null
+++ b/src/System.IO.FileSystem/tests/System.IO.FileSystem.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.FileSystem.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.FileSystem.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds
new file mode 100644
index 0000000000..03812305f6
--- /dev/null
+++ b/src/System.IO.MemoryMappedFiles/tests/System.IO.MemoryMappedFiles.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.MemoryMappedFiles.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.MemoryMappedFiles.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.MemoryMappedFiles.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds
new file mode 100644
index 0000000000..512c693c51
--- /dev/null
+++ b/src/System.IO.Packaging/tests/System.IO.Packaging.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.Packaging.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds
new file mode 100644
index 0000000000..3b4e05f66e
--- /dev/null
+++ b/src/System.IO.Pipes/tests/System.IO.Pipes.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.Pipes.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.IO.Pipes.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.IO.Pipes.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds
new file mode 100644
index 0000000000..5105beed80
--- /dev/null
+++ b/src/System.IO.UnmanagedMemoryStream/tests/System.IO.UnmanagedMemoryStream.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.UnmanagedMemoryStream.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO/src/System.IO.csproj b/src/System.IO/src/System.IO.csproj
index f4d33b0c71..bc7a457249 100644
--- a/src/System.IO/src/System.IO.csproj
+++ b/src/System.IO/src/System.IO.csproj
@@ -31,7 +31,7 @@
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
<Project>{E7E8DE8A-9EC1-46A8-A6EE-727DB32DBEB8}</Project>
<Name>System.Diagnostics.Debug</Name>
- <OSGroup>Windows_NT</OSGroup>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'net462'">
diff --git a/src/System.IO/tests/System.IO.Tests.builds b/src/System.IO/tests/System.IO.Tests.builds
new file mode 100644
index 0000000000..f7d875044f
--- /dev/null
+++ b/src/System.IO/tests/System.IO.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.IO.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.IO/tests/System.IO.Tests.csproj b/src/System.IO/tests/System.IO.Tests.csproj
index 9b46ef4a59..be6b0690fc 100644
--- a/src/System.IO/tests/System.IO.Tests.csproj
+++ b/src/System.IO/tests/System.IO.Tests.csproj
@@ -47,13 +47,14 @@
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
- <OSGroup>$(OSGroup)</OSGroup>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds
new file mode 100644
index 0000000000..446beb1275
--- /dev/null
+++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Linq.Expressions.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds
new file mode 100644
index 0000000000..67f3928252
--- /dev/null
+++ b/src/System.Linq.Parallel/tests/System.Linq.Parallel.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Linq.Parallel.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds
new file mode 100644
index 0000000000..494e69f737
--- /dev/null
+++ b/src/System.Linq.Queryable/tests/System.Linq.Queryable.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Linq.Queryable.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Linq/tests/System.Linq.Tests.builds b/src/System.Linq/tests/System.Linq.Tests.builds
new file mode 100644
index 0000000000..737cfd2221
--- /dev/null
+++ b/src/System.Linq/tests/System.Linq.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Linq.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
index 6df46c8907..8b2e254fe9 100644
--- a/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
+++ b/src/System.Net.Http.WinHttpHandler/pkg/System.Net.Http.WinHttpHandler.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="System.Net.Http.WinHttpHandler.pkgproj" />
+ <Project Include="System.Net.Http.WinHttpHandler.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/System.Net.Http/tests/System.Net.Http.Tests.builds b/src/System.Net.Http/tests/System.Net.Http.Tests.builds
new file mode 100644
index 0000000000..7779ac6a80
--- /dev/null
+++ b/src/System.Net.Http/tests/System.Net.Http.Tests.builds
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Http.Unit.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Http.Functional.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds b/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds
new file mode 100644
index 0000000000..112ef61e0d
--- /dev/null
+++ b/src/System.Net.NameResolution/tests/System.Net.NameResolution.Tests.builds
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj" >
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.NameResolution.Functional.Tests.csproj" >
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ <Project Include="PalTests\System.Net.NameResolution.Pal.Tests.csproj" >
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="PalTests\System.Net.NameResolution.Pal.Tests.csproj" >
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds b/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds
new file mode 100644
index 0000000000..4bf31df46b
--- /dev/null
+++ b/src/System.Net.NetworkInformation/tests/System.Net.NetworkInformation.Tests.builds
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.NetworkInformation.Functional.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.NetworkInformation.WinRT.Unit.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.NetworkInformation.WinRT.Unit.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.NetworkInformation.WinRT.Unit.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds
new file mode 100644
index 0000000000..9f82e8dfbb
--- /dev/null
+++ b/src/System.Net.Ping/tests/System.Net.Ping.Functional.Tests.builds
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Ping.Functional.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Net.Primitives/tests/System.Net.Primitives.UnitTests.Tests.builds b/src/System.Net.Primitives/tests/System.Net.Primitives.UnitTests.Tests.builds
new file mode 100644
index 0000000000..003b03492a
--- /dev/null
+++ b/src/System.Net.Primitives/tests/System.Net.Primitives.UnitTests.Tests.builds
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.Primitives.Functional.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Primitives.Functional.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Primitives.Functional.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="PalTests\System.Net.Primitives.Pal.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="PalTests\System.Net.Primitives.Pal.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="PalTests\System.Net.Primitives.Pal.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Primitives.UnitTests.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Primitives.UnitTests.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Primitives.UnitTests.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds b/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds
new file mode 100644
index 0000000000..6172cf4d51
--- /dev/null
+++ b/src/System.Net.Requests/tests/System.Net.Requests.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Net.Requests.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Net.Requests.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Net.Requests.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Net.Requests.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.Security/tests/System.Net.Security.Unit.Tests.builds b/src/System.Net.Security/tests/System.Net.Security.Unit.Tests.builds
new file mode 100644
index 0000000000..ae5d22908d
--- /dev/null
+++ b/src/System.Net.Security/tests/System.Net.Security.Unit.Tests.builds
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.Security.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Security.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Security.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Security.Unit.Tests.csproj" >
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Security.Unit.Tests.csproj" >
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="UnitTests\System.Net.Security.Unit.Tests.csproj" >
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Net.Sockets/src/System.Net.Sockets.csproj b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
index fbfbb3d42e..2469f22613 100644
--- a/src/System.Net.Sockets/src/System.Net.Sockets.csproj
+++ b/src/System.Net.Sockets/src/System.Net.Sockets.csproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
+ <Configuration Condition=" '$(Configuration)' == '' ">$(OS)_Debug</Configuration>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
diff --git a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
index 8b8092eb12..dc69215f34 100644
--- a/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
+++ b/src/System.Net.Sockets/tests/FunctionalTests/System.Net.Sockets.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj
index b707c06881..154352d163 100644
--- a/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj
+++ b/src/System.Net.Sockets/tests/PerformanceTests/System.Net.Sockets.Async.Performance.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<ProjectGuid>{BB5C85AD-C51A-4903-80E9-6F6E1AC1AD34}</ProjectGuid>
diff --git a/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
new file mode 100644
index 0000000000..6ac94a79ae
--- /dev/null
+++ b/src/System.Net.Sockets/tests/System.Net.Sockets.Tests.builds
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="FunctionalTests\System.Net.Sockets.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="PerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="PerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="PerformanceTests\System.Net.Sockets.Async.Performance.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds
new file mode 100644
index 0000000000..06cb3f33dd
--- /dev/null
+++ b/src/System.Net.WebHeaderCollection/tests/System.Net.WebHeaderCollection.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Net.WebHeaderCollection.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Net.WebHeaderCollection.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Net.WebHeaderCollection.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Net.WebHeaderCollection.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds
new file mode 100644
index 0000000000..43b977017d
--- /dev/null
+++ b/src/System.Net.WebSockets.Client/tests/System.Net.WebSockets.Client.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Net.WebSockets.Client.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Net.WebSockets.Client.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Net.WebSockets.Client.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds
new file mode 100644
index 0000000000..c6bb35536d
--- /dev/null
+++ b/src/System.Net.WebSockets/tests/System.Net.WebSockets.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Net.WebSockets.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds
new file mode 100644
index 0000000000..3aae63c508
--- /dev/null
+++ b/src/System.Numerics.Vectors/tests/System.Numerics.Vectors.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Numerics.Vectors.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds b/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds
new file mode 100644
index 0000000000..88c16050a7
--- /dev/null
+++ b/src/System.ObjectModel/tests/System.ObjectModel.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.ObjectModel.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds b/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds
new file mode 100644
index 0000000000..0b2a5cf2eb
--- /dev/null
+++ b/src/System.Private.Uri/tests/System.Private.Uri.Tests.builds
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Private.Uri.Tests.csproj">
+ <OSGroup>Unix</OSGroup>
+ </Project>
+ <Project Include="System.Private.Uri.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Private.Uri/tests/System.Private.Uri.Tests.csproj b/src/System.Private.Uri/tests/System.Private.Uri.Tests.csproj
index 1f679570ea..6cb415e45d 100644
--- a/src/System.Private.Uri/tests/System.Private.Uri.Tests.csproj
+++ b/src/System.Private.Uri/tests/System.Private.Uri.Tests.csproj
@@ -1,25 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Windows_Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B0FFC4A8-BAC3-4A7F-8FD5-5B680209371C}</ProjectGuid>
<OutputType>Library</OutputType>
<AssemblyName>System.Private.Uri.Tests</AssemblyName>
<UnsupportedPlatforms>FreeBSD</UnsupportedPlatforms>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'FreeBSD_Release|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Linux_Release|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'OSX_Release|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Debug|AnyCPU'" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Windows_Release|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<ItemGroup>
<Compile Include="UriBuilderTests.cs" />
</ItemGroup>
diff --git a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds
new file mode 100644
index 0000000000..d399956939
--- /dev/null
+++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Context.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
index c87ad9fca8..9e69f43f70 100644
--- a/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
+++ b/src/System.Reflection.Context/tests/System.Reflection.Context.Tests.csproj
@@ -5,6 +5,7 @@
<ProjectGuid>{D77FBA6C-1AA6-45A4-93E2-97A370672C53}</ProjectGuid>
<AssemblyName>System.Reflection.Context.Tests</AssemblyName>
<RootNamespace>System.Reflection.Context.Tests</RootNamespace>
+ <UnsupportedPlatforms>FreeBSD;Linux;NetBSD;OSX</UnsupportedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
diff --git a/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds
new file mode 100644
index 0000000000..1011680d8c
--- /dev/null
+++ b/src/System.Reflection.DispatchProxy/tests/System.Reflection.DispatchProxy.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.DispatchProxy.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds
new file mode 100644
index 0000000000..985922b21b
--- /dev/null
+++ b/src/System.Reflection.Emit.ILGeneration/tests/System.Reflection.Emit.ILGeneration.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Emit.ILGeneration.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds
new file mode 100644
index 0000000000..c3971f2842
--- /dev/null
+++ b/src/System.Reflection.Emit.Lightweight/tests/System.Reflection.Emit.Lightweight.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Emit.Lightweight.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds
new file mode 100644
index 0000000000..d8a6423ca9
--- /dev/null
+++ b/src/System.Reflection.Emit/tests/System.Reflection.Emit.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Emit.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds
new file mode 100644
index 0000000000..1cc0a9cb94
--- /dev/null
+++ b/src/System.Reflection.Extensions/tests/System.Reflection.Extensions.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Extensions.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds
new file mode 100644
index 0000000000..51a53577a5
--- /dev/null
+++ b/src/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Metadata.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds
new file mode 100644
index 0000000000..2d40ce7eb9
--- /dev/null
+++ b/src/System.Reflection.TypeExtensions/tests/System.Reflection.TypeExtensions.Tests.builds
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.TypeExtensions.Tests.csproj" />
+ <Project Include="CoreCLR\System.Reflection.TypeExtensions.CoreCLR.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Reflection/tests/System.Reflection.Tests.builds b/src/System.Reflection/tests/System.Reflection.Tests.builds
new file mode 100644
index 0000000000..5f011998c6
--- /dev/null
+++ b/src/System.Reflection/tests/System.Reflection.Tests.builds
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Reflection.Tests.csproj" />
+ <Project Include="CoreCLR\System.Reflection.CoreCLR.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds
new file mode 100644
index 0000000000..01ec8a4512
--- /dev/null
+++ b/src/System.Resources.Reader/tests/System.Resources.Reader.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Resources.Reader.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Resources.ReaderWriter/tests/System.Resources.ReaderWriter.Tests.builds b/src/System.Resources.ReaderWriter/tests/System.Resources.ReaderWriter.Tests.builds
new file mode 100644
index 0000000000..5059306af1
--- /dev/null
+++ b/src/System.Resources.ReaderWriter/tests/System.Resources.ReaderWriter.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Resources.ReaderWriter.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds
new file mode 100644
index 0000000000..54b514fd22
--- /dev/null
+++ b/src/System.Resources.ResourceManager/tests/System.Resources.ResourceManager.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Resources.ResourceManager.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds
new file mode 100644
index 0000000000..a275b08ade
--- /dev/null
+++ b/src/System.Resources.Writer/tests/System.Resources.Writer.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Resources.Writer.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds
new file mode 100644
index 0000000000..3a7b28f421
--- /dev/null
+++ b/src/System.Runtime.Extensions/tests/System.Runtime.Extensions.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Extensions.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.Extensions.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.Extensions.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.Extensions.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds
new file mode 100644
index 0000000000..69a7aae7eb
--- /dev/null
+++ b/src/System.Runtime.Handles/tests/System.Runtime.Handles.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Handles.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.InteropServices.PInvoke/tests/System.Runtime.InteropServices.PInvoke.Tests.builds b/src/System.Runtime.InteropServices.PInvoke/tests/System.Runtime.InteropServices.PInvoke.Tests.builds
new file mode 100644
index 0000000000..1e49ee8442
--- /dev/null
+++ b/src/System.Runtime.InteropServices.PInvoke/tests/System.Runtime.InteropServices.PInvoke.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.InteropServices.PInvoke.Tests.csproj"/>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds
new file mode 100644
index 0000000000..830c5f8caa
--- /dev/null
+++ b/src/System.Runtime.InteropServices.RuntimeInformation/tests/System.Runtime.InteropServices.RuntimeInformation.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.InteropServices.RuntimeInformation.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.InteropServices.RuntimeInformation.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.InteropServices.RuntimeInformation.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Runtime.InteropServices.RuntimeInformation.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds
new file mode 100644
index 0000000000..6515ee3904
--- /dev/null
+++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.InteropServices.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
index 60d17e606e..5f501d9a46 100644
--- a/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
+++ b/src/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds
new file mode 100644
index 0000000000..a2e63caaaa
--- /dev/null
+++ b/src/System.Runtime.Loader/tests/System.Runtime.Loader.Tests.builds
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Loader.Tests.csproj" />
+ <Project Include="DefaultContext\System.Runtime.Loader.DefaultContext.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds
new file mode 100644
index 0000000000..95d25fed97
--- /dev/null
+++ b/src/System.Runtime.Numerics/tests/System.Runtime.Numerics.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Numerics.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds
new file mode 100644
index 0000000000..e597cf3807
--- /dev/null
+++ b/src/System.Runtime.Serialization.Json/tests/System.Runtime.Serialization.Json.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Serialization.Json.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds
new file mode 100644
index 0000000000..a304300367
--- /dev/null
+++ b/src/System.Runtime.Serialization.Xml/tests/System.Runtime.Serialization.Xml.Tests.builds
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Serialization.Xml.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Runtime/tests/System.Runtime.Tests.builds b/src/System.Runtime/tests/System.Runtime.Tests.builds
new file mode 100644
index 0000000000..b07183c6e2
--- /dev/null
+++ b/src/System.Runtime/tests/System.Runtime.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Runtime.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Runtime/tests/System.Runtime.Tests.csproj b/src/System.Runtime/tests/System.Runtime.Tests.csproj
index b498d8abbe..a0994bfed2 100644
--- a/src/System.Runtime/tests/System.Runtime.Tests.csproj
+++ b/src/System.Runtime/tests/System.Runtime.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -140,6 +137,7 @@
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
+ <OSGroup>Windows_NT</OSGroup>
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
index 33926d0b96..9443c73399 100644
--- a/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
+++ b/src/System.Security.AccessControl/pkg/System.Security.AccessControl.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="System.Security.AccessControl.pkgproj" />
+ <Project Include="System.Security.AccessControl.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds b/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds
new file mode 100644
index 0000000000..d3dcb5bbc3
--- /dev/null
+++ b/src/System.Security.Claims/tests/System.Security.Claims.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Claims.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds
new file mode 100644
index 0000000000..4702748cc1
--- /dev/null
+++ b/src/System.Security.Cryptography.Algorithms/tests/System.Security.Cryptography.Algorithms.Tests.builds
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.Algorithms.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
index 6fe6460da9..54909b72fd 100644
--- a/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
+++ b/src/System.Security.Cryptography.Cng/pkg/System.Security.Cryptography.Cng.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="System.Security.Cryptography.Cng.pkgproj" />
+ <Project Include="System.Security.Cryptography.Cng.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds
new file mode 100644
index 0000000000..01eead731b
--- /dev/null
+++ b/src/System.Security.Cryptography.Cng/tests/System.Security.Cryptography.Cng.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.Cng.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
index 47f387787a..c6ae8b703e 100644
--- a/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
+++ b/src/System.Security.Cryptography.Csp/pkg/System.Security.Cryptography.Csp.builds
@@ -2,7 +2,9 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
- <Project Include="System.Security.Cryptography.Csp.pkgproj" />
+ <Project Include="System.Security.Cryptography.Csp.pkgproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project>
diff --git a/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds
new file mode 100644
index 0000000000..f1463c26ac
--- /dev/null
+++ b/src/System.Security.Cryptography.Csp/tests/System.Security.Cryptography.Csp.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.Csp.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds
new file mode 100644
index 0000000000..51111b0b09
--- /dev/null
+++ b/src/System.Security.Cryptography.Encoding/tests/System.Security.Cryptography.Encoding.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.Encoding.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.Encoding.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.Encoding.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
index bf80098367..cb01dc4c9f 100644
--- a/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
+++ b/src/System.Security.Cryptography.OpenSsl/pkg/System.Security.Cryptography.OpenSsl.builds
@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<ItemGroup>
<Project Include="System.Security.Cryptography.OpenSsl.pkgproj">
- <OSGroup>Linux</OSGroup>
+ <OSGroup>Unix</OSGroup>
</Project>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
diff --git a/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds
new file mode 100644
index 0000000000..921c2beac8
--- /dev/null
+++ b/src/System.Security.Cryptography.OpenSsl/tests/System.Security.Cryptography.OpenSsl.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.OpenSsl.Tests.csproj">
+ <OSGroup>FreeBSD</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.OpenSsl.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.OpenSsl.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds
new file mode 100644
index 0000000000..c564b8a4ef
--- /dev/null
+++ b/src/System.Security.Cryptography.Primitives/tests/System.Security.Cryptography.Primitives.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.Primitives.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds
new file mode 100644
index 0000000000..c2ebd7e288
--- /dev/null
+++ b/src/System.Security.Cryptography.X509Certificates/tests/System.Security.Cryptography.X509Certificates.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Security.Cryptography.X509Certificates.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds
new file mode 100644
index 0000000000..915ef3cc71
--- /dev/null
+++ b/src/System.Security.Principal.Windows/tests/System.Security.Principal.Windows.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Principal.Windows.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Security.Principal/tests/System.Security.Principal.Tests.builds b/src/System.Security.Principal/tests/System.Security.Principal.Tests.builds
new file mode 100644
index 0000000000..cc082b0012
--- /dev/null
+++ b/src/System.Security.Principal/tests/System.Security.Principal.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Security.Principal.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds
new file mode 100644
index 0000000000..9384cae6f4
--- /dev/null
+++ b/src/System.Text.Encoding.CodePages/tests/System.Text.Encoding.CodePages.Tests.builds
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Text.Encoding.CodePages.Tests.csproj">
+ <OSGroup>Linux</OSGroup>
+ </Project>
+ <Project Include="System.Text.Encoding.CodePages.Tests.csproj">
+ <OSGroup>OSX</OSGroup>
+ </Project>
+ <Project Include="System.Text.Encoding.CodePages.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds
new file mode 100644
index 0000000000..bb1726f92e
--- /dev/null
+++ b/src/System.Text.Encoding.Extensions/tests/System.Text.Encoding.Extensions.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Text.Encoding.Extensions.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds
new file mode 100644
index 0000000000..6950d12c88
--- /dev/null
+++ b/src/System.Text.Encoding/tests/System.Text.Encoding.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Text.Encoding.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds
new file mode 100644
index 0000000000..bdda558f4a
--- /dev/null
+++ b/src/System.Text.Encodings.Web/tests/System.Text.Encodings.Web.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Text.Encodings.Web.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
new file mode 100644
index 0000000000..d31cdc2c02
--- /dev/null
+++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Text.RegularExpressions.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds
new file mode 100644
index 0000000000..62218e82bf
--- /dev/null
+++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.AccessControl.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
index 328f8c3eea..2e1d30c732 100644
--- a/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
+++ b/src/System.Threading.AccessControl/tests/System.Threading.AccessControl.Tests.csproj
@@ -16,6 +16,7 @@
<ProjectReference Include="..\src\System.Threading.AccessControl.csproj">
<Project>{E3ED83FD-3015-4BD8-A1B8-6294986E6CFA}</Project>
<Name>System.Threading.AccessControl</Name>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup>
diff --git a/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds
new file mode 100644
index 0000000000..f7f976fecf
--- /dev/null
+++ b/src/System.Threading.Overlapped/tests/System.Threading.Overlapped.Tests.builds
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Overlapped.Tests.csproj">
+ <OSGroup>Windows_NT</OSGroup>
+ </Project>
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds
new file mode 100644
index 0000000000..288a8662b0
--- /dev/null
+++ b/src/System.Threading.Tasks.Dataflow/tests/System.Threading.Tasks.Dataflow.Tests.builds
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Tasks.Dataflow.Tests.csproj" />
+ <Project Include="System.Threading.Tasks.Dataflow.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds
new file mode 100644
index 0000000000..2a83532d8d
--- /dev/null
+++ b/src/System.Threading.Tasks.Extensions/tests/System.Threading.Tasks.Extensions.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Tasks.Extensions.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds
new file mode 100644
index 0000000000..11582fbd6b
--- /dev/null
+++ b/src/System.Threading.Tasks.Parallel/tests/System.Threading.Tasks.Parallel.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Tasks.Parallel.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
index 868ba88326..2a226f34f4 100644
--- a/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
+++ b/src/System.Threading.Tasks/src/System.Threading.Tasks.csproj
@@ -19,8 +19,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcore50aot_Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == ''">
<Compile Include="System\Threading\Tasks\TaskExtensions.CoreCLR.cs" />
- <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
- <OSGroup>Windows_NT</OSGroup>
+ <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj" >
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net46'">
diff --git a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds
new file mode 100644
index 0000000000..91ec8ee90c
--- /dev/null
+++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Tasks.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
index 7b1f4219fd..025f4a189e 100644
--- a/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
+++ b/src/System.Threading.Tasks/tests/System.Threading.Tasks.Tests.csproj
@@ -17,12 +17,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
</ProjectReference>
- <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <OutputItemType>Content</OutputItemType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- <Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
- </ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="XunitAssemblyAttributes.cs" />
diff --git a/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds
new file mode 100644
index 0000000000..0152f12f42
--- /dev/null
+++ b/src/System.Threading.Timer/tests/System.Threading.Timer.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Timer.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading/src/System.Threading.csproj b/src/System.Threading/src/System.Threading.csproj
index 40b8019c56..c40df0680d 100644
--- a/src/System.Threading/src/System.Threading.csproj
+++ b/src/System.Threading/src/System.Threading.csproj
@@ -29,7 +29,7 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == ''">
<ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
- <OSGroup>Windows_NT</OSGroup>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'net46'">
diff --git a/src/System.Threading/tests/System.Threading.Tests.builds b/src/System.Threading/tests/System.Threading.Tests.builds
new file mode 100644
index 0000000000..b0148c21fe
--- /dev/null
+++ b/src/System.Threading/tests/System.Threading.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Threading.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Threading/tests/System.Threading.Tests.csproj b/src/System.Threading/tests/System.Threading.Tests.csproj
index 2682278cdc..b689f24fba 100644
--- a/src/System.Threading/tests/System.Threading.Tests.csproj
+++ b/src/System.Threading/tests/System.Threading.Tests.csproj
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <Configuration Condition="'$(Configuration)'==''">Windows_Debug</Configuration>
- </PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -65,12 +62,7 @@
<OutputItemType>Content</OutputItemType>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
- </ProjectReference>
- <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <OutputItemType>Content</OutputItemType>
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- <Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
+ <OSGroup>$(InputOSGroup)</OSGroup>
</ProjectReference>
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
diff --git a/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds b/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds
new file mode 100644
index 0000000000..b73b3ae09c
--- /dev/null
+++ b/src/System.Xml.ReaderWriter/tests/System.Xml.ReaderWriter.Tests.builds
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="Readers\CharCheckingReader\System.Xml.RW.CharCheckingReader.Tests.csproj" />
+ <Project Include="Readers\CustomReader\System.Xml.RW.CustomReader.Tests.csproj" />
+ <Project Include="Readers\FactoryReader\System.Xml.RW.FactoryReader.Tests.csproj" />
+ <Project Include="Readers\NameTable\System.Xml.RW.NameTable.Tests.csproj" />
+ <Project Include="Readers\ReaderSettings\System.Xml.RW.ReaderSettings.Tests.csproj" />
+ <Project Include="Readers\SubtreeReader\System.Xml.RW.SubtreeReader.Tests.csproj" />
+ <Project Include="Readers\WrappedReader\System.Xml.RW.WrappedReader.Tests.csproj" />
+ <Project Include="Writers\RwFactory\System.Xml.RW.RwFactory.Tests.csproj" />
+ <Project Include="Writers\XmlWriterApi\System.Xml.RW.XmlWriterApi.Tests.csproj" />
+ <Project Include="XmlConvert\System.Xml.RW.XmlConvert.Tests.csproj" />
+ <Project Include="XmlReader\ReadContentAs\System.Xml.RW.XmlReader.ReadContentAs.Tests.csproj" />
+ <Project Include="XmlReader\Tests\System.Xml.RW.XmlReader.Tests.csproj" />
+ <Project Include="XmlReader\XmlResolver\System.Xml.RW.XmlSystemPathResolver.Tests.csproj" />
+ <Project Include="XmlReaderLib\System.Xml.RW.XmlReaderLib.csproj" />
+ <Project Include="XmlWriter\System.Xml.RW.XmlWriter.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds b/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds
new file mode 100644
index 0000000000..5982557507
--- /dev/null
+++ b/src/System.Xml.XDocument/tests/System.Xml.XDocument.Tests.builds
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="axes\System.Xml.XDocument.Axes.Tests.csproj" />
+ <Project Include="events\System.Xml.XDocument.Events.Tests.csproj" />
+ <Project Include="misc\System.Xml.XDocument.Misc.Tests.csproj" />
+ <Project Include="Properties\System.Xml.XDocument.Properties.Tests.csproj" />
+ <Project Include="SDMSample\System.Xml.XDocument.SDMSample.Tests.csproj" />
+ <Project Include="Streaming\System.Xml.XDocument.Streaming.Tests.csproj" />
+ <Project Include="TreeManipulation\System.Xml.XDocument.TreeManipulation.Tests.csproj" />
+ <Project Include="XDocument.Common\XDocument.Common.csproj" />
+ <Project Include="XDocument.Test.ModuleCore\XDocument.Test.ModuleCore.csproj" />
+ <Project Include="xNodeBuilder\System.Xml.XDocument.xNodeBuilder.Tests.csproj" />
+ <Project Include="xNodeReader\System.Xml.XDocument.xNodeReader.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
diff --git a/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds
new file mode 100644
index 0000000000..3d8bb46581
--- /dev/null
+++ b/src/System.Xml.XPath.XDocument/tests/System.Xml.XPath.XDocument.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Xml.XPath.XDocument.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds
new file mode 100644
index 0000000000..8607240e00
--- /dev/null
+++ b/src/System.Xml.XPath.XmlDocument/tests/System.Xml.XPath.XmlDocument.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Xml.XPath.XmlDocument.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds
new file mode 100644
index 0000000000..1c463fc750
--- /dev/null
+++ b/src/System.Xml.XPath/tests/System.Xml.XPath.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Xml.XPath.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds
new file mode 100644
index 0000000000..4397e99579
--- /dev/null
+++ b/src/System.Xml.XmlDocument/tests/System.Xml.XmlDocument.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Xml.XmlDocument.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds
new file mode 100644
index 0000000000..fc1d12ebc1
--- /dev/null
+++ b/src/System.Xml.XmlSerializer/tests/System.Xml.XmlSerializer.Tests.builds
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+ <ItemGroup>
+ <Project Include="System.Xml.XmlSerializer.Tests.csproj" />
+ </ItemGroup>
+ <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
+</Project>
+
diff --git a/src/tests.builds b/src/tests.builds
index c1fd23c24f..15bb5bd76b 100644
--- a/src/tests.builds
+++ b/src/tests.builds
@@ -6,20 +6,14 @@
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-
<PropertyGroup>
<FilterToOSGroup Condition="'$(_OriginalOSGroup)' == ''">$(OSEnvironment)</FilterToOSGroup>
</PropertyGroup>
-
+ <PropertyGroup>
+ <BuildAllOSGroups Condition="'$(OSGroup)' != '' OR '$(FilterToOSGroup)' != ''">false</BuildAllOSGroups>
+ </PropertyGroup>
<ItemGroup>
- <ExcludeProjects Condition="'$(OSEnvironment)'!='Windows_NT'" Include="**\Microsoft.VisualBasic.Tests.csproj" />
- <ExcludeProjects Condition="'$(OSGroup)'=='Windows_NT'" Include="**\System.Security.Cryptography.OpenSsl.Tests.csproj" />
- <Project Include="*\test*\**\*.csproj" Exclude="@(ExcludeProjects)">
- <OSGroup Condition="'$(FilterToOSGroup)'!=''">$(FilterToOSGroup)</OSGroup>
- </Project>
- <Project Include="*\test*\**\*.vbproj" Condition="'$(IncludeVbProjects)'!='false'">
- <OSGroup Condition="'$(FilterToOSGroup)'!=''">$(FilterToOSGroup)</OSGroup>
- </Project>
+ <Project Include="*\tests\*.builds" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />
</Project> \ No newline at end of file