Update csproj files

6 files changed, 573 insertions, 585 deletions

diff --git a/mcs/class/Npgsql/Npgsql-net_2_0.csproj b/mcs/class/Npgsql/Npgsql-net_2_0.csproj
index 1b7d0d0db22..7a356511a62 100644
--- a/mcs/class/Npgsql/Npgsql-net_2_0.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{5A0C235B-308A-4C44-B428-119CB4B0E891}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql</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</NoWarn>

@@ -28,78 +27,79 @@
     <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</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="Npgsql\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="Npgsql\HashAlgorithm.cs" />
-   <Compile Include="Npgsql\MD5.cs" />
-   <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />
-   <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />
-   <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />
-   <Compile Include="Npgsql\NpgsqlBind.cs" />
-   <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />
-   <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />
-   <Compile Include="Npgsql\NpgsqlClosedState.cs" />
-   <Compile Include="Npgsql\NpgsqlCommand.cs" />
-   <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectedState.cs" />
-   <Compile Include="Npgsql\NpgsqlConnection.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionString.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnector.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />
-   <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />
-   <Compile Include="Npgsql\NpgsqlDataReader.cs" />
-   <Compile Include="Npgsql\NpgsqlDescribe.cs" />
-   <Compile Include="Npgsql\NpgsqlError.cs" />
-   <Compile Include="Npgsql\NpgsqlEventLog.cs" />
-   <Compile Include="Npgsql\NpgsqlException.cs" />
-   <Compile Include="Npgsql\NpgsqlExecute.cs" />
-   <Compile Include="Npgsql\NpgsqlFactory.cs" />
-   <Compile Include="Npgsql\NpgsqlFlush.cs" />
-   <Compile Include="Npgsql\NpgsqlMediator.cs" />
-   <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />
-   <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />
-   <Compile Include="Npgsql\NpgsqlParameter.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />
-   <Compile Include="Npgsql\NpgsqlParse.cs" />
-   <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlQuery.cs" />
-   <Compile Include="Npgsql\NpgsqlReadyState.cs" />
-   <Compile Include="Npgsql\NpgsqlResultSet.cs" />
-   <Compile Include="Npgsql\NpgsqlRow.cs" />
-   <Compile Include="Npgsql\NpgsqlRowDescription.cs" />
-   <Compile Include="Npgsql\NpgsqlSchema.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupState.cs" />
-   <Compile Include="Npgsql\NpgsqlState.cs" />
-   <Compile Include="Npgsql\NpgsqlSync.cs" />
-   <Compile Include="Npgsql\NpgsqlTransaction.cs" />
-   <Compile Include="Npgsql\PGUtil.cs" />
-   <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />
-   <Compile Include="NpgsqlTypes\FastPath.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />
-   <Compile Include="NpgsqlTypes\FastPathArg.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />
-   <Compile Include="NpgsqlTypes\LargeObject.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

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

+    <Compile Include="Npgsql\HashAlgorithm.cs" />

+    <Compile Include="Npgsql\MD5.cs" />

+    <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />

+    <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />

+    <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBind.cs" />

+    <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />

+    <Compile Include="Npgsql\NpgsqlClosedState.cs" />

+    <Compile Include="Npgsql\NpgsqlCommand.cs" />

+    <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectedState.cs" />

+    <Compile Include="Npgsql\NpgsqlConnection.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionString.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnector.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />

+    <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />

+    <Compile Include="Npgsql\NpgsqlDataReader.cs" />

+    <Compile Include="Npgsql\NpgsqlDescribe.cs" />

+    <Compile Include="Npgsql\NpgsqlError.cs" />

+    <Compile Include="Npgsql\NpgsqlEventLog.cs" />

+    <Compile Include="Npgsql\NpgsqlException.cs" />

+    <Compile Include="Npgsql\NpgsqlExecute.cs" />

+    <Compile Include="Npgsql\NpgsqlFactory.cs" />

+    <Compile Include="Npgsql\NpgsqlFlush.cs" />

+    <Compile Include="Npgsql\NpgsqlMediator.cs" />

+    <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />

+    <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />

+    <Compile Include="Npgsql\NpgsqlParameter.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />

+    <Compile Include="Npgsql\NpgsqlParse.cs" />

+    <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlQuery.cs" />

+    <Compile Include="Npgsql\NpgsqlReadyState.cs" />

+    <Compile Include="Npgsql\NpgsqlResultSet.cs" />

