338 files changed, 338 insertions, 353 deletions

diff --git a/mcs/class/Accessibility/Accessibility.csproj b/mcs/class/Accessibility/Accessibility.csproj
index 859a50cdd8d..2ecd9604b93 100644
--- a/mcs/class/Accessibility/Accessibility.csproj
+++ b/mcs/class/Accessibility/Accessibility.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
index b82ea2fb9e2..1afc84de7fc 100644
--- a/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
+++ b/mcs/class/Commons.Xml.Relaxng/Commons.Xml.Relaxng.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Cscompmgd/Cscompmgd.csproj b/mcs/class/Cscompmgd/Cscompmgd.csproj
index 187f78dc1ca..7ba0fa60ea5 100644
--- a/mcs/class/Cscompmgd/Cscompmgd.csproj
+++ b/mcs/class/Cscompmgd/Cscompmgd.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/CustomMarshalers/CustomMarshalers.csproj b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
index daafe78e3e4..5243e898354 100644
--- a/mcs/class/CustomMarshalers/CustomMarshalers.csproj
+++ b/mcs/class/CustomMarshalers/CustomMarshalers.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
index c6c11a9092c..a23848c11b5 100644
--- a/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Primitives/Facades_Microsoft.Win32.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
index 72f0f55c0b8..919e622e74e 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Registry.AccessControl/Facades_Microsoft.Win32.Registry.AccessControl.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
index 87eb883188e..4c8d03b6b76 100644
--- a/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
+++ b/mcs/class/Facades/Microsoft.Win32.Registry/Facades_Microsoft.Win32.Registry.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj b/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
index e6d88eff87d..f41fc8bc18d 100644
--- a/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
+++ b/mcs/class/Facades/System.AppContext/Facades_System.AppContext.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
index f784eb42e39..a65358d65e7 100644
--- a/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
+++ b/mcs/class/Facades/System.Collections.Concurrent/Facades_System.Collections.Concurrent.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
index cbb09480c45..9ee8b1b4538 100644
--- a/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
+++ b/mcs/class/Facades/System.Collections.NonGeneric/Facades_System.Collections.NonGeneric.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
index 89872cbc001..271cdab9f75 100644
--- a/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
+++ b/mcs/class/Facades/System.Collections.Specialized/Facades_System.Collections.Specialized.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj b/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
index 0ae7d60753c..b2624573710 100644
--- a/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
+++ b/mcs/class/Facades/System.Collections/Facades_System.Collections.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
index 313b42a8ea1..28acf486e53 100644
--- a/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
+++ b/mcs/class/Facades/System.ComponentModel.Annotations/Facades_System.ComponentModel.Annotations.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
index 28d60d4bf2c..5c74719df52 100644
--- a/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
+++ b/mcs/class/Facades/System.ComponentModel.EventBasedAsync/Facades_System.ComponentModel.EventBasedAsync.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
index 7f2ec1ab81f..49650b163f5 100644
--- a/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
+++ b/mcs/class/Facades/System.ComponentModel.Primitives/Facades_System.ComponentModel.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
index 839a9b3d0e8..f7f4bb54fec 100644
--- a/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
+++ b/mcs/class/Facades/System.ComponentModel.TypeConverter/Facades_System.ComponentModel.TypeConverter.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
index 36d93244870..24bd9b40bb8 100644
--- a/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
+++ b/mcs/class/Facades/System.ComponentModel/Facades_System.ComponentModel.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Console/Facades_System.Console.csproj b/mcs/class/Facades/System.Console/Facades_System.Console.csproj
index fe70534b5bd..a193d3394ad 100644
--- a/mcs/class/Facades/System.Console/Facades_System.Console.csproj
+++ b/mcs/class/Facades/System.Console/Facades_System.Console.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
index f032d2a9597..dc55011eb8e 100644
--- a/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
+++ b/mcs/class/Facades/System.Data.Common/Facades_System.Data.Common.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
index 6f2bc29b2d6..ae6c2872c6f 100644
--- a/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
+++ b/mcs/class/Facades/System.Data.SqlClient/Facades_System.Data.SqlClient.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
index dbf3e3209ae..070ea890f52 100644
--- a/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Contracts/Facades_System.Diagnostics.Contracts.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
index ff66f255fde..5712a85fba2 100644
--- a/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Debug/Facades_System.Diagnostics.Debug.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
index 3a871962785..5a8d5ed74ff 100644
--- a/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
+++ b/mcs/class/Facades/System.Diagnostics.FileVersionInfo/Facades_System.Diagnostics.FileVersionInfo.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
index b4a44e99083..7a00a49a17d 100644
--- a/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Process/Facades_System.Diagnostics.Process.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
index cf66d96efc5..81382897d4e 100644
--- a/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
+++ b/mcs/class/Facades/System.Diagnostics.StackTrace/Facades_System.Diagnostics.StackTrace.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
index bf0e6c6ae77..e78ec98eea0 100644
--- a/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TextWriterTraceListener/Facades_System.Diagnostics.TextWriterTraceListener.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
index 808fd5eb59b..721c746faa5 100644
--- a/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Tools/Facades_System.Diagnostics.Tools.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
index 7dfb94018f8..2b576cdba34 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TraceEvent/Facades_System.Diagnostics.TraceEvent.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
index e2c9837c319..ce168574719 100644
--- a/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
+++ b/mcs/class/Facades/System.Diagnostics.TraceSource/Facades_System.Diagnostics.TraceSource.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
index e238d8562fc..db301ac8018 100644
--- a/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
+++ b/mcs/class/Facades/System.Diagnostics.Tracing/Facades_System.Diagnostics.Tracing.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj b/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
index 492c0ad1369..d49ecef9113 100644
--- a/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
+++ b/mcs/class/Facades/System.Drawing.Primitives/Facades_System.Drawing.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
index d6d78b6b2a2..18aea5ed1e7 100644
--- a/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
+++ b/mcs/class/Facades/System.Dynamic.Runtime/Facades_System.Dynamic.Runtime.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
index b1a1f369b0e..0fca0b42f76 100644
--- a/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
+++ b/mcs/class/Facades/System.Globalization.Calendars/Facades_System.Globalization.Calendars.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
index 085886a4b0a..3582147bc3f 100644
--- a/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
+++ b/mcs/class/Facades/System.Globalization.Extensions/Facades_System.Globalization.Extensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj b/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
index c1693e72953..5fbe08e380c 100644
--- a/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
+++ b/mcs/class/Facades/System.Globalization/Facades_System.Globalization.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
index 76c53589654..3786a740a58 100644
--- a/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
+++ b/mcs/class/Facades/System.IO.Compression.ZipFile/Facades_System.IO.Compression.ZipFile.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
index 9b5e6a45678..d3ada040dc2 100644
--- a/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.AccessControl/Facades_System.IO.FileSystem.AccessControl.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
index 09a55c59ffd..03d5bf9f510 100644
--- a/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.DriveInfo/Facades_System.IO.FileSystem.DriveInfo.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
index f370e95dd99..64ba50c034e 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.Primitives/Facades_System.IO.FileSystem.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
index 79654fe3af7..92d8e26a942 100644
--- a/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem.Watcher/Facades_System.IO.FileSystem.Watcher.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
index b31a9e722a0..67c4a5fcb7b 100644
--- a/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
+++ b/mcs/class/Facades/System.IO.FileSystem/Facades_System.IO.FileSystem.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
index 4115c2b3fc2..5f2978c083c 100644
--- a/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
+++ b/mcs/class/Facades/System.IO.IsolatedStorage/Facades_System.IO.IsolatedStorage.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
index 0d17418b92a..254934d0475 100644
--- a/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
+++ b/mcs/class/Facades/System.IO.MemoryMappedFiles/Facades_System.IO.MemoryMappedFiles.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
index 2f26978ad64..405a0086e55 100644
--- a/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
+++ b/mcs/class/Facades/System.IO.Pipes/Facades_System.IO.Pipes.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
index 79329c5f3a2..1e9c07e1bc5 100644
--- a/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
+++ b/mcs/class/Facades/System.IO.UnmanagedMemoryStream/Facades_System.IO.UnmanagedMemoryStream.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.IO/Facades_System.IO.csproj b/mcs/class/Facades/System.IO/Facades_System.IO.csproj
index 4821a54ad92..ad20a26e7d2 100644
--- a/mcs/class/Facades/System.IO/Facades_System.IO.csproj
+++ b/mcs/class/Facades/System.IO/Facades_System.IO.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
index e806d158903..bcea282f568 100644
--- a/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
+++ b/mcs/class/Facades/System.Linq.Expressions/Facades_System.Linq.Expressions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
index 9d32fdd6a80..a7e470eff75 100644
--- a/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
+++ b/mcs/class/Facades/System.Linq.Parallel/Facades_System.Linq.Parallel.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
index c313b93d8e2..47c64b20904 100644
--- a/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
+++ b/mcs/class/Facades/System.Linq.Queryable/Facades_System.Linq.Queryable.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj b/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
index e7a4aa645d8..3a0658f14a2 100644
--- a/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
+++ b/mcs/class/Facades/System.Linq/Facades_System.Linq.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
index 1d556453a6f..6a66a851028 100644
--- a/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
+++ b/mcs/class/Facades/System.Net.AuthenticationManager/Facades_System.Net.AuthenticationManager.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
index 137f8899fac..1e40827271a 100644
--- a/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
+++ b/mcs/class/Facades/System.Net.Cache/Facades_System.Net.Cache.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj b/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
index 5e4aefc2d26..3184496dc22 100644
--- a/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
+++ b/mcs/class/Facades/System.Net.Http.Rtc/Facades_System.Net.Http.Rtc.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
index e313d5ebf62..0d762f91ab7 100644
--- a/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
+++ b/mcs/class/Facades/System.Net.HttpListener/Facades_System.Net.HttpListener.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
index 82f6e3ac5f5..07f13bfcb30 100644
--- a/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
+++ b/mcs/class/Facades/System.Net.Mail/Facades_System.Net.Mail.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
index 2eff5a1b69f..80e6fe04648 100644
--- a/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
+++ b/mcs/class/Facades/System.Net.NameResolution/Facades_System.Net.NameResolution.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
index 7ef9db44f3c..992f3543fb8 100644
--- a/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
+++ b/mcs/class/Facades/System.Net.NetworkInformation/Facades_System.Net.NetworkInformation.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj b/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
index bf24bbb467c..bf28a1bd4a0 100644
--- a/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
+++ b/mcs/class/Facades/System.Net.Ping/Facades_System.Net.Ping.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
index 8396d6ad416..378e4fdd2f6 100644
--- a/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
+++ b/mcs/class/Facades/System.Net.Primitives/Facades_System.Net.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
index d57271b6c02..9eccf55a673 100644
--- a/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
+++ b/mcs/class/Facades/System.Net.Requests/Facades_System.Net.Requests.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
index f05a19217ca..1e67ec6c064 100644
--- a/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
+++ b/mcs/class/Facades/System.Net.Security/Facades_System.Net.Security.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
index 827efd67818..d72deb3d2c4 100644
--- a/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
+++ b/mcs/class/Facades/System.Net.ServicePoint/Facades_System.Net.ServicePoint.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
index 905487f87f8..24b6498df58 100644
--- a/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
+++ b/mcs/class/Facades/System.Net.Sockets/Facades_System.Net.Sockets.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
index bb1422d9d0c..018db9cc12f 100644
--- a/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
+++ b/mcs/class/Facades/System.Net.Utilities/Facades_System.Net.Utilities.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
index 49b59c9600c..ce09657f916 100644
--- a/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
+++ b/mcs/class/Facades/System.Net.WebHeaderCollection/Facades_System.Net.WebHeaderCollection.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
index f1e2c441e3d..9fe9d82408b 100644
--- a/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
+++ b/mcs/class/Facades/System.Net.WebSockets.Client/Facades_System.Net.WebSockets.Client.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
index f1812d830c4..475b605d9bd 100644
--- a/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
+++ b/mcs/class/Facades/System.Net.WebSockets/Facades_System.Net.WebSockets.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
index fdc3f060c45..849176cde0d 100644
--- a/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
+++ b/mcs/class/Facades/System.ObjectModel/Facades_System.ObjectModel.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
index 564edf5f8ec..a0d06927900 100644
--- a/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit.ILGeneration/Facades_System.Reflection.Emit.ILGeneration.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
index dba12d7f93f..acfbd97f5b7 100644
--- a/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit.Lightweight/Facades_System.Reflection.Emit.Lightweight.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
index 5f8b8decb6b..0f0b993c159 100644
--- a/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
+++ b/mcs/class/Facades/System.Reflection.Emit/Facades_System.Reflection.Emit.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
index 3f1029af5ff..67d49a1bfe5 100644
--- a/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
+++ b/mcs/class/Facades/System.Reflection.Extensions/Facades_System.Reflection.Extensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
index 67da6380c84..62fc868dc8f 100644
--- a/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
+++ b/mcs/class/Facades/System.Reflection.Primitives/Facades_System.Reflection.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
index c8e48cf7a1a..635b3f10f3e 100644
--- a/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
+++ b/mcs/class/Facades/System.Reflection.TypeExtensions/Facades_System.Reflection.TypeExtensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj b/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
index 0cafc46a7a2..a6dc8b32b1e 100644
--- a/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
+++ b/mcs/class/Facades/System.Reflection/Facades_System.Reflection.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj b/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
index 891191287b3..392a057878f 100644
--- a/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
+++ b/mcs/class/Facades/System.Resources.Reader/Facades_System.Resources.Reader.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
index d2d366e909a..59203abd32d 100644
--- a/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
+++ b/mcs/class/Facades/System.Resources.ReaderWriter/Facades_System.Resources.ReaderWriter.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
index 172f3525c83..1536dfea195 100644
--- a/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
+++ b/mcs/class/Facades/System.Resources.ResourceManager/Facades_System.Resources.ResourceManager.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj b/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
index 5321207ce33..414ce160223 100644
--- a/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
+++ b/mcs/class/Facades/System.Resources.Writer/Facades_System.Resources.Writer.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
index 42ecd4d977a..ed99b8bd87a 100644
--- a/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
+++ b/mcs/class/Facades/System.Runtime.CompilerServices.VisualC/Facades_System.Runtime.CompilerServices.VisualC.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
index 0fe6482c5fc..04935e0a899 100644
--- a/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
+++ b/mcs/class/Facades/System.Runtime.Extensions/Facades_System.Runtime.Extensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
index bf7e2d063f0..0241527dabc 100644
--- a/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
+++ b/mcs/class/Facades/System.Runtime.Handles/Facades_System.Runtime.Handles.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
index 822642eb432..7aaad6cacfe 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.RuntimeInformation/Facades_System.Runtime.InteropServices.RuntimeInformation.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
index 1b462fe84a3..e7690f6c051 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices.WindowsRuntime/Facades_System.Runtime.InteropServices.WindowsRuntime.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
index 72c6f76e0fb..9f5b1cd8f3f 100644
--- a/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
+++ b/mcs/class/Facades/System.Runtime.InteropServices/Facades_System.Runtime.InteropServices.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
index 3528c1369d2..e08275a5820 100644
--- a/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
+++ b/mcs/class/Facades/System.Runtime.Numerics/Facades_System.Runtime.Numerics.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
index fb789df9302..d43e749bd89 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Formatters/Facades_System.Runtime.Serialization.Formatters.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
index aa024c1c855..14253572bfb 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Json/Facades_System.Runtime.Serialization.Json.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
index b05a09fecaf..a6dcec96c84 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Primitives/Facades_System.Runtime.Serialization.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
index 29fa613107d..735306c3bfe 100644
--- a/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
+++ b/mcs/class/Facades/System.Runtime.Serialization.Xml/Facades_System.Runtime.Serialization.Xml.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj b/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
index 4481143522d..1c90bbbce92 100644
--- a/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
+++ b/mcs/class/Facades/System.Runtime/Facades_System.Runtime.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
index d9cce93e986..c3cb945eee7 100644
--- a/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
+++ b/mcs/class/Facades/System.Security.AccessControl/Facades_System.Security.AccessControl.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
index 5171b7c7e2b..9d04c68a657 100644
--- a/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
+++ b/mcs/class/Facades/System.Security.Claims/Facades_System.Security.Claims.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
index 65a17d3c3e6..cfa4cbf2991 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Algorithms/Facades_System.Security.Cryptography.Algorithms.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj b/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
index 617510d76b1..7b2b4f43683 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Csp/Facades_System.Security.Cryptography.Csp.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
index e833cccaa53..d33e6f68d5b 100644
--- a/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.DeriveBytes/Facades_System.Security.Cryptography.DeriveBytes.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
index f0a4a18d150..25abd66b0fb 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encoding/Facades_System.Security.Cryptography.Encoding.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
index ca6445b9b9a..80a4e8fcfb5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.Aes/Facades_System.Security.Cryptography.Encryption.Aes.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
index 0aeb30f0f92..6281a718d4b 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDiffieHellman/Facades_System.Security.Cryptography.Encryption.ECDiffieHellman.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
index 73df3371681..d2e0f9d004c 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption.ECDsa/Facades_System.Security.Cryptography.Encryption.ECDsa.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
index 6bc844010ef..11cc4083186 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Encryption/Facades_System.Security.Cryptography.Encryption.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
index 666724d0c32..81c9944c45e 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing.Algorithms/Facades_System.Security.Cryptography.Hashing.Algorithms.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
index 8b34b6b3057..cd02601c1be 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Hashing/Facades_System.Security.Cryptography.Hashing.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj b/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
index 2547864b820..a738c072f17 100644
--- a/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.Primitives/Facades_System.Security.Cryptography.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
index cce91d4edaa..6ec822e06bd 100644
--- a/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.ProtectedData/Facades_System.Security.Cryptography.ProtectedData.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
index e90039c1b2c..4f14aa246e5 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.RSA/Facades_System.Security.Cryptography.RSA.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
index da70b99da93..56b26f83332 100644
--- a/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.RandomNumberGenerator/Facades_System.Security.Cryptography.RandomNumberGenerator.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
index f7c4c15b25c..bc04ce34178 100644
--- a/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
+++ b/mcs/class/Facades/System.Security.Cryptography.X509Certificates/Facades_System.Security.Cryptography.X509Certificates.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
index 17b5441db62..670831d5a0f 100644
--- a/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
+++ b/mcs/class/Facades/System.Security.Principal.Windows/Facades_System.Security.Principal.Windows.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
index 3100d8de231..d8742e4e9b3 100644
--- a/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
+++ b/mcs/class/Facades/System.Security.Principal/Facades_System.Security.Principal.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
index fee5bb4261d..5b3645128b4 100644
--- a/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
+++ b/mcs/class/Facades/System.Security.SecureString/Facades_System.Security.SecureString.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
index d6cc1de4a10..4c45566d137 100644
--- a/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Duplex/Facades_System.ServiceModel.Duplex.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
index ac54565203c..58b80e95a5e 100644
--- a/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Http/Facades_System.ServiceModel.Http.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
index b649c68eb11..ee9abfadbf8 100644
--- a/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
+++ b/mcs/class/Facades/System.ServiceModel.NetTcp/Facades_System.ServiceModel.NetTcp.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
index de81def7234..a6c2df9abe2 100644
--- a/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Primitives/Facades_System.ServiceModel.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
index 38b9a449432..a2e535d4eb6 100644
--- a/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
+++ b/mcs/class/Facades/System.ServiceModel.Security/Facades_System.ServiceModel.Security.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
index 7df59268293..ddd226e2ac7 100644
--- a/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
+++ b/mcs/class/Facades/System.ServiceProcess.ServiceController/Facades_System.ServiceProcess.ServiceController.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj b/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
index 7f89cf4a87d..8e28b808b5e 100644
--- a/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
+++ b/mcs/class/Facades/System.Text.Encoding.CodePages/Facades_System.Text.Encoding.CodePages.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
index 9a52f3df4a5..0a5b80c1fc8 100644
--- a/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
+++ b/mcs/class/Facades/System.Text.Encoding.Extensions/Facades_System.Text.Encoding.Extensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
index a5ec5f29768..3c4377e975f 100644
--- a/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
+++ b/mcs/class/Facades/System.Text.Encoding/Facades_System.Text.Encoding.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
index 92ec5b6c432..a3454ab022c 100644
--- a/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
+++ b/mcs/class/Facades/System.Text.RegularExpressions/Facades_System.Text.RegularExpressions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
index 8c41baadb01..01306450b30 100644
--- a/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
+++ b/mcs/class/Facades/System.Threading.AccessControl/Facades_System.Threading.AccessControl.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
index 4e53e146a43..c537087e2f0 100644
--- a/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
+++ b/mcs/class/Facades/System.Threading.Overlapped/Facades_System.Threading.Overlapped.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
index 43b288afcb9..ca2a0682ac6 100644
--- a/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
+++ b/mcs/class/Facades/System.Threading.Tasks.Parallel/Facades_System.Threading.Tasks.Parallel.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
index f2408f64785..21d1899396e 100644
--- a/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
+++ b/mcs/class/Facades/System.Threading.Tasks/Facades_System.Threading.Tasks.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
index ec6871a71ba..981f69ac097 100644
--- a/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
+++ b/mcs/class/Facades/System.Threading.Thread/Facades_System.Threading.Thread.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
index 98e8be2bd08..31c8aba8bf7 100644
--- a/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
+++ b/mcs/class/Facades/System.Threading.ThreadPool/Facades_System.Threading.ThreadPool.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
index 590f3a0d0c1..ccd6de0c7a1 100644
--- a/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
+++ b/mcs/class/Facades/System.Threading.Timer/Facades_System.Threading.Timer.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj b/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
index 70dc1943b85..9b7bc24b129 100644
--- a/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
+++ b/mcs/class/Facades/System.Threading/Facades_System.Threading.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
index c98ac80afa9..ade5528f57e 100644
--- a/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
+++ b/mcs/class/Facades/System.ValueTuple/Facades_System.ValueTuple.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
index 9d5e2d2e93c..43efd08368e 100644
--- a/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
+++ b/mcs/class/Facades/System.Xml.ReaderWriter/Facades_System.Xml.ReaderWriter.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
index 83c3c3b99d9..bebf22d25a0 100644
--- a/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XDocument/Facades_System.Xml.XDocument.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
index 5f1334d0957..fc6e65d65eb 100644
--- a/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XPath.XDocument/Facades_System.Xml.XPath.XDocument.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
index cce47dc2acb..a66abdbccc5 100644
--- a/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
+++ b/mcs/class/Facades/System.Xml.XPath/Facades_System.Xml.XPath.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
index f887bd7d674..4abfc0b7edc 100644
--- a/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
+++ b/mcs/class/Facades/System.Xml.XmlDocument/Facades_System.Xml.XmlDocument.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
index 4fd90dab0a8..c704ae844d1 100644
--- a/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
+++ b/mcs/class/Facades/System.Xml.XmlSerializer/Facades_System.Xml.XmlSerializer.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
index 83dae3ed299..a460e38d7cf 100644
--- a/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
+++ b/mcs/class/Facades/System.Xml.Xsl.Primitives/Facades_System.Xml.Xsl.Primitives.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/Facades/netstandard/Facades_netstandard.csproj b/mcs/class/Facades/netstandard/Facades_netstandard.csproj
index 6c29049516e..001602c2c01 100644
--- a/mcs/class/Facades/netstandard/Facades_netstandard.csproj
+++ b/mcs/class/Facades/netstandard/Facades_netstandard.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>

