Revert "Merge pull request #8999 from mono/csproj-cleanups"

This reverts commit 152bf0867f774e2fdaa10adac063ccb1bbd31ca2, reversing
changes made to dac8bfc938917ab62c43b7fa4d705a550facc814.

18 files changed, 219 insertions, 157 deletions

diff --git a/main/Main.sln b/main/Main.sln
index b49ee263bc..533cc64668 100644
--- a/main/Main.sln
+++ b/main/Main.sln
@@ -496,8 +496,8 @@ Global
 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

+		{7525BB88-6142-4A26-93B9-A30C6983390A}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU

 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{7525BB88-6142-4A26-93B9-A30C6983390A}.Release|Any CPU.Build.0 = Release|Any CPU

 		{7525BB88-6142-4A26-93B9-A30C6983390A}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

@@ -510,18 +510,18 @@ Global
 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.Release|Any CPU.Build.0 = Release|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

-		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

+		{27096E7F-C91C-4AC6-B289-6897A701DF21}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{DA8EDEA6-7DA8-435D-B1A0-F3A0CA07F424}.DebugGnome|Any CPU.ActiveCfg = Debug|x86

@@ -600,31 +600,31 @@ Global
 		{183E084F-2C3B-4A6D-A8CE-6CDF3DC499AC}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.Release|Any CPU.Build.0 = Release|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{0413DB7D-8B35-423F-9752-D75C9225E7DE}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.Release|Any CPU.Build.0 = Release|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{E2CAB397-D00C-4D11-8F5F-E3A052092969}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.Debug|Any CPU.Build.0 = Debug|Any CPU

@@ -642,18 +642,18 @@ Global
 		{ABB21D58-6EFA-49EA-9555-EDDEC8123DD6}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.Release|Any CPU.Build.0 = Release|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

+		{F3AC14B0-3D1F-4B9B-95E8-384056060F33}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{1038FBD8-750E-4081-BC65-D89FFED3C881}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -672,16 +672,16 @@ Global
 		{E17829B5-8EAC-4714-8798-EB8ED3540191}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.Release|Any CPU.Build.0 = Release|Any CPU

-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

 		{7FCDB0D9-AA7D-44E4-BE74-55312B432389}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

@@ -780,16 +780,16 @@ Global
 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -934,16 +934,16 @@ Global
 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.Release|Any CPU.Build.0 = Release|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -964,32 +964,32 @@ Global
 		{0EA3AD14-404A-4D3F-979B-F087E2E70C82}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.Release|Any CPU.Build.0 = Release|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

 		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

-		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

+		{9BC670A8-1851-40EC-9685-279F4C98433D}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Debug|Any CPU.Build.0 = Debug|Any CPU

-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.ActiveCfg = DebugGnome|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugGnome|Any CPU.Build.0 = DebugGnome|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.Release|Any CPU.Build.0 = Release|Any CPU

-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

-		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.ActiveCfg = ReleaseGnome|Any CPU

+		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseGnome|Any CPU.Build.0 = ReleaseGnome|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

 		{BA9020AD-A2D1-47C8-9A7C-756162C38296}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