+    <Compile Include="Npgsql\NpgsqlRow.cs" />

+    <Compile Include="Npgsql\NpgsqlRowDescription.cs" />

+    <Compile Include="Npgsql\NpgsqlSchema.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupState.cs" />

+    <Compile Include="Npgsql\NpgsqlState.cs" />

+    <Compile Include="Npgsql\NpgsqlSync.cs" />

+    <Compile Include="Npgsql\NpgsqlTransaction.cs" />

+    <Compile Include="Npgsql\PGUtil.cs" />

+    <Compile Include="NpgsqlTypes\FastPath.cs" />

+    <Compile Include="NpgsqlTypes\FastPathArg.cs" />

+    <Compile Include="NpgsqlTypes\LargeObject.cs" />

+    <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.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">

@@ -108,85 +108,83 @@
   </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>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Security.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Mono.Security.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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">

+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>

+      <Name>System.XML\System.Xml-net_2_0-1</Name>

+    </ProjectReference>

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

+      <Project>{0997C3B6-4B4C-4195-BBB6-DC61091676A3}</Project>

+      <Name>System.Data\System.Data-net_2_0</Name>

+    </ProjectReference>

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

+      <Project>{E5255877-877B-415F-BA9C-42048731B7C2}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">
-       <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">
-       <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">
-       <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">
-       <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">
-       <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">
-       <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">
-       <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">
-       <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">
-       <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">
-       <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">
-       <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">
-       <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/PGUtil.resources">
-       <LogicalName>Npgsql.PGUtil.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">
-       <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">
-       <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">

+      <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">

+      <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">

+      <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">

+      <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">

+      <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">

+      <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">

+      <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">

+      <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">

+      <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">

+      <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">

+      <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">

+      <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/PGUtil.resources">

+      <LogicalName>Npgsql.PGUtil.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">

+      <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">

+      <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Npgsql/Npgsql-net_4_0.csproj b/mcs/class/Npgsql/Npgsql-net_4_0.csproj
index dcc662c65cc..db20c88e46d 100644
--- a/mcs/class/Npgsql/Npgsql-net_4_0.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{AA2EC83B-36E7-4E5D-B8BE-E89B21EB175D}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql</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</NoWarn>

@@ -28,78 +27,79 @@
     <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</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="Npgsql\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="Npgsql\HashAlgorithm.cs" />
-   <Compile Include="Npgsql\MD5.cs" />
-   <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />
-   <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />
-   <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />
-   <Compile Include="Npgsql\NpgsqlBind.cs" />
-   <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />
-   <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />
-   <Compile Include="Npgsql\NpgsqlClosedState.cs" />
-   <Compile Include="Npgsql\NpgsqlCommand.cs" />
-   <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectedState.cs" />
-   <Compile Include="Npgsql\NpgsqlConnection.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionString.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnector.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />
-   <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />
-   <Compile Include="Npgsql\NpgsqlDataReader.cs" />
-   <Compile Include="Npgsql\NpgsqlDescribe.cs" />
-   <Compile Include="Npgsql\NpgsqlError.cs" />
-   <Compile Include="Npgsql\NpgsqlEventLog.cs" />
-   <Compile Include="Npgsql\NpgsqlException.cs" />
-   <Compile Include="Npgsql\NpgsqlExecute.cs" />
-   <Compile Include="Npgsql\NpgsqlFactory.cs" />
-   <Compile Include="Npgsql\NpgsqlFlush.cs" />
-   <Compile Include="Npgsql\NpgsqlMediator.cs" />
-   <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />
-   <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />
-   <Compile Include="Npgsql\NpgsqlParameter.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />
-   <Compile Include="Npgsql\NpgsqlParse.cs" />
-   <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlQuery.cs" />
-   <Compile Include="Npgsql\NpgsqlReadyState.cs" />
-   <Compile Include="Npgsql\NpgsqlResultSet.cs" />
-   <Compile Include="Npgsql\NpgsqlRow.cs" />
-   <Compile Include="Npgsql\NpgsqlRowDescription.cs" />
-   <Compile Include="Npgsql\NpgsqlSchema.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupState.cs" />
-   <Compile Include="Npgsql\NpgsqlState.cs" />
-   <Compile Include="Npgsql\NpgsqlSync.cs" />
-   <Compile Include="Npgsql\NpgsqlTransaction.cs" />
-   <Compile Include="Npgsql\PGUtil.cs" />
-   <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />
-   <Compile Include="NpgsqlTypes\FastPath.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />
-   <Compile Include="NpgsqlTypes\FastPathArg.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />
-   <Compile Include="NpgsqlTypes\LargeObject.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

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