diff --git a/mcs/class/I18N/CJK/I18N.CJK.csproj b/mcs/class/I18N/CJK/I18N.CJK.csproj
index c1b2752e7b4..c4d615809e0 100644
--- a/mcs/class/I18N/CJK/I18N.CJK.csproj
+++ b/mcs/class/I18N/CJK/I18N.CJK.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/I18N/Common/I18N.csproj b/mcs/class/I18N/Common/I18N.csproj
index 3372317f948..b3f0dfbd289 100644
--- a/mcs/class/I18N/Common/I18N.csproj
+++ b/mcs/class/I18N/Common/I18N.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>DISABLE_UNSAFE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/I18N/MidEast/I18N.MidEast.csproj b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
index 2e1ef179b1e..d99ae2a9693 100644
--- a/mcs/class/I18N/MidEast/I18N.MidEast.csproj
+++ b/mcs/class/I18N/MidEast/I18N.MidEast.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/I18N/Other/I18N.Other.csproj b/mcs/class/I18N/Other/I18N.Other.csproj
index 6b57af24c42..31285931a87 100644
--- a/mcs/class/I18N/Other/I18N.Other.csproj
+++ b/mcs/class/I18N/Other/I18N.Other.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/I18N/Rare/I18N.Rare.csproj b/mcs/class/I18N/Rare/I18N.Rare.csproj
index 43475b90c14..8d607aba434 100644
--- a/mcs/class/I18N/Rare/I18N.Rare.csproj
+++ b/mcs/class/I18N/Rare/I18N.Rare.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/I18N/West/I18N.West.csproj b/mcs/class/I18N/West/I18N.West.csproj
index e01a4fa0b89..538ee3fc3b3 100644
--- a/mcs/class/I18N/West/I18N.West.csproj
+++ b/mcs/class/I18N/West/I18N.West.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
index 103e64432cd..629651d0a70 100644
--- a/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
+++ b/mcs/class/IBM.Data.DB2/IBM.Data.DB2.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
index 9516ba67076..570f18a35fb 100644
--- a/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
+++ b/mcs/class/ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
index 3d2d0cb3e2d..0a657a85b91 100644
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.Engine.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
index 38a84ce1312..53a3b4b48df 100644
--- a/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
+++ b/mcs/class/Microsoft.Build.Framework/Microsoft.Build.Framework.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
index 3e2418391c0..30dc6c53094 100644
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
index 47ebc566e72..f44102cc1ff 100644
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.csproj b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
index f0f7ef680d0..f8decac4614 100644
--- a/mcs/class/Microsoft.Build/Microsoft.Build.csproj
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MICROSOFT_BUILD_DLL</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MICROSOFT_BUILD_DLL</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
index a205252c4b3..99e1e9b0b33 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
index 37da706c5e3..bc7389b8721 100644
--- a/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
+++ b/mcs/class/Microsoft.VisualC/Microsoft.VisualC.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
index 76c6221a66b..0d864f40f17 100644
--- a/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
+++ b/mcs/class/Microsoft.Web.Infrastructure/Microsoft.Web.Infrastructure.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
index 8f48c728d39..1f79b2507a9 100644
--- a/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
+++ b/mcs/class/Mono.Btls.Interface/Mono.Btls.Interface.csproj
@@ -30,7 +30,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SECURITY_DEP</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SECURITY_DEP</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.C5/Mono.C5.csproj b/mcs/class/Mono.C5/Mono.C5.csproj
index c6de09a93ba..ac23ddf801e 100644
--- a/mcs/class/Mono.C5/Mono.C5.csproj
+++ b/mcs/class/Mono.C5/Mono.C5.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.CSharp/Mono.CSharp.csproj b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
index 2fc3ceb58a6..622baa97e6c 100644
--- a/mcs/class/Mono.CSharp/Mono.CSharp.csproj
+++ b/mcs/class/Mono.CSharp/Mono.CSharp.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Cairo/Mono.Cairo.csproj b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
index dcf1773185c..779eaf0b8e1 100644
--- a/mcs/class/Mono.Cairo/Mono.Cairo.csproj
+++ b/mcs/class/Mono.Cairo/Mono.Cairo.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
index 358667e79fa..d87c3314e4f 100644
--- a/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
+++ b/mcs/class/Mono.Cecil.Mdb/Mono.Cecil.Mdb.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;CECIL</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;CECIL</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Cecil/Mono.Cecil.csproj b/mcs/class/Mono.Cecil/Mono.Cecil.csproj
index 3a6e6814483..9e4971a7a67 100644
--- a/mcs/class/Mono.Cecil/Mono.Cecil.csproj
+++ b/mcs/class/Mono.Cecil/Mono.Cecil.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_4_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_4_0</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
index 8fefa870b35..7f646a42818 100644
--- a/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
+++ b/mcs/class/Mono.CodeContracts/Mono.CodeContracts.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
index ac75ce65f76..18be1e12a44 100644
--- a/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
+++ b/mcs/class/Mono.CompilerServices.SymbolWriter/Mono.CompilerServices.SymbolWriter.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
index a2ffdc01b09..2e09f416a57 100644
--- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
+++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SQLITE_STANDARD</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SQLITE_STANDARD</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
index f59af05b3a0..d8c00a256c5 100644
--- a/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
+++ b/mcs/class/Mono.Data.Tds/Mono.Data.Tds.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
index 3350ae7757f..80bac3fc05b 100644
--- a/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
+++ b/mcs/class/Mono.Debugger.Soft/Mono.Debugger.Soft.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO_DATACONVERTER_STATIC_METHODS</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Http/Mono.Http.csproj b/mcs/class/Mono.Http/Mono.Http.csproj
index 38686117e55..670874cd11a 100644
--- a/mcs/class/Mono.Http/Mono.Http.csproj
+++ b/mcs/class/Mono.Http/Mono.Http.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Management/Mono.Management.csproj b/mcs/class/Mono.Management/Mono.Management.csproj
index f9d8b51b20e..d0f9f3bb985 100644
--- a/mcs/class/Mono.Management/Mono.Management.csproj
+++ b/mcs/class/Mono.Management/Mono.Management.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
index 5db1be8eb6b..3650218d5d7 100644
--- a/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
+++ b/mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Messaging/Mono.Messaging.csproj b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
index 635c7cfffc1..28eb83a3ec3 100644
--- a/mcs/class/Mono.Messaging/Mono.Messaging.csproj
+++ b/mcs/class/Mono.Messaging/Mono.Messaging.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/Mono.Options/Mono.Options.csproj b/mcs/class/Mono.Options/Mono.Options.csproj
index d0fc5313437..73c4feb1325 100644
--- a/mcs/class/Mono.Options/Mono.Options.csproj
+++ b/mcs/class/Mono.Options/Mono.Options.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Parallel/Mono.Parallel.csproj b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
index bdc4cf8dea1..b0c0769f667 100644
--- a/mcs/class/Mono.Parallel/Mono.Parallel.csproj
+++ b/mcs/class/Mono.Parallel/Mono.Parallel.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;INSIDE_MONO_PARALLEL</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;INSIDE_MONO_PARALLEL</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Posix/Mono.Posix.csproj b/mcs/class/Mono.Posix/Mono.Posix.csproj
index d57279d23e2..38de3b58b4e 100644
--- a/mcs/class/Mono.Posix/Mono.Posix.csproj
+++ b/mcs/class/Mono.Posix/Mono.Posix.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
index 8553103307c..f918cb59bcf 100644
--- a/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
+++ b/mcs/class/Mono.Profiler.Log/Mono.Profiler.Log.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
index 5ef22994b57..2b48fb0f018 100644
--- a/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
+++ b/mcs/class/Mono.Security.Win32/Mono.Security.Win32.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.Security/Mono.Security.csproj b/mcs/class/Mono.Security/Mono.Security.csproj
index a5c61c747d1..65a8de4ed8f 100644
--- a/mcs/class/Mono.Security/Mono.Security.csproj
+++ b/mcs/class/Mono.Security/Mono.Security.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/Mono.Simd/Mono.Simd.csproj b/mcs/class/Mono.Simd/Mono.Simd.csproj
index 0d716b212c4..d2870e3b7ec 100644
--- a/mcs/class/Mono.Simd/Mono.Simd.csproj
+++ b/mcs/class/Mono.Simd/Mono.Simd.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">

     <OutputPath>./../../class/lib/monotouch</OutputPath>

