Merge pull request #3769 from evincarofautumn/fix-verify-before-allocs

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting-net_4_x.csproj

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
index 8dccbd5b0a20fd7448fb49a36fb03aa15ad54810..2b3eb08330ba3fe77ccdba40c2f2847a1a712a74 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting-net_4_x.csproj
@@ -9,7 +9,10 @@
     <OutputType>Library</OutputType>\r
     <NoWarn>1699</NoWarn>\r
     <OutputPath>./../../class/lib/net_4_x</OutputPath>\r
+    <IntermediateOutputPath>obj-net_4_x</IntermediateOutputPath>\r
+    <GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>\r
     <NoStdLib>True</NoStdLib>\r
+    \r
     <NoConfig>True</NoConfig>\r
     \r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
@@ -25,7 +28,7 @@
     <DebugType>full</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>false</Optimize>\r
-    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>TRACE;NET_4_0;NET_4_5;NET_4_6;MONO</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -33,7 +36,7 @@
     <DebugType>pdbonly</DebugType>\r
     <NoWarn>1699</NoWarn>\r
     <Optimize>true</Optimize>\r
-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;DISABLE_CAS_USE</DefineConstants>\r
+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
   </PropertyGroup>\r
@@ -120,15 +123,14 @@
   </Target>\r
   -->\r
   <PropertyGroup>\r
-    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
+    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PreBuildEvent>\r
     <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
 \r
     </PreBuildEvent>\r
-\r
-    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">\r
-\r
+    <PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
+
     </PostBuildEvent>\r
     <PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">\r
 \r
@@ -143,10 +145,6 @@
       <Project>{2762E921-91A8-4C87-91E9-BA628013F753}</Project>\r
       <Name>System-net_4_x</Name>\r
     </ProjectReference>\r
-    <ProjectReference Include="../System.Web/System.Web-net_4_x.csproj">\r
-      <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>\r
-      <Name>System.Web-net_4_x</Name>\r
-    </ProjectReference>\r
     <ProjectReference Include="../System.XML/System.Xml-net_4_x.csproj">\r
       <Project>{87FD2F0F-5222-4AE6-BD63-2D4975E11E5B}</Project>\r
       <Name>System.Xml-net_4_x</Name>\r
@@ -155,6 +153,10 @@
       <Project>{A157AD69-59D4-49DE-94B3-DB883B2BEAA5}</Project>\r
       <Name>System.Runtime.Serialization.Formatters.Soap-net_4_x</Name>\r
     </ProjectReference>\r
+    <ProjectReference Include="../System.Web/System.Web-net_4_x.csproj">\r
+      <Project>{9DB806CB-B828-49B7-BAE2-2E52402CB4DC}</Project>\r
+      <Name>System.Web-net_4_x</Name>\r
+    </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Folder Include="Properties\" />\r