Merge pull request #1508 from slluis/fix-20966

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

diff --git a/mcs/class/System.Design/System.Design-net_4_5.csproj b/mcs/class/System.Design/System.Design-net_4_5.csproj
index cb13efa7c5d690ec4726172760b1ff6cad2ba7b9..0de36254a78f30b445a41e1b10e731829fc2ef7d 100644 (file)
--- a/mcs/class/System.Design/System.Design-net_4_5.csproj
+++ b/mcs/class/System.Design/System.Design-net_4_5.csproj
@@ -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;DRAWING_DESIGN_DEP</DefineConstants>\r
+    <DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;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;DRAWING_DESIGN_DEP</DefineConstants>\r
+    <DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -378,9 +379,13 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent>\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
+    </PreBuildEvent>
+    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
+
+    </PreBuildEvent>
 \r
-    </PreBuildEvent>\r
     <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
 
     </PostBuildEvent>
@@ -389,45 +394,41 @@
     </PostBuildEvent>\r
   </PropertyGroup>\r
   <ItemGroup>\r
-    <ProjectReference Include="..\corlib\corlib-net_4_5.csproj">\r
+    <ProjectReference Include="../corlib/corlib-net_4_5.csproj">\r
       <Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>\r
-      <Name>corlib\corlib-net_4_5</Name>\r
+      <Name>corlib-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System\System-net_4_5-2.csproj">\r
-      <Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</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>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</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.Web\System.Web-net_4_5-1.csproj">\r
-      <Project>{85F119B8-8463-4D6F-9852-DAB8C4070BD5}</Project>\r
-      <Name>System.Web\System.Web-net_4_5-1</Name>\r
+    <ProjectReference Include="../System.Web/System.Web-net_4_5.csproj">\r
+      <Project>{B489C3DE-3ED3-4EDC-B42B-82B38E101857}</Project>\r
+      <Name>System.Web-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\Managed.Windows.Forms\System.Windows.Forms-net_4_5.csproj">\r
+    <ProjectReference Include="../Managed.Windows.Forms/System.Windows.Forms-net_4_5.csproj">\r
       <Project>{B102F27C-1A07-487F-BA5B-D5155D201112}</Project>\r
-      <Name>Managed.Windows.Forms\System.Windows.Forms-net_4_5</Name>\r
+      <Name>System.Windows.Forms-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing\System.Drawing-net_4_5.csproj">\r
+    <ProjectReference Include="../System.Drawing/System.Drawing-net_4_5.csproj">\r
       <Project>{CB1CB976-AA54-4553-B0E7-05665B199EC4}</Project>\r
-      <Name>System.Drawing\System.Drawing-net_4_5</Name>\r
+      <Name>System.Drawing-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\Accessibility\Accessibility-net_4_5.csproj">\r
+    <ProjectReference Include="../Accessibility/Accessibility-net_4_5.csproj">\r
       <Project>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</Project>\r
-      <Name>Accessibility\Accessibility-net_4_5</Name>\r
+      <Name>Accessibility-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Data\System.Data-net_4_5.csproj">\r
+    <ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">\r
       <Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>\r
-      <Name>System.Data\System.Data-net_4_5</Name>\r
+      <Name>System.Data-net_4_5</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="..\System.Configuration\System.Configuration-net_4_5.csproj">\r
+    <ProjectReference Include="../System.Configuration/System.Configuration-net_4_5.csproj">\r
       <Project>{D52A2CEA-245E-4877-950E-3EAC5F541B8E}</Project>\r
-      <Name>System.Configuration\System.Configuration-net_4_5</Name>\r
-    </ProjectReference>\r
-    <ProjectReference Include="..\System.Drawing.Design\System.Drawing.Design-net_4_0.csproj">\r
-      <Project>{81FDD05B-E6D8-4667-B637-99DA7C1D7284}</Project>\r
-      <Name>System.Drawing.Design\System.Drawing.Design-net_4_0</Name>\r
+      <Name>System.Configuration-net_4_5</Name>\r
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r