Update csproj files

6 files changed, 348 insertions, 360 deletions

diff --git a/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj b/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj
index 97bce2163e4..2e6bf0cef2f 100644
--- a/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-net_2_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{D0EFE7E8-EC4D-4BD2-A6BE-53591BB1FDBD}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

-    <OutputPath>./../../class/lib/net_2_0</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5</AssemblyName>

     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

@@ -28,55 +27,56 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="C5\hashing\HashTable.cs" />
-   <Compile Include="C5\hashing\HashBag.cs" />
-   <Compile Include="C5\hashing\HashDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeBag.cs" />
-   <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeSet.cs" />
-   <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
-   <Compile Include="C5\linkedlists\LinkedList.cs" />
-   <Compile Include="C5\heaps\IntervalHeap.cs" />
-   <Compile Include="C5\arrays\HashedArrayList.cs" />
-   <Compile Include="C5\arrays\SortedArray.cs" />
-   <Compile Include="C5\arrays\CircularQueue.cs" />
-   <Compile Include="C5\arrays\ArrayList.cs" />
-   <Compile Include="C5\MappedEnumerators.cs" />
-   <Compile Include="C5\Dictionaries.cs" />
-   <Compile Include="C5\Collections.cs" />
-   <Compile Include="C5\Random.cs" />
-   <Compile Include="C5\Exceptions.cs" />
-   <Compile Include="C5\Interfaces.cs" />
-   <Compile Include="C5\Sorting.cs" />
-   <Compile Include="C5\Attributes.cs" />
-   <Compile Include="C5\Enums.cs" />
-   <Compile Include="C5\AssemblyInfo.cs" />
-   <Compile Include="C5\Hashers.cs" />
-   <Compile Include="C5\Delegates.cs" />
-   <Compile Include="C5\Records.cs" />
-   <Compile Include="C5\WrappedArray.cs" />
-   <Compile Include="C5\Wrappers.cs" />
-   <Compile Include="C5\Events.cs" />
-   <Compile Include="C5\Builtin.cs" />
-   <Compile Include="C5\ViewSupport.cs" />
-   <Compile Include="C5\Comparer.cs" />
-   <Compile Include="C5\Formatting.cs" />
-

-  </ItemGroup>

+    <Compile Include="C5\arrays\ArrayList.cs" />

+    <Compile Include="C5\arrays\CircularQueue.cs" />

+    <Compile Include="C5\arrays\HashedArrayList.cs" />

+    <Compile Include="C5\arrays\SortedArray.cs" />

+    <Compile Include="C5\AssemblyInfo.cs" />

+    <Compile Include="C5\Attributes.cs" />

+    <Compile Include="C5\Builtin.cs" />

+    <Compile Include="C5\Collections.cs" />

+    <Compile Include="C5\Comparer.cs" />

+    <Compile Include="C5\Delegates.cs" />

+    <Compile Include="C5\Dictionaries.cs" />

+    <Compile Include="C5\Enums.cs" />

+    <Compile Include="C5\Events.cs" />

+    <Compile Include="C5\Exceptions.cs" />

+    <Compile Include="C5\Formatting.cs" />

+    <Compile Include="C5\Hashers.cs" />

+    <Compile Include="C5\hashing\HashBag.cs" />

+    <Compile Include="C5\hashing\HashDictionary.cs" />

+    <Compile Include="C5\hashing\HashTable.cs" />

+    <Compile Include="C5\heaps\IntervalHeap.cs" />

+    <Compile Include="C5\Interfaces.cs" />

+    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />

+    <Compile Include="C5\linkedlists\LinkedList.cs" />

+    <Compile Include="C5\MappedEnumerators.cs" />

+    <Compile Include="C5\Random.cs" />

+    <Compile Include="C5\Records.cs" />

+    <Compile Include="C5\Sorting.cs" />

+    <Compile Include="C5\trees\RedBlackTreeBag.cs" />

