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:
authorchcosta <chcosta@microsoft.com>2016-12-10 22:29:31 +0300
committerGitHub <noreply@github.com>2016-12-10 22:29:31 +0300
commita07f6aac5309b30154d0fe00debe7f9979600ea1 (patch)
tree7aba7503381ae1b89febd7bf3d265e37004fa0db /src/System.Threading.Tasks.Parallel
parentd409227f1b7dae84ee697a7dd1e85001bc39baf0 (diff)
vertical build port to Dev/eng [Do not merge] (#14171)
* Vertical build changes * Build a vertical in dev/eng * remove repro.bat from check-in * Remove defaulttargetgroup from configurations.props files * Remove configurations.props from test libraries * Additional configuration files, updating traversal. * Add default configurations for ref projects * Remove default targetgroups, disable code analysis (currently breaking the vertical build). * Build vertical using Eric's changes to configurations * Minor fixes to build from a clean enlitment * Set targets properties in dir.props * Make vertical build the default * Include building src\tools in init-tools.cmd * Add linux init-tools * Fix msbuild.sh command * Add build tools message to Linux * Revert init-tools, investigate building corefx tools tomorrow * Update configurations, remove empty targetgroup from all projects, modify most conditionals to be positive conditions instead of negative * Remove unneccessary generateprojectconfigurations project * Build CoreFx.tools in init-tools * Can't build corefx.tools in init-tools because packages aren't restored * Hack build to build refs first * Slightly less hacky reference project build, but still kind of hacky... * Align properties for ref builds to prevent binclash and overbuilding * Update BeforeTarget for rename * Rework traversal to work with ref and corefx tools projects * Add target for builds projects * Fully qualify paths to projects * Fully quality path name for corefx.tools * testing removing osgroup from groovy on Windows * Remove OSGroup from config.json * revert change to groovy * return os property * Try changing osgroup to hostos * hack around osgroup setting * Fix passing groups * Add system.collections which was missing from system.console * Add some missing references for Unix build * Add references for unix * Unix support changes * Fix typo in system.net.http * Fix typo in system.threading.overlapped * no ref project available for system.reflection.metadata * Unix changes * Exclude system.memory * diagnostics.fileversioninfo was missing reference to Path * Unix changes * Fix reference name * Add reference for unix * Move source file to windows only * Disable building system.threading.overlapped
Diffstat (limited to 'src/System.Threading.Tasks.Parallel')
-rw-r--r--src/System.Threading.Tasks.Parallel/src/Configurations.props8
-rw-r--r--src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj9
2 files changed, 11 insertions, 6 deletions
diff --git a/src/System.Threading.Tasks.Parallel/src/Configurations.props b/src/System.Threading.Tasks.Parallel/src/Configurations.props
new file mode 100644
index 0000000000..f0ebe53119
--- /dev/null
+++ b/src/System.Threading.Tasks.Parallel/src/Configurations.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <BuildConfigurations>
+ netstandard1.3;
+ </BuildConfigurations>
+ </PropertyGroup>
+</Project>
diff --git a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
index 29e9f8f1be..3fdf0426ed 100644
--- a/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
+++ b/src/System.Threading.Tasks.Parallel/src/System.Threading.Tasks.Parallel.csproj
@@ -8,16 +8,13 @@
<FileAlignment>512</FileAlignment>
<DefineConstants>$(DefineConstants);CONCURRENT_COLLECTIONS;FEATURE_TRACING</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <IsPartialFacadeAssembly Condition="'$(TargetGroup)' == 'net46'">true</IsPartialFacadeAssembly>
- <ResourcesSourceOutputDirectory Condition="'$(TargetGroup)' == 'net46'">None</ResourcesSourceOutputDirectory>
- <NuGetTargetMoniker Condition="'$(TargetGroup)' == ''">.NETStandard,Version=v1.3</NuGetTargetMoniker>
- <PackageTargetFramework Condition="'$(TargetGroup)' == ''">netstandard1.3;netcore50</PackageTargetFramework>
+ <PackageTargetFramework>netstandard1.3;netcore50</PackageTargetFramework>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'net46_Release|AnyCPU'" />
- <ItemGroup Condition="'$(TargetGroup)' != 'net46'">
+ <ItemGroup>
<Compile Include="System\Threading\PlatformHelper.cs" />
<Compile Include="System\Threading\Tasks\Box.cs" />
<Compile Include="System\Threading\Tasks\Parallel.cs" />
@@ -26,7 +23,7 @@
<Compile Include="System\Threading\Tasks\ParallelRangeManager.cs" />
<Compile Include="System\Threading\Tasks\TaskReplicator.cs" />
</ItemGroup>
- <ItemGroup Condition="'$(TargetGroup)' == 'net46'">
+ <ItemGroup>
<TargetingPackReference Include="mscorlib" />
</ItemGroup>
<ItemGroup>