Update csproj files

6 files changed, 375 insertions, 387 deletions

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj
index a0f328d0627..650bd591b28 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_2_0.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{2EAF8F18-0B08-40D2-A40E-6BDAFB91A22F}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng</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,62 +27,63 @@
     <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="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Commons.Xml\XmlDefaultReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\Misc.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

+    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -92,35 +92,33 @@
   </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>
-

+    <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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj
index db476492b4b..920d6176ea5 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_0.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{A8117614-67B7-470D-BFF4-3B328BFEE8F5}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng</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,62 +27,63 @@
     <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="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Commons.Xml\XmlDefaultReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\Misc.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

+    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -92,35 +92,33 @@
   </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>
-

+    <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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj
index 79cc36e9f1f..946bdeabf60 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-net_4_5.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{B29E829F-C2C9-44C5-9303-BDF4FFEC4F81}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng</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,62 +27,63 @@
     <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="Assembly\AssemblyInfo.cs" />
-   <Compile Include="..\..\build\common\Consts.cs" />
-   <Compile Include="..\..\build\common\Locale.cs" />
-   <Compile Include="Commons.Xml\XmlDefaultReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\Misc.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />
-   <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

+    <Compile Include="Commons.Xml.Nvdl\NvdlBuiltInValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlCompileContext.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlConfig.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlException.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlFilteredXmlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlRelaxngSupport.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlSimplified.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlStructures.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidationProvider.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlValidator.cs" />

+    <Compile Include="Commons.Xml.Nvdl\NvdlXsdSupport.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpContentType.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpNameClasses.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpObjects.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\RdpPatterns.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Derivative\Util.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Inference\RelaxngInference.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncTokenizer.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncWriter.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\XmlChar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\Misc.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatype.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngDefaultDatatypes.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngException.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngGrammar.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngMergedProvider.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngNameClass.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPattern.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngPatternType.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />

+    <Compile Include="Commons.Xml\XmlDefaultReader.cs" />

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -92,35 +92,33 @@
   </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>
-

+    <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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj
index 949ad37d207..b234dc9bd8a 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_2_0.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{FD5189A0-35A8-4DF3-9B2F-B9E3ED623CCA}</ProjectGuid>

     <OutputType>Library</OutputType>

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

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_2_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng_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,30 +27,31 @@
     <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\RdpPatternTests.cs" />
-   <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />
-   <Compile Include="Test\RelaxngReaderTests.cs" />
-   <Compile Include="Test\RelaxngValidatingReaderTests.cs" />
-   <Compile Include="Test\XsdDatatypeTests.cs" />
-   <Compile Include="Test\RncTests.cs" />
-   <Compile Include="Test\NvdlValidatingReaderTests.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

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

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

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

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

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -60,40 +60,38 @@
   </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/Commons.Xml.Relaxng.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_2_0/Commons.Xml.Relaxng.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="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="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0.csproj">

+      <Project>{2EAF8F18-0B08-40D2-A40E-6BDAFB91A22F}</Project>

+      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj
index fe06fdda31f..04c144c40d7 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_0.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{93EBBAFA-0C82-4466-A1F5-4BB56CD8A657}</ProjectGuid>

     <OutputType>Library</OutputType>

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

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng_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,30 +27,31 @@
     <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\RdpPatternTests.cs" />
-   <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />
-   <Compile Include="Test\RelaxngReaderTests.cs" />
-   <Compile Include="Test\RelaxngValidatingReaderTests.cs" />
-   <Compile Include="Test\XsdDatatypeTests.cs" />
-   <Compile Include="Test\RncTests.cs" />
-   <Compile Include="Test\NvdlValidatingReaderTests.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

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

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

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

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

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -60,40 +60,38 @@
   </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/Commons.Xml.Relaxng.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/Commons.Xml.Relaxng.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="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="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0.csproj">

+      <Project>{A8117614-67B7-470D-BFF4-3B328BFEE8F5}</Project>

+      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>
diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj
index 9068b881a46..1b2e02e9988 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-tests-net_4_5.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng-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>{8DB1807A-41A5-4195-9414-77EAF0CC6387}</ProjectGuid>

     <OutputType>Library</OutputType>

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

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>Commons.Xml.Relaxng_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,30 +27,31 @@
     <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\RdpPatternTests.cs" />
-   <Compile Include="Test\RelaxngDatatypeProviderTests.cs" />
-   <Compile Include="Test\RelaxngReaderTests.cs" />
-   <Compile Include="Test\RelaxngValidatingReaderTests.cs" />
-   <Compile Include="Test\XsdDatatypeTests.cs" />
-   <Compile Include="Test\RncTests.cs" />
-   <Compile Include="Test\NvdlValidatingReaderTests.cs" />
-   <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
-

-  </ItemGroup>

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

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

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

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

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

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

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

+    <Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.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">

@@ -60,40 +60,38 @@
   </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/Commons.Xml.Relaxng.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/Commons.Xml.Relaxng.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="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="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_5.csproj">

+      <Project>{B29E829F-C2C9-44C5-9303-BDF4FFEC4F81}</Project>

+      <Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-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>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-    <ItemGroup>
-    <EmbeddedResource Include="resources/relaxng.rng">
-       <LogicalName>relaxng.rng</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-

-</Project>

-
+  <ItemGroup>

+    <EmbeddedResource Include="resources/relaxng.rng">

+      <LogicalName>relaxng.rng</LogicalName>

+    </EmbeddedResource>

+  </ItemGroup>

+</Project>