+    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />

+    <Compile Include="C5\trees\RedBlackTreeSet.cs" />

+    <Compile Include="C5\ViewSupport.cs" />

+    <Compile Include="C5\WrappedArray.cs" />

+    <Compile Include="C5\Wrappers.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -85,26 +85,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <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.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">

+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>

+      <Name>corlib\corlib-net_2_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_2_0-2.csproj">

+      <Project>{08A2FAB2-A213-451E-AD93-19B409BF1B5A}</Project>

+      <Name>System\System-net_2_0-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj
index ca3c108d9f8..78d50b46f66 100644
--- a/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-net_4_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{13FDF3E7-5E04-4B02-95B2-4E006D6B05B5}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

-    <OutputPath>./../../class/lib/net_4_0</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5</AssemblyName>

     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

@@ -28,55 +27,56 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="C5\hashing\HashTable.cs" />
-   <Compile Include="C5\hashing\HashBag.cs" />
-   <Compile Include="C5\hashing\HashDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeBag.cs" />
-   <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeSet.cs" />
-   <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
-   <Compile Include="C5\linkedlists\LinkedList.cs" />
-   <Compile Include="C5\heaps\IntervalHeap.cs" />
-   <Compile Include="C5\arrays\HashedArrayList.cs" />
-   <Compile Include="C5\arrays\SortedArray.cs" />
-   <Compile Include="C5\arrays\CircularQueue.cs" />
-   <Compile Include="C5\arrays\ArrayList.cs" />
-   <Compile Include="C5\MappedEnumerators.cs" />
-   <Compile Include="C5\Dictionaries.cs" />
-   <Compile Include="C5\Collections.cs" />
-   <Compile Include="C5\Random.cs" />
-   <Compile Include="C5\Exceptions.cs" />
-   <Compile Include="C5\Interfaces.cs" />
-   <Compile Include="C5\Sorting.cs" />
-   <Compile Include="C5\Attributes.cs" />
-   <Compile Include="C5\Enums.cs" />
-   <Compile Include="C5\AssemblyInfo.cs" />
-   <Compile Include="C5\Hashers.cs" />
-   <Compile Include="C5\Delegates.cs" />
-   <Compile Include="C5\Records.cs" />
-   <Compile Include="C5\WrappedArray.cs" />
-   <Compile Include="C5\Wrappers.cs" />
-   <Compile Include="C5\Events.cs" />
-   <Compile Include="C5\Builtin.cs" />
-   <Compile Include="C5\ViewSupport.cs" />
-   <Compile Include="C5\Comparer.cs" />
-   <Compile Include="C5\Formatting.cs" />
-

-  </ItemGroup>

+    <Compile Include="C5\arrays\ArrayList.cs" />

+    <Compile Include="C5\arrays\CircularQueue.cs" />

+    <Compile Include="C5\arrays\HashedArrayList.cs" />

+    <Compile Include="C5\arrays\SortedArray.cs" />

+    <Compile Include="C5\AssemblyInfo.cs" />

+    <Compile Include="C5\Attributes.cs" />

+    <Compile Include="C5\Builtin.cs" />

+    <Compile Include="C5\Collections.cs" />

+    <Compile Include="C5\Comparer.cs" />

+    <Compile Include="C5\Delegates.cs" />

+    <Compile Include="C5\Dictionaries.cs" />

+    <Compile Include="C5\Enums.cs" />

+    <Compile Include="C5\Events.cs" />

+    <Compile Include="C5\Exceptions.cs" />

+    <Compile Include="C5\Formatting.cs" />

+    <Compile Include="C5\Hashers.cs" />

+    <Compile Include="C5\hashing\HashBag.cs" />

+    <Compile Include="C5\hashing\HashDictionary.cs" />

+    <Compile Include="C5\hashing\HashTable.cs" />

+    <Compile Include="C5\heaps\IntervalHeap.cs" />