+    <Compile Include="Npgsql\HashAlgorithm.cs" />

+    <Compile Include="Npgsql\MD5.cs" />

+    <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />

+    <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />

+    <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBind.cs" />

+    <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />

+    <Compile Include="Npgsql\NpgsqlClosedState.cs" />

+    <Compile Include="Npgsql\NpgsqlCommand.cs" />

+    <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectedState.cs" />

+    <Compile Include="Npgsql\NpgsqlConnection.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionString.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnector.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />

+    <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />

+    <Compile Include="Npgsql\NpgsqlDataReader.cs" />

+    <Compile Include="Npgsql\NpgsqlDescribe.cs" />

+    <Compile Include="Npgsql\NpgsqlError.cs" />

+    <Compile Include="Npgsql\NpgsqlEventLog.cs" />

+    <Compile Include="Npgsql\NpgsqlException.cs" />

+    <Compile Include="Npgsql\NpgsqlExecute.cs" />

+    <Compile Include="Npgsql\NpgsqlFactory.cs" />

+    <Compile Include="Npgsql\NpgsqlFlush.cs" />

+    <Compile Include="Npgsql\NpgsqlMediator.cs" />

+    <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />

+    <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />

+    <Compile Include="Npgsql\NpgsqlParameter.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />

+    <Compile Include="Npgsql\NpgsqlParse.cs" />

+    <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlQuery.cs" />

+    <Compile Include="Npgsql\NpgsqlReadyState.cs" />

+    <Compile Include="Npgsql\NpgsqlResultSet.cs" />

+    <Compile Include="Npgsql\NpgsqlRow.cs" />

+    <Compile Include="Npgsql\NpgsqlRowDescription.cs" />

+    <Compile Include="Npgsql\NpgsqlSchema.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupState.cs" />

+    <Compile Include="Npgsql\NpgsqlState.cs" />

+    <Compile Include="Npgsql\NpgsqlSync.cs" />

+    <Compile Include="Npgsql\NpgsqlTransaction.cs" />

+    <Compile Include="Npgsql\PGUtil.cs" />

+    <Compile Include="NpgsqlTypes\FastPath.cs" />

+    <Compile Include="NpgsqlTypes\FastPathArg.cs" />

+    <Compile Include="NpgsqlTypes\LargeObject.cs" />

+    <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.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">

@@ -108,85 +108,83 @@
   </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>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Security.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Mono.Security.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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">

+      <Project>{A1A09F77-428E-4B5F-9C0C-3B07F55909A6}</Project>

+      <Name>System.XML\System.Xml-net_4_0-1</Name>

+    </ProjectReference>

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

+      <Project>{E49EEDDE-15CB-4200-9E7E-281199089670}</Project>

+      <Name>System.Data\System.Data-net_4_0</Name>

+    </ProjectReference>

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

+      <Project>{5360F8A5-5E08-4CF9-9DDA-FDCAD3F73E5C}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">
-       <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">
-       <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">
-       <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">
-       <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">
-       <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">
-       <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">
-       <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">
-       <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">
-       <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">
-       <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">
-       <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">
-       <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/PGUtil.resources">
-       <LogicalName>Npgsql.PGUtil.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">
-       <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">
-       <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">

+      <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">

+      <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">

+      <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">

+      <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">

+      <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">

+      <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">

+      <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">

+      <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">

+      <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">

+      <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">

+      <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">

+      <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/PGUtil.resources">

+      <LogicalName>Npgsql.PGUtil.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">

+      <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">

+      <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Npgsql/Npgsql-net_4_5.csproj b/mcs/class/Npgsql/Npgsql-net_4_5.csproj
index 612e4f8d8d4..53e1750ca86 100644
--- a/mcs/class/Npgsql/Npgsql-net_4_5.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{90E8FBAC-FACA-4713-8CE1-A1B345356212}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql</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</NoWarn>

@@ -28,78 +27,79 @@
     <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</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="Npgsql\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="Npgsql\HashAlgorithm.cs" />