diff --git a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
index d56023da26f..a66b1bd1890 100644
--- a/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
+++ b/mcs/class/Mono.Tasklets/Mono.Tasklets.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
index 4aae9771219..7781e0f3803 100644
--- a/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
+++ b/mcs/class/Mono.WebBrowser/Mono.WebBrowser.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
index cfab82d7133..6606e075917 100644
--- a/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
+++ b/mcs/class/Mono.XBuild.Tasks/Mono.XBuild.Tasks.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
index c129b27e77a..7b26f7579a6 100644
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/PEAPI/PEAPI.csproj b/mcs/class/PEAPI/PEAPI.csproj
index 023a2417945..d44ad7e5557 100644
--- a/mcs/class/PEAPI/PEAPI.csproj
+++ b/mcs/class/PEAPI/PEAPI.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
index 910dbba72c2..f359db1da02 100644
--- a/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
+++ b/mcs/class/RabbitMQ.Client/src/apigen/RabbitMQ.Client.Apigen.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
index 8966256417f..63bb5de724c 100644
--- a/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
+++ b/mcs/class/RabbitMQ.Client/src/client/RabbitMQ.Client.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/SMDiagnostics/SMDiagnostics.csproj b/mcs/class/SMDiagnostics/SMDiagnostics.csproj
index 2cb790fcb16..67bfb5e95f3 100644
--- a/mcs/class/SMDiagnostics/SMDiagnostics.csproj
+++ b/mcs/class/SMDiagnostics/SMDiagnostics.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
index a5e64a77185..2b524d0d7ad 100644
--- a/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
+++ b/mcs/class/System.ComponentModel.Composition.4.5/System.ComponentModel.Composition.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;CLR40;USE_ECMA_KEY;FEATURE_REFLECTIONCONTEXT;FEATURE_REFLECTIONFILEIO;FEATURE_SERIALIZATION;FEATURE_SLIMLOCK</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
index 409d52630be..7e22ce65ce3 100644
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
index 7a459392b43..5c8c73ba162 100644
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Configuration/System.Configuration.csproj b/mcs/class/System.Configuration/System.Configuration.csproj
index e5ad91ce698..b46cba4f745 100644
--- a/mcs/class/System.Configuration/System.Configuration.csproj
+++ b/mcs/class/System.Configuration/System.Configuration.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Core/System.Core.csproj b/mcs/class/System.Core/System.Core.csproj
index 4d422570359..6a33ba2d7de 100644
--- a/mcs/class/System.Core/System.Core.csproj
+++ b/mcs/class/System.Core/System.Core.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_COMPILE;FEATURE_COMPILE_TO_METHODBUILDER;FEATURE_PDB_GENERATOR</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;FEATURE_PAL;PFX_LEGACY_3_5;FEATURE_NETCORE;INSIDE_SYSCORE;LIBC;NET_3_5;FEATURE_COMPILE;FEATURE_COMPILE_TO_METHODBUILDER;FEATURE_PDB_GENERATOR</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
index 75ebac40337..5561c53372b 100644
--- a/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
+++ b/mcs/class/System.Data.DataSetExtensions/System.Data.DataSetExtensions.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Data.Entity/System.Data.Entity.csproj b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
index 9e340af26d8..5812cd7dc94 100644
--- a/mcs/class/System.Data.Entity/System.Data.Entity.csproj
+++ b/mcs/class/System.Data.Entity/System.Data.Entity.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Data.Linq/System.Data.Linq.csproj b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
index 1324dd51348..ab256ce9c6e 100644
--- a/mcs/class/System.Data.Linq/System.Data.Linq.csproj
+++ b/mcs/class/System.Data.Linq/System.Data.Linq.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_STRICT;MONO_DEPLOY</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO_STRICT;MONO_DEPLOY</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
index 41cd13b48b7..b1b597a8a02 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
index 771d992f437..ed66d084dd9 100644
--- a/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
+++ b/mcs/class/System.Data.Services.Client/System.Data.Services.Client.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Data.Services/System.Data.Services.csproj b/mcs/class/System.Data.Services/System.Data.Services.csproj
index da6918f8a2f..761b4141c23 100644
--- a/mcs/class/System.Data.Services/System.Data.Services.csproj
+++ b/mcs/class/System.Data.Services/System.Data.Services.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Data/System.Data.csproj b/mcs/class/System.Data/System.Data.csproj
index d5efb767b37..32d8f0cb2c0 100644
--- a/mcs/class/System.Data/System.Data.csproj
+++ b/mcs/class/System.Data/System.Data.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;MONO_FEATURE_APPLETLS;MONO_FEATURE_BTLS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;PLATFORM_UNIX;USEOFFSET;MONO_PARTIAL_DATA_IMPORT;MONO_FEATURE_APPLETLS;MONO_FEATURE_BTLS</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Deployment/System.Deployment.csproj b/mcs/class/System.Deployment/System.Deployment.csproj
index b6eda4aba92..86a1ea2c5fe 100644
--- a/mcs/class/System.Deployment/System.Deployment.csproj
+++ b/mcs/class/System.Deployment/System.Deployment.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Design/System.Design.csproj b/mcs/class/System.Design/System.Design.csproj
index 45a44c88109..58cb94794c0 100644
--- a/mcs/class/System.Design/System.Design.csproj
+++ b/mcs/class/System.Design/System.Design.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
index c7eb4fe19da..32a48909dd3 100644
--- a/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
+++ b/mcs/class/System.DirectoryServices.Protocols/System.DirectoryServices.Protocols.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
index 55c5e09c048..f9170ea9be3 100644
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
index 6d01882f3e2..c5413bdd404 100644
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Drawing/System.Drawing.csproj b/mcs/class/System.Drawing/System.Drawing.csproj
index 5e8569b2c61..3400c7c0089 100644
--- a/mcs/class/System.Drawing/System.Drawing.csproj
+++ b/mcs/class/System.Drawing/System.Drawing.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;FEATURE_TYPECONVERTER;SUPPORTS_WINDOWS_COLORS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;FEATURE_TYPECONVERTER;SUPPORTS_WINDOWS_COLORS</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'winaot' ">

     <OutputPath>./../../class/lib/winaot</OutputPath>