+    <Compile Include="C5\Interfaces.cs" />

+    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />

+    <Compile Include="C5\linkedlists\LinkedList.cs" />

+    <Compile Include="C5\MappedEnumerators.cs" />

+    <Compile Include="C5\Random.cs" />

+    <Compile Include="C5\Records.cs" />

+    <Compile Include="C5\Sorting.cs" />

+    <Compile Include="C5\trees\RedBlackTreeBag.cs" />

+    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />

+    <Compile Include="C5\trees\RedBlackTreeSet.cs" />

+    <Compile Include="C5\ViewSupport.cs" />

+    <Compile Include="C5\WrappedArray.cs" />

+    <Compile Include="C5\Wrappers.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -85,26 +85,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <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.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">

+      <Project>{280E1B59-BAAA-4E02-99CA-8070BCB2C72E}</Project>

+      <Name>corlib\corlib-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_4_0-2.csproj">

+      <Project>{C0648621-9C6E-4584-9CF6-70EBB2D60489}</Project>

+      <Name>System\System-net_4_0-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj b/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
index c74b7d49fe2..8f0db8e38b0 100644
--- a/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{922D820D-C582-4F06-B438-21F5B1CFCEA4}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

-    <OutputPath>./../../class/lib/net_4_5</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5</AssemblyName>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

@@ -28,55 +27,56 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="C5\hashing\HashTable.cs" />
-   <Compile Include="C5\hashing\HashBag.cs" />
-   <Compile Include="C5\hashing\HashDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeBag.cs" />
-   <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />
-   <Compile Include="C5\trees\RedBlackTreeSet.cs" />
-   <Compile Include="C5\linkedlists\HashedLinkedList.cs" />
-   <Compile Include="C5\linkedlists\LinkedList.cs" />
-   <Compile Include="C5\heaps\IntervalHeap.cs" />
-   <Compile Include="C5\arrays\HashedArrayList.cs" />
-   <Compile Include="C5\arrays\SortedArray.cs" />
-   <Compile Include="C5\arrays\CircularQueue.cs" />
-   <Compile Include="C5\arrays\ArrayList.cs" />
-   <Compile Include="C5\MappedEnumerators.cs" />
-   <Compile Include="C5\Dictionaries.cs" />
-   <Compile Include="C5\Collections.cs" />
-   <Compile Include="C5\Random.cs" />
-   <Compile Include="C5\Exceptions.cs" />
-   <Compile Include="C5\Interfaces.cs" />
-   <Compile Include="C5\Sorting.cs" />
-   <Compile Include="C5\Attributes.cs" />
-   <Compile Include="C5\Enums.cs" />
-   <Compile Include="C5\AssemblyInfo.cs" />
-   <Compile Include="C5\Hashers.cs" />
-   <Compile Include="C5\Delegates.cs" />
-   <Compile Include="C5\Records.cs" />
-   <Compile Include="C5\WrappedArray.cs" />
-   <Compile Include="C5\Wrappers.cs" />
-   <Compile Include="C5\Events.cs" />
-   <Compile Include="C5\Builtin.cs" />
-   <Compile Include="C5\ViewSupport.cs" />
-   <Compile Include="C5\Comparer.cs" />
-   <Compile Include="C5\Formatting.cs" />
-

-  </ItemGroup>

+    <Compile Include="C5\arrays\ArrayList.cs" />

+    <Compile Include="C5\arrays\CircularQueue.cs" />

+    <Compile Include="C5\arrays\HashedArrayList.cs" />

+    <Compile Include="C5\arrays\SortedArray.cs" />

+    <Compile Include="C5\AssemblyInfo.cs" />

+    <Compile Include="C5\Attributes.cs" />

+    <Compile Include="C5\Builtin.cs" />

+    <Compile Include="C5\Collections.cs" />

+    <Compile Include="C5\Comparer.cs" />

