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 41a0b6b0f5f10b1397bd8773e9e7451c2e5c1d88..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,18 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>\r
+    <ProjectGuid>{CA0DDCCE-2190-4D9B-88D6-237682D21BC3}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
     <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
-    <NoStdLib>true</NoStdLib>\r
+    <NoStdLib>True</NoStdLib>\r
+    <NoConfig>True</NoConfig>\r
     \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace></RootNamespace>\r
+    <RootNamespace>\r
+    </RootNamespace>\r
     <AssemblyName>Mono.Parallel</AssemblyName>\r
     <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
@@ -25,7 +28,6 @@
     <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
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
@@ -34,29 +36,28 @@
     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;INSIDE_MONO_PARALLEL</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>\r
+  </PropertyGroup>\r
+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, \r
+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This\r
+  is a problem to compile the Mono mscorlib.dll -->\r
+  <PropertyGroup>\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
   </PropertyGroup>\r
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
   <ItemGroup>\r
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Assembly\AssemblyInfo.cs" />
-   <Compile Include="Mono.Collections.Concurrent\ConcurrentSkipList.cs" />
-   <Compile Include="Mono.Threading\CSnzi.cs" />
-   <Compile Include="Mono.Threading\Snzi.cs" />
-   <Compile Include="Mono.Threading\SpinLockWrapper.cs" />
-   <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />
-   <Compile Include="..\corlib\System.Threading\AtomicBoolean.cs" />
-   <Compile Include="..\corlib\System.Collections.Concurrent\ConcurrentOrderedList.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\CyclicDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\IConcurrentDeque.cs" />
-   <Compile Include="..\corlib\System.Threading.Tasks\PopResult.cs" />
-   <Compile Include="Mono.Threading.Tasks\ThreadWorker.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskExtensions.cs" />
-   <Compile Include="Mono.Threading.Tasks\MonoTaskScheduler.cs" />
-   <Compile Include="Mono.Threading.Tasks\FixedTaskScheduler.cs" />
-\r
-  </ItemGroup>\r
+    <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\CSnzi.cs" />\r
+    <Compile Include="Mono.Threading\ReaderWriterLockSlimmer.cs" />\r
+    <Compile Include="Mono.Threading\Snzi.cs" />\r
+    <Compile Include="Mono.Threading\SpinLockWrapper.cs" />\r  </ItemGroup>\r
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
        Other similar extension points exist, see Microsoft.Common.targets.\r
   <Target Name="BeforeBuild">\r
@@ -65,30 +66,36 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent></PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PostBuildEvent>
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-        <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-\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>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>\r
+      <Name>System.Core-net_4_5</Name>\r
+    </ProjectReference>\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
-  \r
 </Project>\r