diff --git a/mcs/class/System.Dynamic/System.Dynamic.csproj b/mcs/class/System.Dynamic/System.Dynamic.csproj
index a251f166873..2d818bd1eb8 100644
--- a/mcs/class/System.Dynamic/System.Dynamic.csproj
+++ b/mcs/class/System.Dynamic/System.Dynamic.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;CODEPLEX_40</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;CODEPLEX_40</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
index c28a492f792..1271fb85340 100644
--- a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
index e724d45b33c..70a02f453f0 100644
--- a/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
+++ b/mcs/class/System.IO.Compression.FileSystem/System.IO.Compression.FileSystem.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.IO.Compression/System.IO.Compression.csproj b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
index 9ac91bb96ec..96ab6e309a8 100644
--- a/mcs/class/System.IO.Compression/System.IO.Compression.csproj
+++ b/mcs/class/System.IO.Compression/System.IO.Compression.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
index 8264455e7ad..3c199d3bcb3 100644
--- a/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
+++ b/mcs/class/System.IdentityModel.Selectors/System.IdentityModel.Selectors.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_0</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.IdentityModel/System.IdentityModel.csproj b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
index d34ffb111dc..b4c448a8091 100644
--- a/mcs/class/System.IdentityModel/System.IdentityModel.csproj
+++ b/mcs/class/System.IdentityModel/System.IdentityModel.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_0</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
index 273ca008414..81bb975bd59 100644
--- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
+++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETMVC;FEATURE_DYNAMIC</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Json/System.Json.csproj b/mcs/class/System.Json/System.Json.csproj
index 71ce65f710e..305695ffb8b 100644
--- a/mcs/class/System.Json/System.Json.csproj
+++ b/mcs/class/System.Json/System.Json.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Management/System.Management.csproj b/mcs/class/System.Management/System.Management.csproj
index eb3cb9ec683..557689690f5 100644
--- a/mcs/class/System.Management/System.Management.csproj
+++ b/mcs/class/System.Management/System.Management.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Messaging/System.Messaging.csproj b/mcs/class/System.Messaging/System.Messaging.csproj
index 5d110ab3004..298eb03ac9c 100644
--- a/mcs/class/System.Messaging/System.Messaging.csproj
+++ b/mcs/class/System.Messaging/System.Messaging.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
index aa7016d13e3..95a3058b8f4 100644
--- a/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
+++ b/mcs/class/System.Net.Http.Formatting/System.Net.Http.Formatting.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETMVC</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETMVC</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
index c1d76b7fa93..9e86eefb8aa 100644
--- a/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
+++ b/mcs/class/System.Net.Http.WebRequest/System.Net.Http.WebRequest.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Net.Http/System.Net.Http.csproj b/mcs/class/System.Net.Http/System.Net.Http.csproj
index da0f8915dd0..7abd3e77fe5 100644
--- a/mcs/class/System.Net.Http/System.Net.Http.csproj
+++ b/mcs/class/System.Net.Http/System.Net.Http.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Net/System.Net.csproj b/mcs/class/System.Net/System.Net.csproj
index 2c65587dfa8..fb684fd588d 100644
--- a/mcs/class/System.Net/System.Net.csproj
+++ b/mcs/class/System.Net/System.Net.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
index 2a67a7b805c..d69bbafdfc1 100644
--- a/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
+++ b/mcs/class/System.Numerics.Vectors/System.Numerics.Vectors.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Numerics/System.Numerics.csproj b/mcs/class/System.Numerics/System.Numerics.csproj
index 7b661bedeb5..617a6d25289 100644
--- a/mcs/class/System.Numerics/System.Numerics.csproj
+++ b/mcs/class/System.Numerics/System.Numerics.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
index b661c2a4b7b..3ed52380655 100644
--- a/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
+++ b/mcs/class/System.Reactive.Core/System.Reactive.Core.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
index e302e41acdc..8eea11d4edf 100644
--- a/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
+++ b/mcs/class/System.Reactive.Debugger/System.Reactive.Debugger.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
index 27c2590650c..380778fad7d 100644
--- a/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
+++ b/mcs/class/System.Reactive.Experimental/System.Reactive.Experimental.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
index e9ae51d4c48..95572c722a0 100644
--- a/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
+++ b/mcs/class/System.Reactive.Interfaces/System.Reactive.Interfaces.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
index 923f7db0e1c..ae90ea738d4 100644
--- a/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
+++ b/mcs/class/System.Reactive.Linq/System.Reactive.Linq.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
index d637ab58d8a..eee9b39c4ec 100644
--- a/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
+++ b/mcs/class/System.Reactive.Observable.Aliases/System.Reactive.Observable.Aliases.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
index 2cf62ef9205..2b31bd71a72 100644
--- a/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
+++ b/mcs/class/System.Reactive.PlatformServices/System.Reactive.PlatformServices.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
index 3fb3b67ba29..665cfbf18b0 100644
--- a/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
+++ b/mcs/class/System.Reactive.Providers/System.Reactive.Providers.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
index c8736b2f029..76723f0d9a5 100644
--- a/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
+++ b/mcs/class/System.Reactive.Runtime.Remoting/System.Reactive.Runtime.Remoting.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
index 09b932e5ddd..ff277f40409 100644
--- a/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
+++ b/mcs/class/System.Reactive.Windows.Forms/System.Reactive.Windows.Forms.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
index db8583dcaff..1be63d3ac74 100644
--- a/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
+++ b/mcs/class/System.Reactive.Windows.Threading/System.Reactive.Windows.Threading.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SIGNED;HAS_EDI;PREFERASYNC;PREFER_ASYNC;HAS_AWAIT</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
index 89d87916c21..3313cc85746 100644
--- a/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
+++ b/mcs/class/System.Reflection.Context/System.Reflection.Context.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
index 4fde0b814b3..42dce12e93f 100644
--- a/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
+++ b/mcs/class/System.Runtime.Caching/System.Runtime.Caching.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj b/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
index 5a9f26aafb8..08b7ef149da 100644
--- a/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
+++ b/mcs/class/System.Runtime.CompilerServices.Unsafe/System.Runtime.CompilerServices.Unsafe.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
index 81f88c928ca..84a38edbbee 100644
--- a/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
+++ b/mcs/class/System.Runtime.DurableInstancing/System.Runtime.DurableInstancing.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
index af28a8b5ba1..5e2abccce3d 100644
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
index b792c718800..37c4f64c0cb 100644
--- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">

     <OutputPath>./../../class/lib/xammac_net_4_5-$(HostPlatform)</OutputPath>

