Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / class / System.Data.Services.Client / System.Data.Services.Client-net_4_0.csproj

diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj
index 11e8fcdbcb961911d65a69dfe98c7d65963fbeb9..93b11dfed81a44987ff145564e9d29b74f169c7c 100644 (file)
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client-net_4_0.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <PropertyGroup>\r
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
@@ -9,28 +9,29 @@
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
     <OutputPath>./../../class/lib/net_4_0</OutputPath>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
     <NoStdLib>true</NoStdLib>\r
     \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>mscorlib</RootNamespace>\r
+    <RootNamespace></RootNamespace>\r
     <AssemblyName>System.Data.Services.Client</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
-    <StartupObject>\r
-    </StartupObject>\r
+    <!-- Filter out System.Core added by: Microsoft.NETFramework.props  -->\r
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
-    <Optimize>true</Optimize>\r
-    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
+    <Optimize>false</Optimize>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_3_5</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
     <AdditionalLibPaths>./../../class/lib/net_4_0</AdditionalLibPaths>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
+    <PlatformTarget>AnyCPU</PlatformTarget>  \r
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
@@ -171,40 +172,45 @@
   <PropertyGroup>\r
     <PreBuildEvent></PreBuildEvent>\r
   </PropertyGroup>\r
-  <ItemGroup>
+  <ItemGroup>\r
     <Reference Include="mscorlib.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\mscorlib.dll</HintPath>
+      <HintPath>mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="System.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\System.dll</HintPath>
+      <HintPath>System.dll</HintPath>
     </Reference>
     <Reference Include="System.Core.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\System.Core.dll</HintPath>
+      <HintPath>System.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\System.Xml.Linq.dll</HintPath>
+      <HintPath>System.Xml.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\System.Data.dll</HintPath>
+      <HintPath>System.Data.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.dll">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\System.Xml.dll</HintPath>
+      <HintPath>System.Xml.dll</HintPath>
     </Reference>
-    <Reference Include="WindowsBase.dll">
+    <Reference Include="WindowsBase">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\\lib\build\WindowsBase.dll</HintPath>
+      <HintPath>WindowsBase</HintPath>
     </Reference>
-  </ItemGroup>
 \r
+  </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-  \r
+    <ItemGroup>
+    <EmbeddedResource Include="Client/System.Data.Services.Client.resources">
+       <LogicalName>System.Data.Services.Client.resources</LogicalName>
+    </EmbeddedResource>
+  </ItemGroup>
+\r
 </Project>\r