-   <Compile Include="Npgsql\MD5.cs" />
-   <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />
-   <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />
-   <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />
-   <Compile Include="Npgsql\NpgsqlBind.cs" />
-   <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />
-   <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />
-   <Compile Include="Npgsql\NpgsqlClosedState.cs" />
-   <Compile Include="Npgsql\NpgsqlCommand.cs" />
-   <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectedState.cs" />
-   <Compile Include="Npgsql\NpgsqlConnection.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionString.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />
-   <Compile Include="Npgsql\NpgsqlConnector.cs" />
-   <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />
-   <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />
-   <Compile Include="Npgsql\NpgsqlDataReader.cs" />
-   <Compile Include="Npgsql\NpgsqlDescribe.cs" />
-   <Compile Include="Npgsql\NpgsqlError.cs" />
-   <Compile Include="Npgsql\NpgsqlEventLog.cs" />
-   <Compile Include="Npgsql\NpgsqlException.cs" />
-   <Compile Include="Npgsql\NpgsqlExecute.cs" />
-   <Compile Include="Npgsql\NpgsqlFactory.cs" />
-   <Compile Include="Npgsql\NpgsqlFlush.cs" />
-   <Compile Include="Npgsql\NpgsqlMediator.cs" />
-   <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />
-   <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />
-   <Compile Include="Npgsql\NpgsqlParameter.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />
-   <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />
-   <Compile Include="Npgsql\NpgsqlParse.cs" />
-   <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlQuery.cs" />
-   <Compile Include="Npgsql\NpgsqlReadyState.cs" />
-   <Compile Include="Npgsql\NpgsqlResultSet.cs" />
-   <Compile Include="Npgsql\NpgsqlRow.cs" />
-   <Compile Include="Npgsql\NpgsqlRowDescription.cs" />
-   <Compile Include="Npgsql\NpgsqlSchema.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />
-   <Compile Include="Npgsql\NpgsqlStartupState.cs" />
-   <Compile Include="Npgsql\NpgsqlState.cs" />
-   <Compile Include="Npgsql\NpgsqlSync.cs" />
-   <Compile Include="Npgsql\NpgsqlTransaction.cs" />
-   <Compile Include="Npgsql\PGUtil.cs" />
-   <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />
-   <Compile Include="NpgsqlTypes\FastPath.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />
-   <Compile Include="NpgsqlTypes\FastPathArg.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />
-   <Compile Include="NpgsqlTypes\LargeObject.cs" />
-   <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.cs" />
-

-  </ItemGroup>

+    <Compile Include="..\..\build\common\Consts.cs" />

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

+    <Compile Include="Npgsql\HashAlgorithm.cs" />

+    <Compile Include="Npgsql\MD5.cs" />

+    <Compile Include="Npgsql\MD5CryptoServiceProvider.cs" />

+    <Compile Include="Npgsql\NpgsqlAsciiRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBackEndKeyData.cs" />

+    <Compile Include="Npgsql\NpgsqlBinaryRow.cs" />

+    <Compile Include="Npgsql\NpgsqlBind.cs" />

+    <Compile Include="Npgsql\NpgsqlCancelRequest.cs" />

+    <Compile Include="Npgsql\NpgsqlClosedState.cs" />

+    <Compile Include="Npgsql\NpgsqlCommand.cs" />

+    <Compile Include="Npgsql\NpgsqlCommandBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectedState.cs" />

+    <Compile Include="Npgsql\NpgsqlConnection.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionString.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectionStringBuilder.cs" />

+    <Compile Include="Npgsql\NpgsqlConnector.cs" />

+    <Compile Include="Npgsql\NpgsqlConnectorPool.cs" />

+    <Compile Include="Npgsql\NpgsqlDataAdapter.cs" />

+    <Compile Include="Npgsql\NpgsqlDataReader.cs" />

+    <Compile Include="Npgsql\NpgsqlDescribe.cs" />

+    <Compile Include="Npgsql\NpgsqlError.cs" />

+    <Compile Include="Npgsql\NpgsqlEventLog.cs" />

+    <Compile Include="Npgsql\NpgsqlException.cs" />

+    <Compile Include="Npgsql\NpgsqlExecute.cs" />

+    <Compile Include="Npgsql\NpgsqlFactory.cs" />

+    <Compile Include="Npgsql\NpgsqlFlush.cs" />

+    <Compile Include="Npgsql\NpgsqlMediator.cs" />

+    <Compile Include="Npgsql\NpgsqlMessageTypes.cs" />

+    <Compile Include="Npgsql\NpgsqlNotificationEventArgs.cs" />

+    <Compile Include="Npgsql\NpgsqlParameter.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterCollection.cs" />

+    <Compile Include="Npgsql\NpgsqlParameterStatus.cs" />