diff --git a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
index f196d3abb26..fadefffa990 100644
--- a/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
+++ b/mcs/class/System.Runtime.Serialization/System.Runtime.Serialization.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NO_DYNAMIC_CODEGEN;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NO_DYNAMIC_CODEGEN;NET_3_0</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Security/System.Security.csproj b/mcs/class/System.Security/System.Security.csproj
index 3e8fa355259..1133a976a33 100644
--- a/mcs/class/System.Security/System.Security.csproj
+++ b/mcs/class/System.Security/System.Security.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SECURITY_DEP</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SECURITY_DEP</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
index 2bf98bf123b..e284095bab0 100644
--- a/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
+++ b/mcs/class/System.ServiceModel.Activation/System.ServiceModel.Activation.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
index 4fe68666b1b..4365ea34f06 100644
--- a/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
+++ b/mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5;NET_3_0</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
index 29f4f6e4345..027bf42b2a4 100644
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO_FEATURE_MULTIPLE_APPDOMAINS</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
index 5e590d5671c..e105b6b294a 100644
--- a/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
+++ b/mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5;NET_3_0</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
index e3184b64320..81f89558a9b 100644
--- a/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
+++ b/mcs/class/System.ServiceModel.Web/System.ServiceModel.Web.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5;NET_3_0</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5;NET_3_0</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel.csproj b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
index f37cc22ac76..8b2fa2b860a 100644
--- a/mcs/class/System.ServiceModel/System.ServiceModel.csproj
+++ b/mcs/class/System.ServiceModel/System.ServiceModel.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;TRACE;NET_3_0;SERVICEMODEL_ACTIVATION_DEPENDENCY</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;TRACE;NET_3_0;SERVICEMODEL_ACTIVATION_DEPENDENCY</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
index 9c6be4a9af4..0a957cb80df 100644
--- a/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
+++ b/mcs/class/System.ServiceProcess/System.ServiceProcess.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
index 68d61dca234..d146b7e38a8 100644
--- a/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
+++ b/mcs/class/System.Threading.Tasks.Dataflow/System.Threading.Tasks.Dataflow.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;CONCURRENT_COLLECTIONS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;CONCURRENT_COLLECTIONS</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Transactions/System.Transactions.csproj b/mcs/class/System.Transactions/System.Transactions.csproj
index deb0c8ef4f9..58b9bbf5154 100644
--- a/mcs/class/System.Transactions/System.Transactions.csproj
+++ b/mcs/class/System.Transactions/System.Transactions.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
index d449542eda7..e6e2dace425 100644
--- a/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
+++ b/mcs/class/System.Web.Abstractions/System.Web.Abstractions.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
index 0eb63865ffd..5b7c72e5408 100644
--- a/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
+++ b/mcs/class/System.Web.ApplicationServices/System.Web.ApplicationServices.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;SYSTEM_WEB_APPLICATIONSERVICES</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
index 1346f9879d4..c10c60b1f94 100644
--- a/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
+++ b/mcs/class/System.Web.DynamicData/System.Web.DynamicData.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
index 58160223d24..416fcfd224d 100644
--- a/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
+++ b/mcs/class/System.Web.Extensions.Design/System.Web.Extensions.Design.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
index 1882c77fa5d..94bde1d2427 100644
--- a/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
+++ b/mcs/class/System.Web.Extensions/System.Web.Extensions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5;SYSTEM_WEB_EXTENSIONS</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
index b8161b511e3..02916c9762a 100644
--- a/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
+++ b/mcs/class/System.Web.Http.SelfHost/System.Web.Http.SelfHost.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETMVC</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETMVC</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
index 2ae46cfc332..4331be3c35e 100644
--- a/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
+++ b/mcs/class/System.Web.Http.WebHost/System.Web.Http.WebHost.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETMVC</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETMVC</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Http/System.Web.Http.csproj b/mcs/class/System.Web.Http/System.Web.Http.csproj
index fda976f2d01..38e732b7b16 100644
--- a/mcs/class/System.Web.Http/System.Web.Http.csproj
+++ b/mcs/class/System.Web.Http/System.Web.Http.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETMVC</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETMVC</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
index 94834ff68b3..2be653f8dc8 100644
--- a/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
+++ b/mcs/class/System.Web.Mobile/System.Web.Mobile.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
index e202022bc73..0f1281554d2 100644
--- a/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
+++ b/mcs/class/System.Web.Mvc3/System.Web.Mvc3.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Razor/System.Web.Razor.csproj b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
index b2aecbf22b2..d8b52a48bd5 100644
--- a/mcs/class/System.Web.Razor/System.Web.Razor.csproj
+++ b/mcs/class/System.Web.Razor/System.Web.Razor.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETWEBPAGES</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETWEBPAGES</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
index 83c07e9807e..7a8dad4834f 100644
--- a/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
+++ b/mcs/class/System.Web.RegularExpressions/System.Web.RegularExpressions.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Routing/System.Web.Routing.csproj b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
index 6edd8683474..44988410449 100644
--- a/mcs/class/System.Web.Routing/System.Web.Routing.csproj
+++ b/mcs/class/System.Web.Routing/System.Web.Routing.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.Services/System.Web.Services.csproj b/mcs/class/System.Web.Services/System.Web.Services.csproj
index 1eebb929191..f1b3ba6c54a 100644
--- a/mcs/class/System.Web.Services/System.Web.Services.csproj
+++ b/mcs/class/System.Web.Services/System.Web.Services.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;MONO_BROKEN_CONFIGURATION_DLL</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MONO_BROKEN_CONFIGURATION_DLL</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
index a3dc6f1622a..034f704e98f 100644
--- a/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
+++ b/mcs/class/System.Web.WebPages.Deployment/System.Web.WebPages.Deployment.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETWEBPAGES</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETWEBPAGES</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
index 2f89ea43e5d..1bf229f70ad 100644
--- a/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
+++ b/mcs/class/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETWEBPAGES</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETWEBPAGES</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
index 8f1f9caf9a3..001677db698 100644
--- a/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
+++ b/mcs/class/System.Web.WebPages/System.Web.WebPages.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASPNETWEBPAGES</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASPNETWEBPAGES</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Web/System.Web.csproj b/mcs/class/System.Web/System.Web.csproj
index 3ced822c35a..a8668525247 100644
--- a/mcs/class/System.Web/System.Web.csproj
+++ b/mcs/class/System.Web/System.Web.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;INSIDE_SYSTEM_WEB</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;INSIDE_SYSTEM_WEB</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
index 9190c28f30e..affc4a49763 100644
--- a/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
+++ b/mcs/class/System.Windows.Forms.DataVisualization/System.Windows.Forms.DataVisualization.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
index 9476d5347b3..75e6869f6cf 100644
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Windows/System.Windows.csproj b/mcs/class/System.Windows/System.Windows.csproj
index c79463c947d..89f390be997 100644
--- a/mcs/class/System.Windows/System.Windows.csproj
+++ b/mcs/class/System.Windows/System.Windows.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
index ef01350280d..a8f15f8b508 100644
--- a/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
+++ b/mcs/class/System.Workflow.Activities/System.Workflow.Activities.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
index 6cb4bae53d3..78095e8ada5 100644
--- a/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
+++ b/mcs/class/System.Workflow.ComponentModel/System.Workflow.ComponentModel.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
index 222bd80c624..660343f53a5 100644
--- a/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
+++ b/mcs/class/System.Workflow.Runtime/System.Workflow.Runtime.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.XML/System.Xml.csproj b/mcs/class/System.XML/System.Xml.csproj
index 3b300f1805e..e57bf49fcd3 100644
--- a/mcs/class/System.XML/System.Xml.csproj
+++ b/mcs/class/System.XML/System.Xml.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;ASYNC;CONFIGURATION_DEP</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;ASYNC;CONFIGURATION_DEP</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Xaml/System.Xaml.csproj b/mcs/class/System.Xaml/System.Xaml.csproj
index 2beaf7fcd35..e00a86c9ce2 100644
--- a/mcs/class/System.Xaml/System.Xaml.csproj
+++ b/mcs/class/System.Xaml/System.Xaml.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj b/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
index 0f805ecabb9..9fee976fbbe 100644
--- a/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
+++ b/mcs/class/System.Xml.Linq/System.Xml.Linq.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;FEATURE_SERIALIZATION</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;FEATURE_SERIALIZATION</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
index bf961b4f656..edeb79a93a3 100644
--- a/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
+++ b/mcs/class/System.Xml.Serialization/System.Xml.Serialization.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/System/System.csproj b/mcs/class/System/System.csproj
index bf91ea0d097..12ccb509378 100644
--- a/mcs/class/System/System.csproj
+++ b/mcs/class/System/System.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;COREFX;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;CODEDOM;MONO_FEATURE_APPLETLS;FEATURE_COMPILED;MONO_FEATURE_BTLS;CONFIGURATION_DEP</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;COREFX;CONFIGURATION_2_0;XML_DEP;SECURITY_DEP;FEATURE_PAL;SYSTEM_NAMESPACE;MONO;PLATFORM_UNIX;MONO_FEATURE_PROCESS_START;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_SECURITY_ALIAS;CODEDOM;MONO_FEATURE_APPLETLS;FEATURE_COMPILED;MONO_FEATURE_BTLS;CONFIGURATION_DEP</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

