Merge pull request #946 from akoeplinger/fix-mono-parallel

[mono.git] / mcs / class / Mono.Parallel / Mono.Parallel-net_4_5.csproj

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
index 90e3b483f62fd22781e8c6da7ffff740de690570..e423ebce5a57b22237d7df74fb40f6c3a06cd1f1 100644 (file)
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
@@ -5,10 +5,10 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{686B27E2-8342-424A-95AE-85AA0D33CA10}</ProjectGuid>\r
+    <ProjectGuid>{CA0DDCCE-2190-4D9B-88D6-237682D21BC3}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\Mono.Parallel-net_4_5</OutputPath>\r
+    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
     <NoStdLib>True</NoStdLib>\r
     <NoConfig>True</NoConfig>\r
     \r
@@ -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
@@ -53,10 +54,6 @@
     <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
@@ -69,28 +66,36 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
 \r
-    </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D\r
-  </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
+      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Core\System.Core-net_4_5.csproj">\r
-      <Project>{BC9226DD-0D9F-4836-BA8B-87A3E6F06176}</Project>\r
-      <Name>System.Core\System.Core-net_4_5</Name>\r
+    <ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">\r
+      <Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
+      <Name>System.Core-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</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
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-</Project>
+</Project>\r
+