Update csproj files

4 files changed, 454 insertions, 446 deletions

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj
index 8191160098b..5970bb4375f 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_0.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-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>{486A449C-49EA-4590-8E0E-2D048D1D3E6A}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\System.ServiceModel.Discovery-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>System.ServiceModel.Discovery</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,120 +27,121 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_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;NET_3_5;NET_3_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="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />
-   <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.cs" />
-

-  </ItemGroup>

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

+    <Compile Include="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />

+    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.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">

@@ -150,46 +150,48 @@
   </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="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.Runtime.Serialization.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.ServiceModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Configuration.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Configuration.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.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">

+      <Project>{6AF038FE-CE6D-4D71-9CAB-21C211CE6A42}</Project>

+      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>

+    </ProjectReference>

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

+      <Project>{65872296-D61B-4B03-860E-61E0C1DCE8B0}</Project>

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

+    </ProjectReference>

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

+      <Project>{CC96F21E-C45E-4593-BC7F-8331B913E758}</Project>

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

+    </ProjectReference>

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

+      <Project>{688C7022-C205-4FFB-A413-9D8754BF2427}</Project>

+      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>

+    </ProjectReference>

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

+      <Project>{5D195206-1E4E-4454-9F97-185E27BE57BD}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj
index 1e99d78a012..3f659d82996 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-net_4_5.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-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>{591CC3E4-004C-4650-88DF-4582FDF7DBF6}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

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

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\System.ServiceModel.Discovery-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>True</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>System.ServiceModel.Discovery</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,120 +27,121 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</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;NET_3_5;NET_3_0</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="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />
-   <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />
-   <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />
-   <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />
-   <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.cs" />
-

-  </ItemGroup>

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

+    <Compile Include="System.ServiceModel.Channels\DiscoveryChannelBase.cs" />

+    <Compile Include="System.ServiceModel.Channels\RequestChannelBase.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementChannelEndpointElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\AnnouncementEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ContractTypeNameElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryClientSettingsElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DiscoveryVersionConverter.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\DynamicEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\EndpointDiscoveryElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\FindCriteriaElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ScopeElementCollection.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\ServiceDiscoveryElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpAnnouncementEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointCollectionElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpDiscoveryEndpointElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Configuration\UdpTransportSettingsElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelFactory.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpChannelListener.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpDuplexChannel.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Udp\UdpTransportBindingElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\AnnouncementClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryMessageSequence11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryProxyClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\DiscoveryTargetClient11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\EndpointDiscoveryMetadata11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\FindCriteria11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IAnnouncementContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryProxyContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\IDiscoveryTargetContract11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\MessageContracts11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.Version11\ResolveCriteria11.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\AnnouncementClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryMessageSequenceApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryProxyClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\DiscoveryTargetClientApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\EndpointDiscoveryMetadataApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\FindCriteriaApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IAnnouncementContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryProxyContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\IDiscoveryTargetContractApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\MessageContractsApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionApril2005\ResolveCriteriaApril2005.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\AnnouncementClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryMessageSequenceCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryProxyClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\DiscoveryTargetClientCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\EndpointDiscoveryMetadataCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\FindCriteriaCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IAnnouncementContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryProxyContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\IDiscoveryTargetContractCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\MessageContractsCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery.VersionCD1\ResolveCriteriaCD1.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementClient.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\AnnouncementService.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelDispatcher.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryChannelFactory.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryClient.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryClientBindingElement.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointProvider.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryEndpointPublisherBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequence.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryMessageSequenceGenerator.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryOperationContextExtension.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryProxy.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryRequestChannel.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryService.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryServiceExtension.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryVersion.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DiscoveryViaUriBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\DynamicEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\EndpointDiscoveryMetadata.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindCompletedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindCriteria.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindProgressChangedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindRequestContext.cs" />

+    <Compile Include="System.ServiceModel.Discovery\FindResponse.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveCompletedEventArgs.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveCriteria.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ResolveResponse.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryBehavior.cs" />

+    <Compile Include="System.ServiceModel.Discovery\ServiceDiscoveryMode.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpAnnouncementEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpDiscoveryEndpoint.cs" />

+    <Compile Include="System.ServiceModel.Discovery\UdpTransportSettings.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">

@@ -150,46 +150,48 @@
   </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="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.Runtime.Serialization.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.ServiceModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Configuration.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Configuration.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.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">

+      <Project>{A2E8AC47-7A47-4831-9CED-DBC9CCBB653D}</Project>

+      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>

+    </ProjectReference>

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

+      <Project>{C411AE1C-D949-4A87-ABE5-5F5AD9B3C66E}</Project>

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

+    </ProjectReference>

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

+      <Project>{BC9226DD-0D9F-4836-BA8B-87A3E6F06176}</Project>

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

+    </ProjectReference>

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

+      <Project>{FC0139F8-EC5A-4D43-9439-F5B3C6BEE17A}</Project>