diff --git a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
index cf1ad6e4921..c7e5e48bbcd 100644
--- a/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
+++ b/mcs/class/SystemWebTestShim/SystemWebTestShim.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
index a02b6490cf2..171c4d062f8 100644
--- a/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
+++ b/mcs/class/WebMatrix.Data/WebMatrix.Data.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/WindowsBase/WindowsBase.csproj b/mcs/class/WindowsBase/WindowsBase.csproj
index 3654c827a86..04b031f4e64 100644
--- a/mcs/class/WindowsBase/WindowsBase.csproj
+++ b/mcs/class/WindowsBase/WindowsBase.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj
index 804c4e2644a..5f43da3217a 100644
--- a/mcs/class/corlib/corlib.csproj
+++ b/mcs/class/corlib/corlib.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ENCODINGNLS;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;FEATURE_PORTABLE_SPAN;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ENCODINGNLS;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_FEATURE_CONSOLE;MONO_FEATURE_APPLETLS;FEATURE_CRYPTO_CONFIGURABLE</DefineConstants>

+    <DefineConstants>INSIDE_CORLIB;MONO_CULTURE_DATA;LIBC;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ENCODINGNLS;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;FEATURE_PORTABLE_SPAN;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;FEATURE_PAL;GENERICS_WORK;FEATURE_LIST_PREDICATES;FEATURE_SERIALIZATION;FEATURE_ENCODINGNLS;FEATURE_ASCII;FEATURE_LATIN1;FEATURE_UTF7;FEATURE_UTF32;MONO_HYBRID_ENCODING_SUPPORT;FEATURE_ASYNC_IO;NEW_EXPERIMENTAL_ASYNC_IO;FEATURE_UTF32;FEATURE_EXCEPTIONDISPATCHINFO;FEATURE_CORRUPTING_EXCEPTIONS;FEATURE_EXCEPTION_NOTIFICATIONS;FEATURE_STRONGNAME_MIGRATION;FEATURE_USE_LCID;FEATURE_FUSION;FEATURE_CRYPTO;FEATURE_X509_SECURESTRINGS;FEATURE_SYNCHRONIZATIONCONTEXT;FEATURE_SYNCHRONIZATIONCONTEXT_WAIT;HAS_CORLIB_CONTRACTS;FEATURE_MACL;FEATURE_REMOTING;MONO_COM;FEATURE_COMINTEROP;FEATURE_ROLE_BASED_SECURITY;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_THREAD_SUSPEND_RESUME;MONO_FEATURE_MULTIPLE_APPDOMAINS;MONO_FEATURE_CONSOLE;MONO_FEATURE_APPLETLS;FEATURE_CRYPTO_CONFIGURABLE</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">

     <OutputPath>./../../class/lib/monodroid</OutputPath>

