Merge pull request #1949 from lewurm/fixtype

[mono.git] / mcs / class / System.Data.OracleClient / System.Data.OracleClient-net_4_5.csproj

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
index b0065c64e2665995191a509c1c2a6cd1b254760c..e2bbd978046e073f41e247f9aa1bfe171207a3e8 100644 (file)
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient-net_4_5.csproj
@@ -5,10 +5,10 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
     <ProductVersion>9.0.30729</ProductVersion>\r
     <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{FE960444-575E-4E41-B5F5-1B83D94A4D76}</ProjectGuid>\r
+    <ProjectGuid>{DB464643-D49E-43CE-B565-FE5446A79FC1}</ProjectGuid>\r
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
-    <OutputPath>bin\Debug\System.Data.OracleClient-net_4_5</OutputPath>\r
+    <OutputPath>./../../class/lib/net_4_5</OutputPath>\r
     <NoStdLib>True</NoStdLib>\r
     <NoConfig>True</NoConfig>\r
     \r
@@ -19,12 +19,13 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
   </PropertyGroup>\r
+  \r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -32,7 +33,7 @@
     <DebugType>pdbonly</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_4_5</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -122,40 +123,48 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
 \r
     </PreBuildEvent>\r
-    <PostBuildEvent>\r
-      xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D\r
-  </PostBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PreBuildEvent>\r
+\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
+    <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
+\r
+    </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
-      <Project>{B8D763CB-5541-4DA8-832F-3B6B486B2746}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
+      <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{17388044-BE4B-4CBE-92D8-5C130414AD84}</Project>\r
-      <Name>System\System-net_4_5-2</Name>\r
+    <ProjectReference Include="../System/System-net_4_5.csproj">\r
+      <Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>\r
+      <Name>System-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">\r
-      <Project>{AB0D8551-2D53-46F2-A340-789E7B62BF57}</Project>\r
-      <Name>System.XML\System.Xml-net_4_5-1</Name>\r
+    <ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">\r
+      <Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>\r
+      <Name>System.Xml-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
-      <Project>{AE8FAE27-D070-4533-A135-49EEF160779D}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
+      <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.EnterpriseServices\System.EnterpriseServices-net_4_5.csproj">\r
-      <Project>{6C212135-6A62-4886-A106-ADD7097F172B}</Project>\r
-      <Name>System.EnterpriseServices\System.EnterpriseServices-net_4_5</Name>\r
+    <ProjectReference Include="../System.EnterpriseServices/System.EnterpriseServices-net_4_5.csproj">\r
+      <Project>{773D8BA7-9A88-49AC-81C9-740436270588}</Project>\r
+      <Name>System.EnterpriseServices-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
-      <Project>{98FA1A26-B1CA-47DC-9FD0-B609DA5FCD25}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
+      <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r
   </ItemGroup>\r
-</Project>
+</Project>\r
+