+      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>

+    </ProjectReference>

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

+      <Project>{9EF77858-EB0A-4432-948B-18F18E44350B}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj
index c69860d87a2..622609780b4 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_0.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-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>{73518BEE-950A-4968-AB3C-D35D0F8F1F39}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\System.ServiceModel.Discovery-tests-net_4_0</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>System.ServiceModel.Discovery_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</NoWarn>

@@ -28,44 +27,45 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5;NET_3_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;NET_3_5;NET_3_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\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.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">

@@ -74,51 +74,53 @@
   </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/System.ServiceModel.Discovery.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_0/System.ServiceModel.Discovery.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.Runtime.Serialization.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.ServiceModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Configuration.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Configuration.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="..\System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_0.csproj">

+      <Project>{486A449C-49EA-4590-8E0E-2D048D1D3E6A}</Project>

+      <Name>System.ServiceModel.Discovery\System.ServiceModel.Discovery-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.Runtime.Serialization\System.Runtime.Serialization-net_4_0.csproj">

+      <Project>{6AF038FE-CE6D-4D71-9CAB-21C211CE6A42}</Project>

+      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_0</Name>

+    </ProjectReference>

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

+      <Project>{65872296-D61B-4B03-860E-61E0C1DCE8B0}</Project>

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

+    </ProjectReference>

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

+      <Project>{CC96F21E-C45E-4593-BC7F-8331B913E758}</Project>

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

+    </ProjectReference>

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

+      <Project>{688C7022-C205-4FFB-A413-9D8754BF2427}</Project>

+      <Name>System.Xml.Linq\System.Xml.Linq-net_4_0</Name>

+    </ProjectReference>

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

+      <Project>{5D195206-1E4E-4454-9F97-185E27BE57BD}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>
diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj
index 30f02b68476..aad22826cde 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-tests-net_4_5.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery-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>{1A4829F0-22B0-4226-9314-CEB4734E19F2}</ProjectGuid>

     <OutputType>Library</OutputType>

     <NoWarn>1699</NoWarn>

-    <OutputPath>.\</OutputPath>

-    <NoStdLib>true</NoStdLib>

+    <OutputPath>bin\Debug\System.ServiceModel.Discovery-tests-net_4_5</OutputPath>

+    <NoStdLib>True</NoStdLib>

+    <NoConfig>False</NoConfig>

     

     <AppDesignerFolder>Properties</AppDesignerFolder>

-    <RootNamespace></RootNamespace>

+    <RootNamespace>

+    </RootNamespace>

     <AssemblyName>System.ServiceModel.Discovery_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</NoWarn>

@@ -28,44 +27,45 @@
     <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;NET_3_5;NET_3_0</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;NET_3_5;NET_3_0</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\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />
-   <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.cs" />
-

-  </ItemGroup>

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementBoundDiscoveryService.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementClientTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\AnnouncementServiceTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\ContractTypes.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientBindingElementTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryClientTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryProxyTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryServiceTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DiscoveryVersionTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\DynamicEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryBehaviorTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\EndpointDiscoveryMetadataTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\FindCriteriaTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\InspectionBehaviors.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\IntegratedDiscoveryTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\MyDiscoveryServiceTypes.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\ServiceDiscoveryBehaviorTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpAnnouncementEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpDiscoveryEndpointTest.cs" />

+    <Compile Include="Test\System.ServiceModel.Discovery\UdpTransportTest.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">

@@ -74,51 +74,53 @@
   </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/System.ServiceModel.Discovery.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>./../../class/lib/net_4_5/System.ServiceModel.Discovery.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.Runtime.Serialization.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.ServiceModel.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Configuration.dll">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>System.Configuration.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="..\System.ServiceModel.Discovery\System.ServiceModel.Discovery-net_4_5.csproj">

+      <Project>{591CC3E4-004C-4650-88DF-4582FDF7DBF6}</Project>

+      <Name>System.ServiceModel.Discovery\System.ServiceModel.Discovery-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.Runtime.Serialization\System.Runtime.Serialization-net_4_5.csproj">

+      <Project>{A2E8AC47-7A47-4831-9CED-DBC9CCBB653D}</Project>

+      <Name>System.Runtime.Serialization\System.Runtime.Serialization-net_4_5</Name>

+    </ProjectReference>

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

+      <Project>{C411AE1C-D949-4A87-ABE5-5F5AD9B3C66E}</Project>

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

+    </ProjectReference>

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

+      <Project>{BC9226DD-0D9F-4836-BA8B-87A3E6F06176}</Project>

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

+    </ProjectReference>

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

+      <Project>{FC0139F8-EC5A-4D43-9439-F5B3C6BEE17A}</Project>

+      <Name>System.Xml.Linq\System.Xml.Linq-net_4_5</Name>

+    </ProjectReference>

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

+      <Project>{9EF77858-EB0A-4432-948B-18F18E44350B}</Project>

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

+    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <Folder Include="Properties\" />

   </ItemGroup>

-  

-</Project>

-
+</Project>