+    <Compile Include="C5\Delegates.cs" />

+    <Compile Include="C5\Dictionaries.cs" />

+    <Compile Include="C5\Enums.cs" />

+    <Compile Include="C5\Events.cs" />

+    <Compile Include="C5\Exceptions.cs" />

+    <Compile Include="C5\Formatting.cs" />

+    <Compile Include="C5\Hashers.cs" />

+    <Compile Include="C5\hashing\HashBag.cs" />

+    <Compile Include="C5\hashing\HashDictionary.cs" />

+    <Compile Include="C5\hashing\HashTable.cs" />

+    <Compile Include="C5\heaps\IntervalHeap.cs" />

+    <Compile Include="C5\Interfaces.cs" />

+    <Compile Include="C5\linkedlists\HashedLinkedList.cs" />

+    <Compile Include="C5\linkedlists\LinkedList.cs" />

+    <Compile Include="C5\MappedEnumerators.cs" />

+    <Compile Include="C5\Random.cs" />

+    <Compile Include="C5\Records.cs" />

+    <Compile Include="C5\Sorting.cs" />

+    <Compile Include="C5\trees\RedBlackTreeBag.cs" />

+    <Compile Include="C5\trees\RedBlackTreeDictionary.cs" />

+    <Compile Include="C5\trees\RedBlackTreeSet.cs" />

+    <Compile Include="C5\ViewSupport.cs" />

+    <Compile Include="C5\WrappedArray.cs" />

+    <Compile Include="C5\Wrappers.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -85,26 +85,24 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <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.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-

+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">

+      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>

+      <Name>corlib\corlib-net_4_5</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_4_5-2.csproj">

+      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</Project>

+      <Name>System\System-net_4_5-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj
index 338d8b1aabf..aa46efd6c81 100644
--- a/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-tests-net_2_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{B8403718-4179-4143-9B2D-D2CA03B9F347}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-tests-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5_test_net_2_0</AssemblyName>

     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

@@ -28,46 +27,47 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_2_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="Test\heaps\HeapTests.cs" />
-   <Compile Include="Test\arrays\HashedArrayListTest.cs" />
-   <Compile Include="Test\arrays\SortedArrayTests.cs" />
-   <Compile Include="Test\arrays\CircularQueueTest.cs" />
-   <Compile Include="Test\arrays\ArrayListTest.cs" />
-   <Compile Include="Test\hashing\HashDictionaryTests.cs" />
-   <Compile Include="Test\hashing\HashTableTests.cs" />
-   <Compile Include="Test\hashing\HashBagTests.cs" />
-   <Compile Include="Test\trees\Dictionary.cs" />
-   <Compile Include="Test\trees\Bag.cs" />
-   <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />
-   <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />
-   <Compile Include="Test\linkedlists\LinkedListTest.cs" />
-   <Compile Include="Test\templates\Events.cs" />
-   <Compile Include="Test\templates\List.cs" />
-   <Compile Include="Test\templates\Clone.cs" />
-   <Compile Include="Test\templates\GenericCollectionTester.cs" />
-   <Compile Include="Test\SupportClasses.cs" />
-   <Compile Include="Test\AssemblyInfo.cs" />
-   <Compile Include="Test\BasesTest.cs" />
-   <Compile Include="Test\InterfacesTest.cs" />
-   <Compile Include="Test\Records.cs" />
-   <Compile Include="Test\WrappersTest.cs" />
-   <Compile Include="Test\Sorting.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\arrays\ArrayListTest.cs" />

+    <Compile Include="Test\arrays\CircularQueueTest.cs" />

+    <Compile Include="Test\arrays\HashedArrayListTest.cs" />

+    <Compile Include="Test\arrays\SortedArrayTests.cs" />

+    <Compile Include="Test\AssemblyInfo.cs" />

+    <Compile Include="Test\BasesTest.cs" />