@@ -1887,16 +1887,6 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\Interop.Libraries.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Unix\System.Native\Interop.GetRandomBytes.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Unix\Interop.Libraries.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Unix\System.Private.CoreLib.Native\Interop.MemAllocFree.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\Interop.Libraries.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.MemAllocFree.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.ThreadPoolIO.cs" />

-    <Compile Include="..\..\..\external\corert\src\Runtime.Base\src\System\Runtime\InteropServices\NativeCallableAttribute.cs" />

-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\Interop\Windows\Interop.Errors.cs" />

-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\shared\System\Threading\DeferredDisposableLifetime.cs" />

-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\Microsoft\Win32\SafeHandles\SafeThreadPoolIOHandle.cs" />

-    <Compile Include="..\..\..\external\corert\src\System.Private.CoreLib\src\System\Threading\ThreadPoolCallbackWrapper.cs" />

     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\ARC4Managed.cs" />

     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD2Managed.cs" />

     <Compile Include="..\Mono.Security\Mono.Security.Cryptography\MD4Managed.cs" />

@@ -1908,8 +1898,6 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />

     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />

     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />

-    <Compile Include="corert\Interop.cs" />

-    <Compile Include="corert\Interop.MemAllocFree.cs" />

     <Compile Include="corert\PreAllocatedOverlapped.platformnotsupported.cs" />

     <Compile Include="corert\ThreadPoolBoundHandle.platformnotsupported.cs" />

     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />

@@ -2130,8 +2118,6 @@
     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\BCrypt\Interop.BCryptGenRandom.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\Interop\Windows\Interop.Libraries.cs" />

     <Compile Include="..\..\..\external\corefx\src\Common\src\CoreLib\System\HashCode.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Unix\Interop.Libraries.cs" />

-    <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Unix\System.Private.CoreLib.Native\Interop.MemAllocFree.cs" />

     <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\Interop.Libraries.cs" />

     <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.MemAllocFree.cs" />

     <Compile Include="..\..\..\external\corert\src\Common\src\Interop\Windows\mincore\Interop.ThreadPoolIO.cs" />

@@ -2158,7 +2144,6 @@
     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha384managed.cs" />

     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\sha512managed.cs" />

     <Compile Include="..\referencesource\mscorlib\system\security\cryptography\tripledescryptoserviceprovider.cs" />

-    <Compile Include="corert\Interop.cs" />

     <Compile Include="System.Security.Cryptography\MD5CryptoServiceProvider.cs" />

     <Compile Include="System.Security.Cryptography\RNGCryptoServiceProvider.cs" />

     <Compile Include="System.Security.Cryptography\SHA1CryptoServiceProvider.cs" />

diff --git a/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj b/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
index 3143641a9ad..f5011750142 100644
--- a/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
+++ b/mcs/class/legacy/Mono.Cecil/legacy_Mono.Cecil.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/legacy</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-legacy</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;NET_3_5</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;NET_3_5</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/class/monodoc/monodoc.csproj b/mcs/class/monodoc/monodoc.csproj
index 45716890250..dc251bcc52d 100644
--- a/mcs/class/monodoc/monodoc.csproj
+++ b/mcs/class/monodoc/monodoc.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>LEGACY_MODE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/ilasm/ilasm.csproj b/mcs/ilasm/ilasm.csproj
index e4aae21fdf8..04ef123c505 100644
--- a/mcs/ilasm/ilasm.csproj
+++ b/mcs/ilasm/ilasm.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/mcs/mcs.csproj b/mcs/mcs/mcs.csproj
index b12ac51dbc2..308a8e3f163 100644
--- a/mcs/mcs/mcs.csproj
+++ b/mcs/mcs/mcs.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;MONO_FEATURE_THREAD_ABORT;MONO_FEATURE_PROCESS_START;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/ClientUtilities/util/nunit.util.csproj b/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
index fb879817ab8..ae47573c5a2 100644
--- a/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
+++ b/mcs/nunit24/ClientUtilities/util/nunit.util.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
index 4e4d888fa5b..d582f1bd64e 100644
--- a/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
+++ b/mcs/nunit24/ConsoleRunner/nunit-console-exe/nunit-console.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
index 1d53e77950a..680f847e88d 100644
--- a/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
+++ b/mcs/nunit24/ConsoleRunner/nunit-console/nunit-console-runner.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>MONO;StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitCore/core/nunit.core.csproj b/mcs/nunit24/NUnitCore/core/nunit.core.csproj
index d7f74298981..dc5883caf41 100644
--- a/mcs/nunit24/NUnitCore/core/nunit.core.csproj
+++ b/mcs/nunit24/NUnitCore/core/nunit.core.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
index 3d03faf8c42..4e50a518846 100644
--- a/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
+++ b/mcs/nunit24/NUnitCore/interfaces/nunit.core.interfaces.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
index 85504549ecf..2c70965cbb3 100644
--- a/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
+++ b/mcs/nunit24/NUnitExtensions/core/nunit.core.extensions.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;StronglyNamedAssembly</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;StronglyNamedAssembly</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
index cb01c904a45..28d01303ff8 100644
--- a/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
+++ b/mcs/nunit24/NUnitExtensions/framework/nunit.framework.extensions.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;StronglyNamedAssembly</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;StronglyNamedAssembly</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
index efc5f079b46..cf00a05825d 100644
--- a/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
+++ b/mcs/nunit24/NUnitFramework/framework/NUnit.Framework.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS;StronglyNamedAssembly</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;StronglyNamedAssembly</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
index a30d9c52501..6c8ca5adb12 100644
--- a/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
+++ b/mcs/nunit24/NUnitMocks/mocks/nunit.mocks.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>StronglyNamedAssembly;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/al/al.csproj b/mcs/tools/al/al.csproj
index d666541b495..beab88d5ac8 100644
--- a/mcs/tools/al/al.csproj
+++ b/mcs/tools/al/al.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/browsercaps-updater/browsercaps-updater.csproj b/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
index 618f15544e3..1930852a8df 100644
--- a/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
+++ b/mcs/tools/browsercaps-updater/browsercaps-updater.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/cccheck/cccheck.csproj b/mcs/tools/cccheck/cccheck.csproj
index 81adb4602ae..a0558e1aeee 100644
--- a/mcs/tools/cccheck/cccheck.csproj
+++ b/mcs/tools/cccheck/cccheck.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/ccrewrite/ccrewrite.csproj b/mcs/tools/ccrewrite/ccrewrite.csproj
index 36d4b5bc367..7294a5c7dc0 100644
--- a/mcs/tools/ccrewrite/ccrewrite.csproj
+++ b/mcs/tools/ccrewrite/ccrewrite.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/cil-strip/mono-cil-strip.csproj b/mcs/tools/cil-strip/mono-cil-strip.csproj
index dc681c803a5..7aaaf58af14 100644
--- a/mcs/tools/cil-strip/mono-cil-strip.csproj
+++ b/mcs/tools/cil-strip/mono-cil-strip.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/tools/compiler-tester/compiler-tester.csproj b/mcs/tools/compiler-tester/compiler-tester.csproj
index cd740644648..2b3f5170299 100644
--- a/mcs/tools/compiler-tester/compiler-tester.csproj
+++ b/mcs/tools/compiler-tester/compiler-tester.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/corcompare/mono-api-info.csproj b/mcs/tools/corcompare/mono-api-info.csproj
index a6e3ad2b28b..903bf2693f7 100644
--- a/mcs/tools/corcompare/mono-api-info.csproj
+++ b/mcs/tools/corcompare/mono-api-info.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/csharp/csharp.csproj b/mcs/tools/csharp/csharp.csproj
index 98cb2ee4cec..6edba94a0ca 100644
--- a/mcs/tools/csharp/csharp.csproj
+++ b/mcs/tools/csharp/csharp.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/culevel/culevel.csproj b/mcs/tools/culevel/culevel.csproj
index b879d790738..7a19dc25cc6 100644
--- a/mcs/tools/culevel/culevel.csproj
+++ b/mcs/tools/culevel/culevel.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/disco/disco.csproj b/mcs/tools/disco/disco.csproj
index 2aa1bcb4a92..7337777f124 100644
--- a/mcs/tools/disco/disco.csproj
+++ b/mcs/tools/disco/disco.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/dtd2rng/dtd2rng.csproj b/mcs/tools/dtd2rng/dtd2rng.csproj
index 78714e1af30..12442864a2f 100644
--- a/mcs/tools/dtd2rng/dtd2rng.csproj
+++ b/mcs/tools/dtd2rng/dtd2rng.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/dtd2xsd/dtd2xsd.csproj b/mcs/tools/dtd2xsd/dtd2xsd.csproj
index 2da8d32b0ef..20e94b043f6 100644
--- a/mcs/tools/dtd2xsd/dtd2xsd.csproj
+++ b/mcs/tools/dtd2xsd/dtd2xsd.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/gacutil/gacutil.csproj b/mcs/tools/gacutil/gacutil.csproj
index cac5b01ce7d..bc4300559ca 100644
--- a/mcs/tools/gacutil/gacutil.csproj
+++ b/mcs/tools/gacutil/gacutil.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/genxs/genxs.csproj b/mcs/tools/genxs/genxs.csproj
index fb85d09a1de..6bd12292154 100644
--- a/mcs/tools/genxs/genxs.csproj
+++ b/mcs/tools/genxs/genxs.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/ictool/ictool.csproj b/mcs/tools/ictool/ictool.csproj
index bc8fba45dbc..4d5700e95ca 100644
--- a/mcs/tools/ictool/ictool.csproj
+++ b/mcs/tools/ictool/ictool.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/ikdasm/ikdasm.csproj b/mcs/tools/ikdasm/ikdasm.csproj
index af4a4181fb6..f06aeb1fa31 100644
--- a/mcs/tools/ikdasm/ikdasm.csproj
+++ b/mcs/tools/ikdasm/ikdasm.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/installutil/installutil.csproj b/mcs/tools/installutil/installutil.csproj
index 1e1b8c73edb..e4da53ffd22 100644
--- a/mcs/tools/installutil/installutil.csproj
+++ b/mcs/tools/installutil/installutil.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/installvst/installvst.csproj b/mcs/tools/installvst/installvst.csproj
index a6dc751b8e4..6142ab631ed 100644
--- a/mcs/tools/installvst/installvst.csproj
+++ b/mcs/tools/installvst/installvst.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/lc/lc.csproj b/mcs/tools/lc/lc.csproj
index be99d9e0c91..250c82e0573 100644
--- a/mcs/tools/lc/lc.csproj
+++ b/mcs/tools/lc/lc.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/linker-analyzer/illinkanalyzer.csproj b/mcs/tools/linker-analyzer/illinkanalyzer.csproj
index 19cd5aac115..5aed9eb82a8 100644
--- a/mcs/tools/linker-analyzer/illinkanalyzer.csproj
+++ b/mcs/tools/linker-analyzer/illinkanalyzer.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/tools/linker/monolinker.csproj b/mcs/tools/linker/monolinker.csproj
index da1c00fa221..c5b56330a42 100644
--- a/mcs/tools/linker/monolinker.csproj
+++ b/mcs/tools/linker/monolinker.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/macpack/macpack.csproj b/mcs/tools/macpack/macpack.csproj
index 56e34083186..02eefcc5964 100644
--- a/mcs/tools/macpack/macpack.csproj
+++ b/mcs/tools/macpack/macpack.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mconfig/mconfig.csproj b/mcs/tools/mconfig/mconfig.csproj
index 112f014d3b1..68135a572b1 100644
--- a/mcs/tools/mconfig/mconfig.csproj
+++ b/mcs/tools/mconfig/mconfig.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mdb2ppdb/mdb2ppdb.csproj b/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
index f3f8ee894ff..a69d8d65580 100644
--- a/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
+++ b/mcs/tools/mdb2ppdb/mdb2ppdb.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mdbrebase/mdbrebase.csproj b/mcs/tools/mdbrebase/mdbrebase.csproj
index a585498875f..36cbbfcef20 100644
--- a/mcs/tools/mdbrebase/mdbrebase.csproj
+++ b/mcs/tools/mdbrebase/mdbrebase.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mdoc/mdoc.csproj b/mcs/tools/mdoc/mdoc.csproj
index 179061ee6f6..24fa066ca94 100644
--- a/mcs/tools/mdoc/mdoc.csproj
+++ b/mcs/tools/mdoc/mdoc.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/tools/mkbundle/mkbundle.csproj b/mcs/tools/mkbundle/mkbundle.csproj
index 7ab5b07d1e9..83e8f1a46d2 100644
--- a/mcs/tools/mkbundle/mkbundle.csproj
+++ b/mcs/tools/mkbundle/mkbundle.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>STATIC;NO_SYMBOL_WRITER;NO_AUTHENTICODE;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/tools/mod/mod.csproj b/mcs/tools/mod/mod.csproj
index 64fe5c4c1bc..121836cf2b9 100644
--- a/mcs/tools/mod/mod.csproj
+++ b/mcs/tools/mod/mod.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-api-html/mono-api-html.csproj b/mcs/tools/mono-api-html/mono-api-html.csproj
index 77bd091ae61..a6e52e326c6 100644
--- a/mcs/tools/mono-api-html/mono-api-html.csproj
+++ b/mcs/tools/mono-api-html/mono-api-html.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
index ce0c87274ec..08ffb31bbc5 100644
--- a/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/cli/mono-configuration-crypto.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
index 3688fa84759..0447c7ec51f 100644
--- a/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
+++ b/mcs/tools/mono-configuration-crypto/lib/Mono.Configuration.Crypto.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-service/mono-service.csproj b/mcs/tools/mono-service/mono-service.csproj
index fd632c1e169..703173a5e0c 100644
--- a/mcs/tools/mono-service/mono-service.csproj
+++ b/mcs/tools/mono-service/mono-service.csproj
@@ -29,7 +29,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj b/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
index dcd237e7cba..3c4e2305895 100644
--- a/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
+++ b/mcs/tools/mono-shlib-cop/mono-shlib-cop.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-symbolicate/mono-symbolicate.csproj b/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
index de0b151222c..8294e9b952d 100644
--- a/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
+++ b/mcs/tools/mono-symbolicate/mono-symbolicate.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NO_AUTHENTICODE;CECIL;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NO_AUTHENTICODE;CECIL;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <PropertyGroup Condition=" '$(Platform)' == 'monodroid_tools' ">

     <OutputPath>./../../class/lib/monodroid_tools</OutputPath>