@@ -1072,16 +1072,16 @@ Global
 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.Release|Any CPU.Build.0 = Release|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{100568FC-F4E8-439B-94AD-41D11724E45B}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{1CF94D07-5480-4D10-A3CD-2EBD5E87B02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -1198,16 +1198,16 @@ Global
 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.Release|Any CPU.Build.0 = Release|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{174E6044-DD3A-49AB-9A5C-2A1F341B7B4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -1863,16 +1863,16 @@ Global
 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|x86

+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.DebugWin32|Any CPU.Build.0 = DebugWin32|x86

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.Release|Any CPU.Build.0 = Release|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseMac|Any CPU.Build.0 = Debug|Any CPU

-		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

-		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|x86

+		{7F5B649A-3572-4713-83FD-C28A6AA70445}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|x86

 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{DD14AD77-6FBB-4F0D-8083-CEC28A9D0BBD}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

@@ -1979,16 +1979,16 @@ Global
 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

-		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

-		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU

+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.Build.0 = Release|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

 		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

-		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

-		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU

+		{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU

 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

@@ -2581,16 +2581,16 @@ Global
 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU

-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU

-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.Build.0 = Debug|Any CPU

+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU

+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Release|Any CPU.Build.0 = Release|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU

-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU

-		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU

+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU

+		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU

 		{E33F7901-AA45-4C25-9868-DBB6CC8DC40C}.Debug|x86.ActiveCfg = Debug|Any CPU

diff --git a/main/msbuild/MonoDevelop.BeforeCommon.targets b/main/msbuild/MonoDevelop.BeforeCommon.targets
index 7c6ff92b6e..82f2349303 100644
--- a/main/msbuild/MonoDevelop.BeforeCommon.targets
+++ b/main/msbuild/MonoDevelop.BeforeCommon.targets
@@ -19,9 +19,6 @@
 		<DebugType>portable</DebugType>
 		<WarningLevel>4</WarningLevel>
 		<Deterministic>True</Deterministic>
-		<IsMac>$([MSBuild]::IsOsPlatform('OSX'))</IsMac>
-		<IsWindows>$([MSBuild]::IsOsPlatform('Windows'))</IsWindows>
-		<IsLinux>$([MSBuild]::IsOsPlatform('Linux'))</IsLinux>
 	</PropertyGroup>
 
 	<!-- AddinBuildDir is shorthand for which subdir of build\Addins to build into -->
@@ -59,10 +56,16 @@
 		<PlatformTarget>x64</PlatformTarget>
 	</PropertyGroup>
 
-	<PropertyGroup>
-		<DefineConstants Condition="$(IsMac)">$(DefineConstants);MAC</DefineConstants>
-		<DefineConstants Condition="$(IsWindows)">$(DefineConstants);WIN32;WINDOWS</DefineConstants>
-		<DefineConstants Condition="$(IsLinux)">$(DefineConstants);GNOME;LINUX</DefineConstants>
+	<PropertyGroup Condition="$(Configuration.Contains('Mac'))">
+		<DefineConstants>$(DefineConstants);MAC</DefineConstants>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$(Configuration.Contains('Win32'))">
+		<DefineConstants>$(DefineConstants);WIN32;WINDOWS</DefineConstants>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="$(Configuration.Contains('Gnome'))">
+		<DefineConstants>$(DefineConstants);GNOME;LINUX</DefineConstants>
 	</PropertyGroup>
 
 	<Target Name="RemoveNoisyAnalyzers" BeforeTargets="CoreCompile">
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
index 020981dde8..776ae71ea9 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.csproj
@@ -10,6 +10,8 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
   <ItemGroup>
     <ProjectReference Include="..\..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj">
       <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
diff --git a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
index 183cf794e4..d5165719dc 100644
--- a/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
+++ b/main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.csproj
@@ -10,6 +10,10 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
index 80e854197b..f13f296302 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.csproj
@@ -8,9 +8,12 @@
     <ProjectGuid>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</ProjectGuid>
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <OutputPath>..\..\..\build\AddIns\MonoDevelop.Debugger</OutputPath>
+    <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <StartAction>Program</StartAction>
     <StartProgram>..\..\..\build\bin\MonoDevelop.exe</StartProgram>
@@ -22,12 +25,12 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="Xamarin.Mac" Condition="$(IsMac)">
+    <Reference Include="Xamarin.Mac" Condition="$(HaveXamarinMac) == 'true'">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition="$(IsWindows)">
+  <ItemGroup Condition="$(OS) == 'Windows_NT'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsBase" />
@@ -63,7 +66,7 @@
       <Name>Mono.Debugging</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(IsMac)">
+    <ProjectReference Include="..\MacPlatform\MacPlatform.csproj" Condition="$(HaveXamarinMac) == 'true'">
       <Project>{50D6768C-C072-4E79-AFC5-C1C40767EF45}</Project>
       <Name>MacPlatform</Name>
       <Private>False</Private>
@@ -331,7 +334,7 @@
     <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled.png" />
     <EmbeddedResource Include="icons\stack-pointer-16~dark~disabled%402x.png" />
   </ItemGroup>
-  <ItemGroup Condition="!$(IsMac)">
+  <ItemGroup Condition=" '$(Configuration)' != 'DebugMac' AND '$(Configuration)' != 'ReleaseMac' ">
     <EmbeddedResource Include="icons\pause-16.png" />
     <EmbeddedResource Include="icons\pause-16%402x.png" />
     <EmbeddedResource Include="icons\pause-16~dark.png" />
@@ -353,7 +356,7 @@
     <EmbeddedResource Include="icons\continue-16~dark.png" />
     <EmbeddedResource Include="icons\continue-16~dark%402x.png" />
   </ItemGroup>
-  <ItemGroup Condition="$(IsMac)">
+  <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
     <EmbeddedResource Include="icons\mac\pause-16.png" />
     <EmbeddedResource Include="icons\mac\pause-16%402x.png" />
     <EmbeddedResource Include="icons\mac\pause-16~dark.png" />
diff --git a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
index 283265285b..24a02a42a4 100644
--- a/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
+++ b/main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.csproj
@@ -9,9 +9,11 @@
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <OutputPath>..\..\..\build\AddIns\MonoDevelop.DesignerSupport</OutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-  <ItemGroup Condition="$(IsMac)">
+  <ItemGroup Condition=" '$(Configuration)' == 'ReleaseMac' OR '$(Configuration)' == 'DebugMac' ">
       <Reference Include="Xamarin.Mac">
         <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
         <Private>False</Private>
diff --git a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
index b714c513ba..2e73602ef8 100644
--- a/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
+++ b/main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.csproj
@@ -14,6 +14,8 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
index 97b51fb6bb..8981eb193d 100644
--- a/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
+++ b/main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring.csproj
@@ -11,14 +11,17 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
+  <PropertyGroup Condition=" $(OS) == 'Windows_NT'">
+    <DefineConstants>WIN32</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
     <Reference Include="System.ComponentModel.Composition" />
-  </ItemGroup>
-  <ItemGroup Condition="$(IsMac)">
-    <Reference Include="Xamarin.Mac">
+    <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index ccba0d5757..45bdc1bcf6 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -9,6 +9,7 @@
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <OutputPath>..\..\..\build\AddIns\DisplayBindings\SourceEditor</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefineConstants Condition="$(OS) == 'Windows_NT'">$(DefineConstants);WINDOWS</DefineConstants>
     <!--
     This entire assembly is obsolete, and uses many obsoleted APIs from Core/Ide
     so disable deprecation warnings.
@@ -16,7 +17,9 @@
     <NoWarn>$(NoWarn);618;612</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
     <StartAction>Program</StartAction>
     <StartProgram>mono</StartProgram>
@@ -66,6 +69,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Reference Include="PresentationCore" Condition=" '$(OS)' == 'Windows_NT' " />
+    <Reference Include="PresentationFramework" Condition=" '$(OS)' == 'Windows_NT' " />
     <Reference Include="WindowsBase" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
@@ -73,15 +78,11 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="Xamarin.Mac" Condition="$(IsMac)">
+    <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup Condition="$(IsWindows)">
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextDataModel.cs" Link="Util\VacuousTextDataModel.cs" />
     <Compile Include="$(VSEditorApiDirectory)src\Editor\Text\Util\TextUIUtil\VacuousTextViewModel.cs" Link="Util\VacuousTextViewModel.cs" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
index 60d02f483d..683ac2c4b6 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git.Tests/MonoDevelop.VersionControl.Git.Tests.csproj
@@ -13,6 +13,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -55,11 +61,23 @@
   <ItemGroup>
     <IncludeCopyLocal Include="LibGit2Sharp.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" Condition="$(IsMac)" />
-    <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" Condition="$(IsWindows)" />
-    <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" Condition="$(IsLinux)" />
-  </ItemGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
+      <ItemGroup>
+        <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" />
+      </ItemGroup>
+    </When>
+    <When Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
+      <ItemGroup>
+        <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" />
+      </ItemGroup>
+    </When>
+    <When Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' ">
+      <ItemGroup>
+        <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" />
+      </ItemGroup>
+    </When>
+  </Choose>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
     <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
index dbde2019e9..5b156373db 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.csproj
@@ -10,6 +10,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugGnome|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseGnome|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -104,7 +110,9 @@
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="MonoDevelop.VersionControl.Git.addin.xml" />
-    <EmbeddedResource Include="MonoDevelop.VersionControl.Git.Win32.addin.xml" Condition="$(IsWindows)" />
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
+    <EmbeddedResource Include="MonoDevelop.VersionControl.Git.Win32.addin.xml" />
   </ItemGroup>
   <ItemGroup>
     <None Include="GitIgnore.txt">
@@ -125,15 +133,23 @@
     <InternalsVisibleTo Include="MonoDevelop.VersionControl.Git.Tests" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" Configuration="$(IsMac)" />
-    <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" Configuration="$(IsWindows)" />
-  </ItemGroup>
+  <Choose>
+    <When Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
+      <ItemGroup>
+        <NativeBinaries Include="..\..\..\..\external\libgit-binary\mac\*.dylib" />
+      </ItemGroup>
+    </When>
+    <When Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
+      <ItemGroup>
+        <NativeBinaries Include="..\..\..\..\external\libgit-binary\windows\*.*" />
+      </ItemGroup>
+    </When>
+  </Choose>
   <Target Name="BeforeBuild">
-    <Exec Command="bash build_libgit2.sh" Condition="$(IsLinux)" />
+    <Exec Command="bash build_libgit2.sh" Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' " />
   </Target>
   <Target Name="AfterBuild">
-     <ItemGroup Condition="$(IsLinux)">
+     <ItemGroup Condition=" '$(Configuration)' == 'DebugGnome' OR '$(Configuration)' == 'ReleaseGnome' ">
        <NativeBinaries Include="..\..\..\..\external\libgit2\build\*.so*" />
      </ItemGroup>
      <Copy SourceFiles="@(NativeBinaries)" DestinationFolder="$(OutputPath)\" SkipUnchangedFiles="true" />
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
index be57538af4..51c018831d 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.csproj
@@ -10,6 +10,8 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
   </ItemGroup>
@@ -58,7 +60,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup Condition="$(IsMac)">
+  <ItemGroup Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
     <NativeBinaries Include="..\..\..\..\external\sharpsvn-binary\mac\*.dylib" />
   </ItemGroup>
   <ItemGroup>
diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
index b266f5f2b0..fc4de457ce 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core.csproj
@@ -49,6 +49,7 @@
   </Choose>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System.Xml" />
     <Reference Include="System.Configuration" />
@@ -156,7 +157,7 @@
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Internal.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.Logic.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.UI.dll" />
-    <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Cocoa.View.Implementation.dll" Condition="$(IsMac)" />
+    <IncludeCopyLocal Include="Microsoft.VisualStudio.UI.Text.Cocoa.View.Implementation.dll" Condition="$(Configuration.Contains('Mac'))" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.Text.UI.Wpf.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
     <IncludeCopyLocal Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index cc3843f156..b8467a3f7d 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -10,11 +10,20 @@
     <OutputPath>..\..\..\build\bin</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
-
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DefineConstants>LINUX</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DefineConstants>LINUX</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
   <ItemGroup>
     <Reference Include="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="PresentationCore" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " />
+    <Reference Include="PresentationFramework" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " />
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
@@ -26,10 +35,16 @@
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
+    <Reference Include="System.Windows" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
+    <Reference Include="WindowsBase" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " />
+    <Reference Include="WindowsFormsIntegration" Condition=" '$(Configuration)' == 'DebugWin32' Or '$(Configuration)' == 'ReleaseWin32' " />
+    <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
+      <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
+    </Reference>
     <!-- when building with xbuild on Unix, $(MSBuildToolsPath) is like `$prefix/lib/mono/xbuild/*/bin`
     when building with msbuild on Unix, $(MSBuildToolsPath) is like `$prefix/lib/mono/msbuild/*/bin`
     Prefer referencing msbuild 15.* assemblies over 14.1 . At runtime, we use correct one anyway
@@ -61,33 +76,12 @@
     <IncludeCopyLocal Include="Microsoft.TemplateEngine.Utils.dll" />
     <IncludeCopyLocal Include="Mono.Addins.Gui.dll" />
     <IncludeCopyLocal Include="Mono.Debugging.dll" />
+    <IncludeCopyLocal Include="Xamarin.Mac.dll" />
     <IncludeCopyLocal Include="Xwt.dll" />
     <IncludeCopyLocal Include="Xwt.Gtk.dll" />
-    <IncludeCopyLocal Include="YamlDotNet.dll" />
-  </ItemGroup>
-
-  <ItemGroup Condition="$(IsMac)">
-    <Reference Include="Xamarin.Mac">
-      <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
-    </Reference>
-
-    <ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj">
-      <Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
-      <Name>Xwt.XamMac</Name>
-    </ProjectReference>
-
-    <IncludeCopyLocal Include="Xamarin.Mac.dll" />
     <IncludeCopyLocal Include="Xwt.XamMac.dll" />
+    <IncludeCopyLocal Include="YamlDotNet.dll" />
   </ItemGroup>
-
-  <ItemGroup Condition="$(IsWindows)">
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System.Windows" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="WindowsFormsIntegration" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MonoDevelop.Core\MonoDevelop.Core.csproj">
       <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project>
@@ -132,6 +126,10 @@
       <Project>{2B8F4F83-C2B3-4E84-A27B-8DEE1BE0E006}</Project>
       <Name>ICSharpCode.NRefactory.Cecil</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\xwt\Xwt.XamMac\Xwt.XamMac.csproj" Condition=" '$(Configuration)' == 'DebugMac' Or '$(Configuration)' == 'ReleaseMac' ">
+      <Project>{B7C1673E-5124-4BE5-8D21-EC8B12F85B6B}</Project>
+      <Name>Xwt.XamMac</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="templates\AppConfigFile.xft.xml" />
@@ -4300,7 +4298,7 @@
     <Compile Include="MonoDevelop.Ide.TypeSystem\TypeSystemService_WorkspaceRequestRegistration.cs" />
     <Compile Include="MonoDevelop.Ide.Gui.Dialogs\NewConfigurationDialog.cs" />
   </ItemGroup>
-  <ItemGroup Condition="$(IsMac)">
+  <ItemGroup Condition="'$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac'">
     <Compile Include="MonoDevelop.Components\Mac\KeyCodes.cs" />
     <Compile Include="MonoDevelop.Components\Mac\NativeViewHelper.cs" />
     <Compile Include="MonoDevelop.Components\Mac\NSStackViewExtensions.cs" />
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj
index eb3b91535c..798cc32593 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildBuilder.csproj
@@ -9,10 +9,15 @@
     <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion>
     <OutputPath>..\..\..\build\bin</OutputPath>
     <StartupObject>MonoDevelop.Projects.MSBuild.MainClass</StartupObject>
-    <PlatformTarget Condition="$([MSBuild]::IsOsPlatform('Windows'))">x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|x86' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|x86' " />
   <!-- TODO: Linux -->
   <PropertyGroup>
     <MSBuild_OSS_BinDir Condition="'$(OS)' == 'Windows_NT'">$(MSBuildToolsPath)\</MSBuild_OSS_BinDir>
@@ -41,12 +46,14 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" Condition="!$(IsWindows)">
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' OR '$(Configuration)' == 'Release' ">
+    <None Include="app.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>MonoDevelop.MSBuildBuilder.exe.config</Link>
     </None>
-    <None Include="app.windows.config" Condition="$(IsWindows)">
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'DebugWin32' OR '$(Configuration)' == 'ReleaseWin32' ">
+    <None Include="app.windows.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>MonoDevelop.MSBuildBuilder.exe.config</Link>
     </None>
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj
index 534373828e..fc84e7ef59 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.MSBuildResolver/MonoDevelop.MSBuildResolver.csproj
@@ -16,10 +16,15 @@
     <MSBuild_OSS_BinDir Condition="'$(OS)' == 'Unix' and '$(MSBuild_OSS_BinDir)' == '' and Exists('$(MSBuildToolsPath)\..\..\..\msbuild\15.0\bin\MSBuild.dll')">$(MSBuildToolsPath)\..\..\..\msbuild\15.0\bin\</MSBuild_OSS_BinDir>
     <OutputPath>..\..\..\..\build\bin\MSBuild</OutputPath>
     <DefineConstants>PUBLIC_API</DefineConstants>
-    <PlatformTarget Condition="$([MSBuild]::IsOsPlatform('Windows'))">x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "/>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "/>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin32|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin32|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Microsoft.Build">
diff --git a/main/src/tools/ExtensionTools/ExtensionTools.csproj b/main/src/tools/ExtensionTools/ExtensionTools.csproj
index 41dc54b6ae..429c99657e 100644
--- a/main/src/tools/ExtensionTools/ExtensionTools.csproj
+++ b/main/src/tools/ExtensionTools/ExtensionTools.csproj
@@ -10,10 +10,12 @@
     <RootNamespace>MonoDevelop.ExtensionTools</RootNamespace>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugMac|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseMac|AnyCPU' " />
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Xamarin.Mac" Condition="$(IsMac)">
+    <Reference Include="Xamarin.Mac" Condition=" '$(Configuration)' == 'DebugMac' OR '$(Configuration)' == 'ReleaseMac' ">
       <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
       <Private>False</Private>
     </Reference>
diff --git a/main/src/tools/mdtool/mdtool.csproj b/main/src/tools/mdtool/mdtool.csproj
index adb7a70f81..69d8d48902 100644
--- a/main/src/tools/mdtool/mdtool.csproj
+++ b/main/src/tools/mdtool/mdtool.csproj
@@ -29,10 +29,6 @@
       <Name>Mono.Addins.Setup</Name>
       <Private>False</Private>
     </ProjectReference>
-    <Reference Include="Xamarin.Mac" Condition="$(IsMac)">
-      <HintPath>..\..\..\external\Xamarin.Mac.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="src\AssemblyInfo.cs" />
@@ -43,9 +39,6 @@
     <Compile Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Components\Shared\GtkWorkarounds.cs">
       <Link>src\GtkWorkarounds.cs</Link>
     </Compile>
-    <Compile Include="..\..\core\MonoDevelop.Ide\MonoDevelop.Components\Mac\Messaging.cs">
-      <Link>src\Messaging.cs</Link>
-    </Compile>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>