Merge pull request #1685 from esdrubal/touint64

[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 e423ebce5a57b22237d7df74fb40f6c3a06cd1f1..f681f1ce902d768eab5beb5373dfc723b76bf999 100644 (file)
--- a/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel-net_4_5.csproj
@@ -25,7 +25,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_MONO_PARALLEL</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_MONO_PARALLEL</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +33,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_MONO_PARALLEL</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE;INSIDE_MONO_PARALLEL</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -48,12 +48,12 @@
     <Compile Include="..\..\build\common\Consts.cs" />\r
     <Compile Include="..\..\build\common\Locale.cs" />\r
     <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />\r
-    <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />\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\CyclicDeque.cs" />\r
+    <Compile Include="Mono.Threading.Tasks\IConcurrentDeque.cs" />\r
+    <Compile Include="Mono.Threading.Tasks\PopResult.cs" />\r
+    <Compile Include="Mono.Threading\AtomicBoolean.cs" />\r
     <Compile Include="Mono.Threading\CSnzi.cs" />\r
     <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />\r
     <Compile Include="Mono.Threading\Snzi.cs" />\r
@@ -66,18 +66,18 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PreBuildEvent>
-    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
-    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
 \r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
-
-    </PostBuildEvent>
-    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-
     </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r