diff --git a/mcs/tools/mono-xmltool/mono-xmltool.csproj b/mcs/tools/mono-xmltool/mono-xmltool.csproj
index 122949c3052..467796aca48 100644
--- a/mcs/tools/mono-xmltool/mono-xmltool.csproj
+++ b/mcs/tools/mono-xmltool/mono-xmltool.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/mono-xsd/xsd.csproj b/mcs/tools/mono-xsd/xsd.csproj
index 3e27f35521b..c68a37f449c 100644
--- a/mcs/tools/mono-xsd/xsd.csproj
+++ b/mcs/tools/mono-xsd/xsd.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/monop/monop.csproj b/mcs/tools/monop/monop.csproj
index 194a765bdbb..77091bd7424 100644
--- a/mcs/tools/monop/monop.csproj
+++ b/mcs/tools/monop/monop.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NO_AUTHENTICODE;STATIC;NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NO_AUTHENTICODE;STATIC;NO_SYMBOL_WRITER;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/nunitreport/nunitreport.csproj b/mcs/tools/nunitreport/nunitreport.csproj
index 8ee0158cdb7..da21605853f 100644
--- a/mcs/tools/nunitreport/nunitreport.csproj
+++ b/mcs/tools/nunitreport/nunitreport.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/pdb2mdb/pdb2mdb.csproj b/mcs/tools/pdb2mdb/pdb2mdb.csproj
index a36b97d5390..68b5e330cdc 100644
--- a/mcs/tools/pdb2mdb/pdb2mdb.csproj
+++ b/mcs/tools/pdb2mdb/pdb2mdb.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/resgen/resgen.csproj b/mcs/tools/resgen/resgen.csproj
index 2823f1e814a..89c099383ba 100644
--- a/mcs/tools/resgen/resgen.csproj
+++ b/mcs/tools/resgen/resgen.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/sgen/sgen.csproj b/mcs/tools/sgen/sgen.csproj
index 81a93e336c6..45581f0cd33 100644
--- a/mcs/tools/sgen/sgen.csproj
+++ b/mcs/tools/sgen/sgen.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/soapsuds/soapsuds.csproj b/mcs/tools/soapsuds/soapsuds.csproj
index 19f53aad9d6..0dba8f31c19 100644
--- a/mcs/tools/soapsuds/soapsuds.csproj
+++ b/mcs/tools/soapsuds/soapsuds.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/sqlmetal/sqlmetal.csproj b/mcs/tools/sqlmetal/sqlmetal.csproj
index 59388c68eb0..a55d5cf4a9f 100644
--- a/mcs/tools/sqlmetal/sqlmetal.csproj
+++ b/mcs/tools/sqlmetal/sqlmetal.csproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>MONO_STRICT;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>MONO_STRICT;NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/sqlsharp/sqlsharp.csproj b/mcs/tools/sqlsharp/sqlsharp.csproj
index d635da7a9d0..8447ef98e4c 100644
--- a/mcs/tools/sqlsharp/sqlsharp.csproj
+++ b/mcs/tools/sqlsharp/sqlsharp.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/svcutil/svcutil.csproj b/mcs/tools/svcutil/svcutil.csproj
index ce75517bf34..d48e8269c99 100644
--- a/mcs/tools/svcutil/svcutil.csproj
+++ b/mcs/tools/svcutil/svcutil.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

diff --git a/mcs/tools/wsdl/wsdl.csproj b/mcs/tools/wsdl/wsdl.csproj
index 2c503458ac6..bdc64e0cb27 100644
--- a/mcs/tools/wsdl/wsdl.csproj
+++ b/mcs/tools/wsdl/wsdl.csproj
@@ -26,7 +26,7 @@
   <PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">

     <OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>

     <IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>

-    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>

+    <DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>

   </PropertyGroup>

   <!-- @ALL_PROFILE_PROPERTIES@ -->

   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">