+    <Compile Include="Test\hashing\HashBagTests.cs" />

+    <Compile Include="Test\hashing\HashDictionaryTests.cs" />

+    <Compile Include="Test\hashing\HashTableTests.cs" />

+    <Compile Include="Test\heaps\HeapTests.cs" />

+    <Compile Include="Test\InterfacesTest.cs" />

+    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />

+    <Compile Include="Test\linkedlists\LinkedListTest.cs" />

+    <Compile Include="Test\Records.cs" />

+    <Compile Include="Test\Sorting.cs" />

+    <Compile Include="Test\SupportClasses.cs" />

+    <Compile Include="Test\templates\Clone.cs" />

+    <Compile Include="Test\templates\Events.cs" />

+    <Compile Include="Test\templates\GenericCollectionTester.cs" />

+    <Compile Include="Test\templates\List.cs" />

+    <Compile Include="Test\trees\Bag.cs" />

+    <Compile Include="Test\trees\Dictionary.cs" />

+    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />

+    <Compile Include="Test\WrappersTest.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -76,31 +76,29 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_2_0/Mono.C5.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_2_0/Mono.C5.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-

+    <Reference Include="..\lib\net_2_0\nunit.framework.dll" />

+    <ProjectReference Include="..\corlib\corlib-net_2_0.csproj">

+      <Project>{537E3E02-B5DA-4E11-A9F9-5A54C99759B9}</Project>

+      <Name>corlib\corlib-net_2_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Mono.C5\Mono.C5-net_2_0.csproj">

+      <Project>{D0EFE7E8-EC4D-4BD2-A6BE-53591BB1FDBD}</Project>

+      <Name>Mono.C5\Mono.C5-net_2_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_2_0-2.csproj">

+      <Project>{08A2FAB2-A213-451E-AD93-19B409BF1B5A}</Project>

+      <Name>System\System-net_2_0-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj
index 0b99c55c927..36d8de7a089 100644
--- a/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-tests-net_4_0.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{716C93D1-5F9A-4A63-9430-E39CB7236825}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-tests-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5_test_net_4_0</AssemblyName>

     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

@@ -28,46 +27,47 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="Test\heaps\HeapTests.cs" />
-   <Compile Include="Test\arrays\HashedArrayListTest.cs" />
-   <Compile Include="Test\arrays\SortedArrayTests.cs" />
-   <Compile Include="Test\arrays\CircularQueueTest.cs" />
-   <Compile Include="Test\arrays\ArrayListTest.cs" />
-   <Compile Include="Test\hashing\HashDictionaryTests.cs" />
-   <Compile Include="Test\hashing\HashTableTests.cs" />
-   <Compile Include="Test\hashing\HashBagTests.cs" />
-   <Compile Include="Test\trees\Dictionary.cs" />
-   <Compile Include="Test\trees\Bag.cs" />
-   <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />
-   <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />
-   <Compile Include="Test\linkedlists\LinkedListTest.cs" />
-   <Compile Include="Test\templates\Events.cs" />
-   <Compile Include="Test\templates\List.cs" />
-   <Compile Include="Test\templates\Clone.cs" />
-   <Compile Include="Test\templates\GenericCollectionTester.cs" />
-   <Compile Include="Test\SupportClasses.cs" />
-   <Compile Include="Test\AssemblyInfo.cs" />
-   <Compile Include="Test\BasesTest.cs" />
-   <Compile Include="Test\InterfacesTest.cs" />
-   <Compile Include="Test\Records.cs" />
-   <Compile Include="Test\WrappersTest.cs" />
-   <Compile Include="Test\Sorting.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\arrays\ArrayListTest.cs" />

+    <Compile Include="Test\arrays\CircularQueueTest.cs" />

+    <Compile Include="Test\arrays\HashedArrayListTest.cs" />

+    <Compile Include="Test\arrays\SortedArrayTests.cs" />