+    <Compile Include="Npgsql\NpgsqlParse.cs" />

+    <Compile Include="Npgsql\NpgsqlPasswordPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlQuery.cs" />

+    <Compile Include="Npgsql\NpgsqlReadyState.cs" />

+    <Compile Include="Npgsql\NpgsqlResultSet.cs" />

+    <Compile Include="Npgsql\NpgsqlRow.cs" />

+    <Compile Include="Npgsql\NpgsqlRowDescription.cs" />

+    <Compile Include="Npgsql\NpgsqlSchema.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupPacket.cs" />

+    <Compile Include="Npgsql\NpgsqlStartupState.cs" />

+    <Compile Include="Npgsql\NpgsqlState.cs" />

+    <Compile Include="Npgsql\NpgsqlSync.cs" />

+    <Compile Include="Npgsql\NpgsqlTransaction.cs" />

+    <Compile Include="Npgsql\PGUtil.cs" />

+    <Compile Include="NpgsqlTypes\FastPath.cs" />

+    <Compile Include="NpgsqlTypes\FastPathArg.cs" />

+    <Compile Include="NpgsqlTypes\LargeObject.cs" />

+    <Compile Include="NpgsqlTypes\LargeObjectManager.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlDbType.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypeConverters.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypes.cs" />

+    <Compile Include="NpgsqlTypes\NpgsqlTypesHelper.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">

@@ -108,85 +108,83 @@
   </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>
-    <Reference Include="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Security.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Mono.Security.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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">

+      <Project>{AB0D8551-2D53-46F2-A340-789E7B62BF57}</Project>

+      <Name>System.XML\System.Xml-net_4_5-1</Name>

+    </ProjectReference>

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

+      <Project>{AE8FAE27-D070-4533-A135-49EEF160779D}</Project>

+      <Name>System.Data\System.Data-net_4_5</Name>

+    </ProjectReference>

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

+      <Project>{87898516-17A7-43D4-8385-B45BAEB59B22}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">
-       <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">
-       <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">
-       <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">
-       <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">
-       <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">
-       <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">
-       <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">
-       <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">
-       <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">
-       <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">
-       <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">
-       <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/PGUtil.resources">
-       <LogicalName>Npgsql.PGUtil.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">
-       <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>
-    </EmbeddedResource>
-    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">
-       <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="Npgsql/NpgsqlState.resources">

+      <LogicalName>Npgsql.NpgsqlState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlClosedState.resources">

+      <LogicalName>Npgsql.NpgsqlClosedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameterCollection.resources">

+      <LogicalName>Npgsql.NpgsqlParameterCollection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlParameter.resources">

+      <LogicalName>Npgsql.NpgsqlParameter.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommand.resources">

+      <LogicalName>Npgsql.NpgsqlCommand.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlCommandBuilder.resources">

+      <LogicalName>Npgsql.NpgsqlCommandBuilder.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectedState.resources">

+      <LogicalName>Npgsql.NpgsqlConnectedState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnection.resources">

+      <LogicalName>Npgsql.NpgsqlConnection.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlReadyState.resources">

+      <LogicalName>Npgsql.NpgsqlReadyState.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlTransaction.resources">

+      <LogicalName>Npgsql.NpgsqlTransaction.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlEventLog.resources">

+      <LogicalName>Npgsql.NpgsqlEventLog.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlException.resources">

+      <LogicalName>Npgsql.NpgsqlException.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/PGUtil.resources">

+      <LogicalName>Npgsql.PGUtil.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="Npgsql/NpgsqlConnectionString.resources">

+      <LogicalName>Npgsql.NpgsqlConnectionString.resources</LogicalName>

+    </EmbeddedResource>

+    <EmbeddedResource Include="NpgsqlTypes/NpgsqlTypesHelper.resources">

+      <LogicalName>NpgsqlTypes.NpgsqlTypesHelper.resources</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj b/mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj
index 42987bc2b51..0672eb2e3a5 100644
--- a/mcs/class/Npgsql/Npgsql-tests-net_2_0.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{186EF80C-F011-41D0-9663-1E31ACEC1F76}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-tests-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql_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,618,219,169</NoWarn>

@@ -28,27 +27,28 @@
     <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,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\CommandTests.cs" />
-   <Compile Include="Test\ConnectionTests.cs" />
-   <Compile Include="Test\DataAdapterTests.cs" />
-   <Compile Include="Test\DataReaderTests.cs" />
-   <Compile Include="Test\TestConfiguration.cs" />
-

