Merge pull request #946 from akoeplinger/fix-mono-parallel
authorRodrigo Kumpera <kumpera@gmail.com>
Thu, 19 Jun 2014 15:46:06 +0000 (11:46 -0400)
committerRodrigo Kumpera <kumpera@gmail.com>
Thu, 19 Jun 2014 15:46:06 +0000 (11:46 -0400)
[Mono.Parallel] Removed broken Mono.Threading.Tasks code

1  2 
mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj

index 89a4d5fddf61a5986ee1e36ba759e55fc829d3bc,247abf941d3f9d1681990dafbe18cdd1af32c97e..e423ebce5a57b22237d7df74fb40f6c3a06cd1f1
@@@ -19,7 -19,6 +19,7 @@@
      <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
      <FileAlignment>512</FileAlignment>\r
    </PropertyGroup>\r
 +  \r
    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
      <DebugSymbols>true</DebugSymbols>\r
      <DebugType>full</DebugType>\r
      <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />\r
      <Compile Include="Assembly\AssemblyInfo.cs" />\r
      <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />\r
-     <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />\r
-     <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />\r
-     <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />\r
-     <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />\r
      <Compile Include="Mono.Threading\CSnzi.cs" />\r
      <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />\r
      <Compile Include="Mono.Threading\Snzi.cs" />\r
    </Target>\r
    -->\r
    <PropertyGroup>\r
 -    <PreBuildEvent>\r
 +    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 +
 +    </PreBuildEvent>
 +    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
 +
 +    </PreBuildEvent>
  \r
 -    </PreBuildEvent>\r
      <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
  
      </PostBuildEvent>
      </PostBuildEvent>\r
    </PropertyGroup>\r
    <ItemGroup>\r
 -    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
 +    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
        <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
 -      <Name>corlib\corlib-net_4_5</Name>\r
 +      <Name>corlib-net_4_5</Name>\r
      </ProjectReference>\r
 -    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
 +    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
        <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
 -      <Name>System.Core\System.Core-net_4_5</Name>\r
 +      <Name>System.Core-net_4_5</Name>\r
      </ProjectReference>\r
 -    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
 -      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>\r
 -      <Name>System\System-net_4_5-2</Name>\r
 +    <ProjectReference Include="../System/System-net_4_5.csproj">\r
 +      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
 +      <Name>System-net_4_5</Name>\r
      </ProjectReference>\r
    </ItemGroup>\r
    <ItemGroup>\r