+    <Compile Include="Test\AssemblyInfo.cs" />

+    <Compile Include="Test\BasesTest.cs" />

+    <Compile Include="Test\hashing\HashBagTests.cs" />

+    <Compile Include="Test\hashing\HashDictionaryTests.cs" />

+    <Compile Include="Test\hashing\HashTableTests.cs" />

+    <Compile Include="Test\heaps\HeapTests.cs" />

+    <Compile Include="Test\InterfacesTest.cs" />

+    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />

+    <Compile Include="Test\linkedlists\LinkedListTest.cs" />

+    <Compile Include="Test\Records.cs" />

+    <Compile Include="Test\Sorting.cs" />

+    <Compile Include="Test\SupportClasses.cs" />

+    <Compile Include="Test\templates\Clone.cs" />

+    <Compile Include="Test\templates\Events.cs" />

+    <Compile Include="Test\templates\GenericCollectionTester.cs" />

+    <Compile Include="Test\templates\List.cs" />

+    <Compile Include="Test\trees\Bag.cs" />

+    <Compile Include="Test\trees\Dictionary.cs" />

+    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />

+    <Compile Include="Test\WrappersTest.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -76,31 +76,29 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_4_0/Mono.C5.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Mono.C5.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-

+    <Reference Include="..\lib\net_4_0\nunit.framework.dll" />

+    <ProjectReference Include="..\corlib\corlib-net_4_0.csproj">

+      <Project>{280E1B59-BAAA-4E02-99CA-8070BCB2C72E}</Project>

+      <Name>corlib\corlib-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Mono.C5\Mono.C5-net_4_0.csproj">

+      <Project>{13FDF3E7-5E04-4B02-95B2-4E006D6B05B5}</Project>

+      <Name>Mono.C5\Mono.C5-net_4_0</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_4_0-2.csproj">

+      <Project>{C0648621-9C6E-4584-9CF6-70EBB2D60489}</Project>

+      <Name>System\System-net_4_0-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj b/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj
index c883b20ab53..7b3231d5131 100644
--- a/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj
+++ b/mcs/class/Mono.C5/Mono.C5-tests-net_4_5.csproj
@@ -5,22 +5,21 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

     <ProductVersion>9.0.30729</ProductVersion>

     <SchemaVersion>2.0</SchemaVersion>

-    <ProjectGuid>{155AEF28-C81F-405D-9072-9D52780E3E70}</ProjectGuid>

+    <ProjectGuid>{3A56CEDD-3840-4113-8E76-08DD36F6C470}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Mono.C5-tests-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Mono.C5_test_net_4_5</AssemblyName>

     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

     <FileAlignment>512</FileAlignment>

-    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->

-    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>

     <DebugSymbols>true</DebugSymbols>

     <DebugType>full</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

@@ -28,46 +27,47 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <PlatformTarget>AnyCPU</PlatformTarget>  

     <DebugType>pdbonly</DebugType>

     <NoWarn>1699,169,219,414,1030,3001,3005,3006,618,219,169</NoWarn>

     <Optimize>true</Optimize>

     <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>

     <ErrorReport>prompt</ErrorReport>

     <WarningLevel>4</WarningLevel>

-    <AdditionalLibPaths>./../../class/lib/net_4_5</AdditionalLibPaths>

+  </PropertyGroup>

+  <!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0, 

+  Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This

+  is a problem to compile the Mono mscorlib.dll -->

+  <PropertyGroup>

+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>

   </PropertyGroup>

   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup>