-  </ItemGroup>

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

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

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

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

+    <Compile Include="Test\TestConfiguration.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">

@@ -57,43 +57,41 @@
   </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/Npgsql.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_2_0/Npgsql.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="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.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="..\Npgsql\Npgsql-net_2_0.csproj">

+      <Project>{5A0C235B-308A-4C44-B428-119CB4B0E891}</Project>

+      <Name>Npgsql\Npgsql-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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">

+      <Project>{A892207C-64E0-4FCA-8541-A3C71099AA13}</Project>

+      <Name>System.XML\System.Xml-net_2_0-1</Name>

+    </ProjectReference>

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

+      <Project>{71F684E5-42A8-437A-9C88-A90B2B6D4C26}</Project>

+      <Name>System.Web\System.Web-net_2_0-1</Name>

+    </ProjectReference>

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

+      <Project>{0997C3B6-4B4C-4195-BBB6-DC61091676A3}</Project>

+      <Name>System.Data\System.Data-net_2_0</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj b/mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj
index ac1435de124..bdea4611145 100644
--- a/mcs/class/Npgsql/Npgsql-tests-net_4_0.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{BA996523-68EF-448F-9EFF-0AEE07D23444}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-tests-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql_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,618,219,169</NoWarn>

@@ -28,27 +27,28 @@
     <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,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\CommandTests.cs" />
-   <Compile Include="Test\ConnectionTests.cs" />
-   <Compile Include="Test\DataAdapterTests.cs" />
-   <Compile Include="Test\DataReaderTests.cs" />
-   <Compile Include="Test\TestConfiguration.cs" />
-

-  </ItemGroup>

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

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

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

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

+    <Compile Include="Test\TestConfiguration.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">

@@ -57,43 +57,41 @@
   </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/Npgsql.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Npgsql.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="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.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="..\Npgsql\Npgsql-net_4_0.csproj">

+      <Project>{AA2EC83B-36E7-4E5D-B8BE-E89B21EB175D}</Project>

+      <Name>Npgsql\Npgsql-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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">

+      <Project>{A1A09F77-428E-4B5F-9C0C-3B07F55909A6}</Project>

+      <Name>System.XML\System.Xml-net_4_0-1</Name>

+    </ProjectReference>

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

+      <Project>{B7FD6CBD-908F-4492-93B2-6D57FBFD7F6A}</Project>

+      <Name>System.Web\System.Web-net_4_0-1</Name>

+    </ProjectReference>

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

+      <Project>{E49EEDDE-15CB-4200-9E7E-281199089670}</Project>

+      <Name>System.Data\System.Data-net_4_0</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/Npgsql/Npgsql-tests-net_4_5.csproj b/mcs/class/Npgsql/Npgsql-tests-net_4_5.csproj
index 5791b9da9c9..5739bdff8f4 100644
--- a/mcs/class/Npgsql/Npgsql-tests-net_4_5.csproj
+++ b/mcs/class/Npgsql/Npgsql-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>{1A0D605B-7FE7-4AAB-BA83-871A3553B5C7}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699,618,219,169</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Npgsql-tests-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Npgsql_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,618,219,169</NoWarn>

@@ -28,27 +27,28 @@
     <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,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\CommandTests.cs" />
-   <Compile Include="Test\ConnectionTests.cs" />
-   <Compile Include="Test\DataAdapterTests.cs" />
-   <Compile Include="Test\DataReaderTests.cs" />
-   <Compile Include="Test\TestConfiguration.cs" />
-

-  </ItemGroup>

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

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

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

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

+    <Compile Include="Test\TestConfiguration.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">

@@ -57,43 +57,41 @@
   </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/Npgsql.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/Npgsql.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="System.Xml.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Data.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="..\Npgsql\Npgsql-net_4_5.csproj">

+      <Project>{90E8FBAC-FACA-4713-8CE1-A1B345356212}</Project>

+      <Name>Npgsql\Npgsql-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>

+    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">

+      <Project>{AB0D8551-2D53-46F2-A340-789E7B62BF57}</Project>

+      <Name>System.XML\System.Xml-net_4_5-1</Name>

+    </ProjectReference>

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

+      <Project>{79C40DBB-A861-43E1-81BB-5C383B56A222}</Project>

+      <Name>System.Web\System.Web-net_4_5-1</Name>

+    </ProjectReference>

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

+      <Project>{AE8FAE27-D070-4533-A135-49EEF160779D}</Project>

+      <Name>System.Data\System.Data-net_4_5</Name>

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>