-   <Compile Include="Test\heaps\HeapTests.cs" />
-   <Compile Include="Test\arrays\HashedArrayListTest.cs" />
-   <Compile Include="Test\arrays\SortedArrayTests.cs" />
-   <Compile Include="Test\arrays\CircularQueueTest.cs" />
-   <Compile Include="Test\arrays\ArrayListTest.cs" />
-   <Compile Include="Test\hashing\HashDictionaryTests.cs" />
-   <Compile Include="Test\hashing\HashTableTests.cs" />
-   <Compile Include="Test\hashing\HashBagTests.cs" />
-   <Compile Include="Test\trees\Dictionary.cs" />
-   <Compile Include="Test\trees\Bag.cs" />
-   <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />
-   <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />
-   <Compile Include="Test\linkedlists\LinkedListTest.cs" />
-   <Compile Include="Test\templates\Events.cs" />
-   <Compile Include="Test\templates\List.cs" />
-   <Compile Include="Test\templates\Clone.cs" />
-   <Compile Include="Test\templates\GenericCollectionTester.cs" />
-   <Compile Include="Test\SupportClasses.cs" />
-   <Compile Include="Test\AssemblyInfo.cs" />
-   <Compile Include="Test\BasesTest.cs" />
-   <Compile Include="Test\InterfacesTest.cs" />
-   <Compile Include="Test\Records.cs" />
-   <Compile Include="Test\WrappersTest.cs" />
-   <Compile Include="Test\Sorting.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\arrays\ArrayListTest.cs" />

+    <Compile Include="Test\arrays\CircularQueueTest.cs" />

+    <Compile Include="Test\arrays\HashedArrayListTest.cs" />

+    <Compile Include="Test\arrays\SortedArrayTests.cs" />

+    <Compile Include="Test\AssemblyInfo.cs" />

+    <Compile Include="Test\BasesTest.cs" />

+    <Compile Include="Test\hashing\HashBagTests.cs" />

+    <Compile Include="Test\hashing\HashDictionaryTests.cs" />

+    <Compile Include="Test\hashing\HashTableTests.cs" />

+    <Compile Include="Test\heaps\HeapTests.cs" />

+    <Compile Include="Test\InterfacesTest.cs" />

+    <Compile Include="Test\linkedlists\HashedLinkedListTest.cs" />

+    <Compile Include="Test\linkedlists\LinkedListTest.cs" />

+    <Compile Include="Test\Records.cs" />

+    <Compile Include="Test\Sorting.cs" />

+    <Compile Include="Test\SupportClasses.cs" />

+    <Compile Include="Test\templates\Clone.cs" />

+    <Compile Include="Test\templates\Events.cs" />

+    <Compile Include="Test\templates\GenericCollectionTester.cs" />

+    <Compile Include="Test\templates\List.cs" />

+    <Compile Include="Test\trees\Bag.cs" />

+    <Compile Include="Test\trees\Dictionary.cs" />

+    <Compile Include="Test\trees\RedBlackTreeSetTests.cs" />

+    <Compile Include="Test\WrappersTest.cs" />
  </ItemGroup>

   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

        Other similar extension points exist, see Microsoft.Common.targets.

   <Target Name="BeforeBuild">

@@ -76,31 +76,29 @@
   </Target>

   -->

   <PropertyGroup>

-    <PreBuildEvent></PreBuildEvent>

+    <PreBuildEvent>

+

+    </PreBuildEvent>

+    <PostBuildEvent>

+      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D

+  </PostBuildEvent>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="./../../class/lib/net_4_5/Mono.C5.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/Mono.C5.dll</HintPath>
-    </Reference>
-    <Reference Include="mscorlib.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework" />
-

+    <Reference Include="..\lib\net_4_5\nunit.framework.dll" />

+    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">

+      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>

+      <Name>corlib\corlib-net_4_5</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\Mono.C5\Mono.C5-net_4_5.csproj">

+      <Project>{922D820D-C582-4F06-B438-21F5B1CFCEA4}</Project>

+      <Name>Mono.C5\Mono.C5-net_4_5</Name>

+    </ProjectReference>

+    <ProjectReference Include="..\System\System-net_4_5-2.csproj">

+      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</Project>

+      <Name>System\System-net_4_5-2</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>